Index: media/test/pipeline_integration_test.cc |
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc |
index 8f618567feb98c60045f47c61e66dff9b4578d49..5bdbc1aa39d788a6748fb8c7e5a2fe0bd66867ee 100644 |
--- a/media/test/pipeline_integration_test.cc |
+++ b/media/test/pipeline_integration_test.cc |
@@ -112,6 +112,7 @@ const char kMP4Video[] = "video/mp4; codecs=\"avc1.4D4041\""; |
const char kMP4Audio[] = "audio/mp4; codecs=\"mp4a.40.2\""; |
const char kMP3[] = "audio/mpeg"; |
const char kMP2AudioSBR[] = "video/mp2t; codecs=\"avc1.4D4041,mp4a.40.5\""; |
+const char kMPEG2TS_MP3Audio[] = "video/mp2t; codecs=\"avc1.4D4041,mp3\""; |
wolenetz
2017/03/23 20:17:39
ditto
|
#endif // BUILDFLAG(USE_PROPRIETARY_CODECS) |
const size_t kAppendWholeFile = std::numeric_limits<size_t>::max(); |
@@ -2134,6 +2135,20 @@ TEST_F(PipelineIntegrationTest, Mp2ts_AAC_HE_SBR_Audio) { |
#endif |
} |
+TEST_F(PipelineIntegrationTest, Mpeg2ts_MP3Audio) { |
+ MockMediaSource source("bear-mp3-audio.ts", kMPEG2TS_MP3Audio, |
+ kAppendWholeFile); |
+#if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER) |
+ EXPECT_EQ(PIPELINE_OK, StartPipelineWithMediaSource(&source)); |
+ source.EndOfStream(); |
+ ASSERT_EQ(PIPELINE_OK, pipeline_status_); |
+#else |
+ EXPECT_EQ( |
+ DEMUXER_ERROR_COULD_NOT_OPEN, |
+ StartPipelineWithMediaSource(&source, kExpectDemuxerFailure, nullptr)); |
+#endif |
+} |
+ |
TEST_F(PipelineIntegrationTest, |
MAYBE_EME(EncryptedPlayback_NoEncryptedFrames_MP4_CENC_AudioOnly)) { |
MockMediaSource source("bear-1280x720-a_frag-cenc_clear-all.mp4", kMP4Audio, |