From 317425d92fe54687d843bf2bde173460352da262 Mon Sep 17 00:00:00 2001
From: KongQun Yang <kqyang@google.com>
Date: Wed, 16 May 2018 18:21:18 -0700
Subject: [PATCH] Fix TS mimetype in DASH

Change-Id: I64235d02206bda9a7c18d396b2889bb28091ab5d
---
 packager/app/test/packager_test.py            |  2 +-
 .../app/test/testdata/avc-aac-ts/output.mpd   | 28 +++++++++++++++++++
 packager/media/formats/mp2t/ts_muxer.cc       |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 packager/app/test/testdata/avc-aac-ts/output.mpd

diff --git a/packager/app/test/packager_test.py b/packager/app/test/packager_test.py
index 4d6b5fe4a5..088e979131 100755
--- a/packager/app/test/packager_test.py
+++ b/packager/app/test/packager_test.py
@@ -660,7 +660,7 @@ class PackagerFunctionalTest(PackagerAppTest):
             segmented=True,
             hls=True,
             test_files=['bear-640x360.ts']),
-        self._GetFlags(output_hls=True))
+        self._GetFlags(output_hls=True, output_dash=True))
     self._CheckTestResults('avc-aac-ts')
 
   def testAvcAacTsLanguage(self):
diff --git a/packager/app/test/testdata/avc-aac-ts/output.mpd b/packager/app/test/testdata/avc-aac-ts/output.mpd
new file mode 100644
index 0000000000..fbaca67d46
--- /dev/null
+++ b/packager/app/test/testdata/avc-aac-ts/output.mpd
@@ -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>
diff --git a/packager/media/formats/mp2t/ts_muxer.cc b/packager/media/formats/mp2t/ts_muxer.cc
index 30d5f0ccf8..bd005afa04 100644
--- a/packager/media/formats/mp2t/ts_muxer.cc
+++ b/packager/media/formats/mp2t/ts_muxer.cc
@@ -50,7 +50,7 @@ void TsMuxer::FireOnMediaStartEvent() {
   if (!muxer_listener())
     return;
   muxer_listener()->OnMediaStart(options(), *streams().front(), kTsTimescale,
-                                 MuxerListener::kContainerWebM);
+                                 MuxerListener::kContainerMpeg2ts);
 }
 
 void TsMuxer::FireOnMediaEndEvent() {