Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix TS mimetype in DASH 

Change-Id: I64235d02206bda9a7c18d396b2889bb28091ab5d
This commit is contained in:
KongQun Yang 2018-05-16 18:21:18 -07:00
parent b58753278c
commit 317425d92f
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packager/app/test/packager_test.py
View File

@ -660,7 +660,7 @@ class PackagerFunctionalTest(PackagerAppTest):
segmented=True, segmented=True,
hls=True, hls=True,
test_files=['bear-640x360.ts']), test_files=['bear-640x360.ts']),
self._GetFlags(output_hls=True)) self._GetFlags(output_hls=True, output_dash=True))
self._CheckTestResults('avc-aac-ts') self._CheckTestResults('avc-aac-ts')
def testAvcAacTsLanguage(self): def testAvcAacTsLanguage(self):

28
packager/app/test/testdata/avc-aac-ts/output.mpd vendored Normal file
View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>-->
<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" xmlns:cenc="urn:mpeg:cenc:2013" profiles="urn:mpeg:dash:profile:isoff-live:2011" minBufferTime="PT2S" type="dynamic" publishTime="some_time" availabilityStartTime="some_time" minimumUpdatePeriod="PT5S" timeShiftBufferDepth="PT1800S">
<Period id="0" start="PT0S">
<AdaptationSet id="0" contentType="video" width="640" height="360" segmentAlignment="true" par="16:9">
<Representation id="0" bandwidth="1023201" codecs="avc1.64001e" mimeType="video/MP2T" sar="1:1" frameRate="90000/0">
<SegmentTemplate timescale="90000" media="bear-640x360-video-$Number$.ts" startNumber="1">
<SegmentTimeline>
<S t="0" d="90090" r="1"/>
<S t="180180" d="66066"/>
</SegmentTimeline>
</SegmentTemplate>
</Representation>
</AdaptationSet>
<AdaptationSet id="1" contentType="audio" segmentAlignment="true">
<Representation id="1" bandwidth="194319" codecs="mp4a.40.2" mimeType="audio/MP2T" audioSamplingRate="44100">
<AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
<SegmentTemplate timescale="90000" media="bear-640x360-audio-$Number$.ts" startNumber="1">
<SegmentTimeline>
<S t="3916" d="87771"/>
<S t="91688" d="89860"/>
<S t="181549" d="71052"/>
</SegmentTimeline>
</SegmentTemplate>
</Representation>
</AdaptationSet>
</Period>
</MPD>

2
packager/media/formats/mp2t/ts_muxer.cc
View File

@ -50,7 +50,7 @@ void TsMuxer::FireOnMediaStartEvent() {
if (!muxer_listener()) if (!muxer_listener())
return; return;
muxer_listener()->OnMediaStart(options(), *streams().front(), kTsTimescale, muxer_listener()->OnMediaStart(options(), *streams().front(), kTsTimescale,
MuxerListener::kContainerWebM); MuxerListener::kContainerMpeg2ts);
} }
void TsMuxer::FireOnMediaEndEvent() { void TsMuxer::FireOnMediaEndEvent() {