From 597d826123dc5fd1eb00ad1b84c7d1e1f6d8e346 Mon Sep 17 00:00:00 2001 From: Vignesh Venkatasubramanian Date: Tue, 11 Nov 2014 10:02:05 -0800 Subject: [PATCH] lavf/webmdashenc: Representation IDs should be unique. According to the DASH spec, Representation IDs should be unique across all adaptation sets. Fixing that and updating the fate reference file to reflect this change. Signed-off-by: Vignesh Venkatasubramanian Signed-off-by: Michael Niedermayer --- libavformat/webmdashenc.c | 3 ++- tests/ref/fate/webm-dash-manifest | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c index 768b5d2383..4536b7d5a8 100644 --- a/libavformat/webmdashenc.c +++ b/libavformat/webmdashenc.c @@ -46,6 +46,7 @@ typedef struct WebMDashMuxContext { char *adaptation_sets; AdaptationSet *as; int nb_as; + int representation_id; } WebMDashMuxContext; static const char *get_codec_name(int codec_id) @@ -259,7 +260,7 @@ static int write_adaptation_set(AVFormatContext *s, int as_index) avio_printf(s->pb, ">\n"); for (i = 0; i < as->nb_streams; i++) { - write_representation(s, s->streams[as->streams[i]], i, + write_representation(s, s->streams[as->streams[i]], w->representation_id++, !width_in_as, !height_in_as, !sample_rate_in_as); } avio_printf(s->pb, "\n"); diff --git a/tests/ref/fate/webm-dash-manifest b/tests/ref/fate/webm-dash-manifest index 4b88040ff5..f5fc9121da 100644 --- a/tests/ref/fate/webm-dash-manifest +++ b/tests/ref/fate/webm-dash-manifest @@ -27,7 +27,7 @@ - + dash_audio1.webm @@ -35,7 +35,7 @@ range="0-4103" /> - + dash_audio2.webm