diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2014-10-01 10:13:32 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-02 19:20:05 +0200 |
| commit | a9b10e1510ddfcae5119e616e0cc60350c99467c (patch) | |
| tree | c1f45299ec45ff6abe5b0c4547c7e000913f8323 /tests | |
| parent | 0d92b0d5f445d4f26fb9d9d7cbf83c415c8d2279 (diff) | |
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')
| -rw-r--r-- | tests/fate/vpx.mak | 3 | ||||
| -rw-r--r-- | tests/ref/fate/webm-dash-manifest-representations | 30 |
2 files changed, 33 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) diff --git a/tests/ref/fate/webm-dash-manifest-representations b/tests/ref/fate/webm-dash-manifest-representations new file mode 100644 index 0000000000..8556ecebee --- /dev/null +++ b/tests/ref/fate/webm-dash-manifest-representations @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<MPD + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:mpeg:DASH:schema:MPD:2011" + xsi:schemaLocation="urn:mpeg:DASH:schema:MPD:2011" + type="static" + mediaPresentationDuration="PT32.48S" + minBufferTime="PT1S" + profiles="urn:webm:dash:profile:webm-on-demand:2012"> +<Period id="0" start="PT0S" duration="PT32.48S" > +<AdaptationSet id="0" mimeType="video/webm" codecs="vp8" lang="eng" bitstreamSwitching="true" subsegmentAlignment="false" subsegmentStartsWithSAP="1"> +<Representation id="0" bandwidth="302355" width="640" height="360"> +<BaseURL>dash_video1.webm</BaseURL> +<SegmentBase + indexRange="1115974-1116097"> +<Initialization + range="0-441" /> +</SegmentBase> +</Representation> +<Representation id="1" bandwidth="243938" width="320" height="240"> +<BaseURL>dash_video4.webm</BaseURL> +<SegmentBase + indexRange="871124-871645"> +<Initialization + range="0-437" /> +</SegmentBase> +</Representation> +</AdaptationSet> +</Period> +</MPD> |