MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[artwork] Keep a raw Spotify source image in case rescaling is not required

This commit is contained in:
ejurgensen 2016-01-06 22:39:32 +01:00
parent 0d55e055c0
commit 1f1d79025d
1 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/artwork.c
View File

@ -1079,27 +1079,50 @@ source_item_spotify_get(struct artwork_ctx *ctx)
AVFormatContext *src_ctx; AVFormatContext *src_ctx;
AVIOContext *avio; AVIOContext *avio;
AVInputFormat *ifmt; AVInputFormat *ifmt;
struct evbuffer *raw;
struct evbuffer *evbuf; struct evbuffer *evbuf;
int target_w; int target_w;
int target_h; int target_h;
int ret; int ret;
raw = evbuffer_new();
evbuf = evbuffer_new(); evbuf = evbuffer_new();
if (!evbuf) if (!raw || !evbuf)
{ {
DPRINTF(E_LOG, L_ART, "Out of memory for Spotify evbuf\n"); DPRINTF(E_LOG, L_ART, "Out of memory for Spotify evbuf\n");
return ART_E_ERROR; return ART_E_ERROR;
} }
ret = spotify_artwork_get(evbuf, ctx->dbmfi->path, ctx->max_w, ctx->max_h); ret = spotify_artwork_get(raw, ctx->dbmfi->path, ctx->max_w, ctx->max_h);
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_WARN, L_ART, "No artwork from Spotify for %s\n", ctx->dbmfi->path); DPRINTF(E_WARN, L_ART, "No artwork from Spotify for %s\n", ctx->dbmfi->path);
evbuffer_free(raw);
evbuffer_free(evbuf); evbuffer_free(evbuf);
return ART_E_NONE; return ART_E_NONE;
} }
// Now we take it by ffmpeg, since it probably needs to be rescaled // Make a refbuf of raw for ffmpeg image size probing and possibly rescaling.
// We keep raw around in case rescaling is not necessary.
#ifdef HAVE_LIBEVENT2_OLD
uint8_t *buf = evbuffer_pullup(raw, -1);
if (!buf)
{
DPRINTF(E_LOG, L_ART, "Could not pullup raw artwork\n");
goto out_free_evbuf;
}
ret = evbuffer_add_reference(evbuf, buf, evbuffer_get_length(raw), NULL, NULL);
#else
ret = evbuffer_add_buffer_reference(evbuf, raw);
#endif
if (ret < 0)
{
DPRINTF(E_LOG, L_ART, "Could not copy/ref raw image for ffmpeg\n");
goto out_free_evbuf;
}
// Now evbuf will be processed by ffmpeg, since it probably needs to be rescaled
src_ctx = avformat_alloc_context(); src_ctx = avformat_alloc_context();
if (!src_ctx) if (!src_ctx)
{ {
@ -1139,21 +1162,20 @@ source_item_spotify_get(struct artwork_ctx *ctx)
ret = rescale_needed(src_ctx->streams[0]->codec, ctx->max_w, ctx->max_h, &target_w, &target_h); ret = rescale_needed(src_ctx->streams[0]->codec, ctx->max_w, ctx->max_h, &target_w, &target_h);
if (!ret) if (!ret)
{ ret = evbuffer_add_buffer(ctx->evbuf, raw);
evbuffer_free(ctx->evbuf);
ctx->evbuf = evbuf;
}
else else
ret = artwork_rescale(ctx->evbuf, src_ctx, 0, target_w, target_h);
if (ret < 0)
{ {
ret = artwork_rescale(ctx->evbuf, src_ctx, 0, target_w, target_h); DPRINTF(E_LOG, L_ART, "Could not add or rescale image to output evbuf\n");
if (ret < 0) goto out_close_input;
goto out_close_input;
evbuffer_free(evbuf);
} }
avformat_close_input(&src_ctx); avformat_close_input(&src_ctx);
avio_evbuffer_close(avio); avio_evbuffer_close(avio);
evbuffer_free(evbuf);
evbuffer_free(raw);
return ART_FMT_JPEG; return ART_FMT_JPEG;
out_close_input: out_close_input:
@ -1165,6 +1187,7 @@ source_item_spotify_get(struct artwork_ctx *ctx)
avformat_free_context(src_ctx); avformat_free_context(src_ctx);
out_free_evbuf: out_free_evbuf:
evbuffer_free(evbuf); evbuffer_free(evbuf);
evbuffer_free(raw);
return ART_E_ERROR; return ART_E_ERROR;