diff options
| author | Vignesh Venkatasubramanian <vigneshv@google.com> | 2015-03-31 19:40:01 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-05 02:08:55 +0200 |
| commit | 26f2e2f3f73f0da088e6765291d0839ebb077b03 (patch) | |
| tree | 9d7f943e6fd967ace3411ba705677969bcf6051f /tests | |
| parent | bc0e65e7d0d0459622f0e0b5936efd5a6aa38b01 (diff) | |
webmdashenc: Support for live stream manifests
This patch adds support for creating DASH manifests for WebM Live
Streams. It also updates the documentation and adds a fate test to
verify the behavior of the new muxer flag.
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-live | 26 |
2 files changed, 29 insertions, 0 deletions
diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index 83cda9c22e..5eaf8fbbe3 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -43,6 +43,9 @@ fate-webm-dash-manifest-unaligned-audio-streams: CMD = run ffmpeg -f webm_dash_m 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_VP8-$(call DEMDEC, WEBM_DASH_MANIFEST, VP8) += fate-webm-dash-manifest-live +fate-webm-dash-manifest-live: CMD = run ffmpeg -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_audio_171.hdr -c copy -map 0 -map 1 -f webm_dash_manifest -live 1 -adaptation_sets "id=0,streams=0 id=1,streams=1" -chunk_start_index 1 -chunk_duration_ms 5000 -time_shift_buffer_depth 7200 -debug_mode 1 - + FATE_SAMPLES_AVCONV += $(FATE_VP6-yes) fate-vp6: $(FATE_VP6-yes) diff --git a/tests/ref/fate/webm-dash-manifest-live b/tests/ref/fate/webm-dash-manifest-live new file mode 100644 index 0000000000..a6aef97a2c --- /dev/null +++ b/tests/ref/fate/webm-dash-manifest-live @@ -0,0 +1,26 @@ +<?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="dynamic" + minBufferTime="PT1S" + profiles="urn:mpeg:dash:profile:isoff-live:2011" + availabilityStartTime="" + timeShiftBufferDepth="PT7200S"> +<UTCTiming + schemeIdUri="urn:mpeg:dash:utc:direct:2012" + value=""/> +<Period id="0" start="PT0S" > +<AdaptationSet id="0" mimeType="video/webm" codecs="vp9" bitstreamSwitching="true" subsegmentAlignment="true" subsegmentStartsWithSAP="1"> +<ContentComponent id="1" type="video"/> +<SegmentTemplate timescale="1000" duration="5000" media="dash_live_video_$RepresentationID$_$Number$.chk" startNumber="1" initialization="dash_live_video_$RepresentationID$.hdr"/> +<Representation id="360" bandwidth="1000000" width="640" height="360" codecs="vp9" mimeType="video/webm" startsWithSAP="1"></Representation> +</AdaptationSet> +<AdaptationSet id="1" mimeType="audio/webm" codecs="vorbis" bitstreamSwitching="true" subsegmentAlignment="true" subsegmentStartsWithSAP="1"> +<ContentComponent id="1" type="audio"/> +<SegmentTemplate timescale="1000" duration="5000" media="dash_live_audio_$RepresentationID$_$Number$.chk" startNumber="1" initialization="dash_live_audio_$RepresentationID$.hdr"/> +<Representation id="171" bandwidth="128000" audioSamplingRate="32000" codecs="vorbis" mimeType="audio/webm" startsWithSAP="1"></Representation> +</AdaptationSet> +</Period> +</MPD> |