MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-07-26 17:00:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remember to actually request ICY metadata in transcode.c

Browse Source
This commit is contained in:
ejurgensen 2015-04-02 00:09:12 +02:00
parent be21482d7b
commit 56ece92209
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/transcode.c
View File

@ -486,6 +486,7 @@ transcode_seek(struct transcode_ctx *ctx, int ms)
int int
transcode_setup(struct transcode_ctx **nctx, struct media_file_info *mfi, off_t *est_size, int wavhdr) transcode_setup(struct transcode_ctx **nctx, struct media_file_info *mfi, off_t *est_size, int wavhdr)
{ {
AVDictionary *options;
struct transcode_ctx *ctx; struct transcode_ctx *ctx;
int ret; int ret;
@ -498,6 +499,8 @@ transcode_setup(struct transcode_ctx **nctx, struct media_file_info *mfi, off_t
} }
memset(ctx, 0, sizeof(struct transcode_ctx)); memset(ctx, 0, sizeof(struct transcode_ctx));
options = NULL;
#if LIBAVFORMAT_VERSION_MAJOR >= 54 || (LIBAVFORMAT_VERSION_MAJOR == 53 && LIBAVFORMAT_VERSION_MINOR >= 3) #if LIBAVFORMAT_VERSION_MAJOR >= 54 || (LIBAVFORMAT_VERSION_MAJOR == 53 && LIBAVFORMAT_VERSION_MINOR >= 3)
# ifndef HAVE_FFMPEG # ifndef HAVE_FFMPEG
// Without this, libav is slow to probe some internet streams, which leads to RAOP timeouts // Without this, libav is slow to probe some internet streams, which leads to RAOP timeouts
@ -507,8 +510,13 @@ transcode_setup(struct transcode_ctx **nctx, struct media_file_info *mfi, off_t
ctx->fmtctx->probesize = 64000; ctx->fmtctx->probesize = 64000;
} }
# endif # endif
if (mfi->data_kind == 1)
av_dict_set(&options, "icy", "1", 0);
ret = avformat_open_input(&ctx->fmtctx, mfi->path, NULL, NULL); ret = avformat_open_input(&ctx->fmtctx, mfi->path, NULL, &options);
if (options)
av_dict_free(&options);
#else #else
ret = av_open_input_file(&ctx->fmtctx, mfi->path, NULL, 0, NULL); ret = av_open_input_file(&ctx->fmtctx, mfi->path, NULL, 0, NULL);
#endif #endif