diff options
| author | Vignesh Venkatasubramanian <vigneshv-at-google.com@ffmpeg.org> | 2017-04-11 21:33:28 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2017-04-17 10:46:51 -0700 |
| commit | 62c27fdba43def4cdc2fb6f2df60c7ac87918d6c (patch) | |
| tree | 698d9805372a91a25b575493c2b21637da14c81b /tests | |
| parent | e22d495538c1de6a13cf8f51e7448d3312365747 (diff) | |
| download | ffmpeg-62c27fdba43def4cdc2fb6f2df60c7ac87918d6c.tar.gz | |
webm_dash_manifest: Add option to specify bandwidth
Add an option to webm_dash_manifest demuxer to specify a value for
"bandwidth" field in the DASH manifest. The value is then used by
the muxer. Fixes an existing FIXME in the code.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: James Zern <jzern@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/vpx.mak | 3 | ||||
| -rw-r--r-- | tests/ref/fate/webm-dash-manifest-live-bandwidth | 24 |
2 files changed, 27 insertions, 0 deletions
diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index 46658ec2f1..2662bd2bd8 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -70,6 +70,9 @@ fate-webm-dash-manifest-representations: CMD = run $(FFMPEG) -nostdin -f webm_da FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-live fate-webm-dash-manifest-live: CMD = run $(FFMPEG) -nostdin -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 -minimum_update_period 60 -debug_mode 1 - +FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-live-bandwidth +fate-webm-dash-manifest-live-bandwidth: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -live 1 -bandwidth 100 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f webm_dash_manifest -live 1 -bandwidth 200 -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 -minimum_update_period 60 -debug_mode 1 - + FATE_VP8-$(call DEMDEC, MATROSKA, VP8) += fate-vp8-2451 fate-vp8-2451: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp8/RRSF49-short.webm -vsync cfr -an diff --git a/tests/ref/fate/webm-dash-manifest-live-bandwidth b/tests/ref/fate/webm-dash-manifest-live-bandwidth new file mode 100644 index 0000000000..18b8951283 --- /dev/null +++ b/tests/ref/fate/webm-dash-manifest-live-bandwidth @@ -0,0 +1,24 @@ +<?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" + minimumUpdatePeriod="PT60S"> +<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="100" 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="200" audioSamplingRate="32000" codecs="vorbis" mimeType="audio/webm" startsWithSAP="1"></Representation> +</AdaptationSet> +</Period> +</MPD> |