aboutsummaryrefslogtreecommitdiffstats
path: root/tests/fate/vpx.mak
diff options
context:
space:
mode:
authorVignesh Venkatasubramanian <vigneshv@google.com>2014-10-01 10:13:32 -0700
committerMichael Niedermayer <michaelni@gmx.at>2014-10-02 19:20:05 +0200
commita9b10e1510ddfcae5119e616e0cc60350c99467c (patch)
treec1f45299ec45ff6abe5b0c4547c7e000913f8323 /tests/fate/vpx.mak
parent0d92b0d5f445d4f26fb9d9d7cbf83c415c8d2279 (diff)
downloadffmpeg-a9b10e1510ddfcae5119e616e0cc60350c99467c.tar.gz
lavf/webm_dash: some fields should go into Representation
Width, Height and Sample Rate should be in the AdaptationSet tag only if all the contained representations have the same width, height and sampling rate. Otherwise they should go into the Representation tag. This patch adds this functionality and a fate test for the same. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/vpx.mak')
-rw-r--r--tests/fate/vpx.mak3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak
index 0f84ef5ac3..be3e95672b 100644
--- a/tests/fate/vpx.mak
+++ b/tests/fate/vpx.mak
@@ -37,6 +37,9 @@ fate-webm-dash-manifest-unaligned-video-streams: CMD = run ffmpeg -f webm_dash_m
FATE_VP8-$(call DEMDEC, WEBM_DASH_MANIFEST, VP8) += fate-webm-dash-manifest-unaligned-audio-streams
fate-webm-dash-manifest-unaligned-audio-streams: CMD = run ffmpeg -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio3.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" -
+FATE_VP8-$(call DEMDEC, WEBM_DASH_MANIFEST, VP8) += fate-webm-dash-manifest-representations
+fate-webm-dash-manifest-representations: CMD = run ffmpeg -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video4.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" -
+
FATE_SAMPLES_AVCONV += $(FATE_VP6-yes)
fate-vp6: $(FATE_VP6-yes)