RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-26 09:33:30 +00:00
Code Issues Releases Wiki Activity

demux_lavf: show metadata for OGG audio files

Browse Source 
Whether this is a hack or not, I don't even know anymore.
This commit is contained in:
wm4 2013-06-15 17:53:15 +02:00
parent b04ce54711
commit 98e50d5477
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
demux/demux_lavf.c
View File

@ -474,6 +474,13 @@ static void add_new_streams(demuxer_t *demuxer)
handle_stream(demuxer, priv->num_streams);
}
static void add_metadata(demuxer_t *demuxer, AVDictionary *metadata)
{
AVDictionaryEntry *t = NULL;
while ((t = av_dict_get(metadata, "", t, AV_DICT_IGNORE_SUFFIX)))
demux_info_add(demuxer, t->key, t->value);
}
static demuxer_t *demux_open_lavf(demuxer_t *demuxer)
{
struct MPOpts *opts = demuxer->opts;
@ -561,11 +568,6 @@ static demuxer_t *demux_open_lavf(demuxer_t *demuxer)
mp_msg(MSGT_HEADER, MSGL_V, "demux_lavf: avformat_find_stream_info() "
"finished after %"PRId64" bytes.\n", stream_tell(demuxer->stream));
/* Add metadata. */
while ((t = av_dict_get(avfc->metadata, "", t,
AV_DICT_IGNORE_SUFFIX)))
demux_info_add(demuxer, t->key, t->value);
for (i = 0; i < avfc->nb_chapters; i++) {
AVChapter *c = avfc->chapters[i];
uint64_t start = av_rescale_q(c->start, c->time_base,
@ -579,6 +581,17 @@ static demuxer_t *demux_open_lavf(demuxer_t *demuxer)
add_new_streams(demuxer);
add_metadata(demuxer, avfc->metadata);
// Often useful with OGG audio-only files, which have metadata in the audio
// track metadata instead of the main metadata.
if (demuxer->num_streams == 1) {
for (int n = 0; n < priv->num_streams; n++) {
if (priv->streams[n])
add_metadata(demuxer, avfc->streams[n]->metadata);
}
}
if (avfc->nb_programs) {
int p;
for (p = 0; p < avfc->nb_programs; p++) {