RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

demux_lavf: don't let metadata update mess up ogm playback 

For OGG audio files, we usually merge the per-stream metadata back to
the file-global metadata. Don't do that for OGM, because with OGM most
metadata is actually per-stream.
This commit is contained in:
wm4 2014-07-14 14:22:14 +02:00
parent ac71cb8611
commit c129e3f666
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
demux/demux_lavf.c
View File

@ -107,6 +107,7 @@ typedef struct lavf_priv {
int num_streams; int num_streams;
int cur_program; int cur_program;
char *mime_type; char *mime_type;
bool merge_track_metadata;
} lavf_priv_t; } lavf_priv_t;
struct format_hack { struct format_hack {
@ -603,10 +604,11 @@ static void add_new_streams(demuxer_t *demuxer)
static void update_metadata(demuxer_t *demuxer, AVPacket *pkt) static void update_metadata(demuxer_t *demuxer, AVPacket *pkt)
{ {
#if HAVE_AVCODEC_METADATA_UPDATE_SIDE_DATA #if HAVE_AVCODEC_METADATA_UPDATE_SIDE_DATA
lavf_priv_t *priv = demuxer->priv;
int md_size; int md_size;
const uint8_t *md; const uint8_t *md;
md = av_packet_get_side_data(pkt, AV_PKT_DATA_METADATA_UPDATE, &md_size); md = av_packet_get_side_data(pkt, AV_PKT_DATA_METADATA_UPDATE, &md_size);
if (md) { if (md && priv->merge_track_metadata) {
AVDictionary *dict = NULL; AVDictionary *dict = NULL;
av_packet_unpack_dictionary(md, md_size, &dict); av_packet_unpack_dictionary(md, md_size, &dict);
if (dict) { if (dict) {
@ -748,6 +750,7 @@ static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check)
// Often useful with OGG audio-only files, which have metadata in the audio // Often useful with OGG audio-only files, which have metadata in the audio
// track metadata instead of the main metadata. // track metadata instead of the main metadata.
if (demuxer->num_streams == 1) { if (demuxer->num_streams == 1) {
priv->merge_track_metadata = true;
for (int n = 0; n < priv->num_streams; n++) { for (int n = 0; n < priv->num_streams; n++) {
if (priv->streams[n]) if (priv->streams[n])
mp_tags_copy_from_av_dictionary(demuxer->metadata, avfc->streams[n]->metadata); mp_tags_copy_from_av_dictionary(demuxer->metadata, avfc->streams[n]->metadata);