oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/ffpmeg: move code to FfmpegScanMetadata()

This commit is contained in:
Max Kellermann 2014-12-11 10:08:08 +01:00
parent 310ab7d41b
commit ee4b7042ce
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View File

@ -491,6 +491,23 @@ FfmpegParseMetaData(Decoder &decoder,
decoder_mixramp(decoder, std::move(mr)); decoder_mixramp(decoder, std::move(mr));
} }
static void
FfmpegScanMetadata(const AVStream &stream,
const tag_handler &handler, void *handler_ctx)
{
FfmpegScanDictionary(stream.metadata, &handler, handler_ctx);
}
static void
FfmpegScanMetadata(const AVFormatContext &format_context, int audio_stream,
const tag_handler &handler, void *handler_ctx)
{
FfmpegScanDictionary(format_context.metadata, &handler, handler_ctx);
if (audio_stream >= 0)
FfmpegScanMetadata(*format_context.streams[audio_stream],
handler, handler_ctx);
}
static void static void
ffmpeg_decode(Decoder &decoder, InputStream &input) ffmpeg_decode(Decoder &decoder, InputStream &input)
{ {
@ -690,11 +707,8 @@ ffmpeg_scan_stream(InputStream &is,
tag_handler_invoke_duration(handler, handler_ctx, duration); tag_handler_invoke_duration(handler, handler_ctx, duration);
} }
FfmpegScanDictionary(f->metadata, handler, handler_ctx);
int idx = ffmpeg_find_audio_stream(f); int idx = ffmpeg_find_audio_stream(f);
if (idx >= 0) FfmpegScanMetadata(*f, idx, *handler, handler_ctx);
FfmpegScanDictionary(f->streams[idx]->metadata,
handler, handler_ctx);
avformat_close_input(&f); avformat_close_input(&f);
return true; return true;