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..88a71b7b2e4abe0aa9a2c41d765b816a6ff1458c 100644 |
--- a/media/test/pipeline_integration_test.cc |
+++ b/media/test/pipeline_integration_test.cc |
@@ -2134,6 +2134,36 @@ TEST_F(PipelineIntegrationTest, Mp2ts_AAC_HE_SBR_Audio) { |
#endif |
} |
+TEST_F(PipelineIntegrationTest, Mpeg2ts_MP3Audio_Mp4a_6B) { |
+ MockMediaSource source("bear-mp3-audio.ts", |
+ "video/mp2t; codecs=\"avc1.4D4041,mp4a.6B\"", |
+ 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, Mpeg2ts_MP3Audio_Mp4a_69) { |
+ MockMediaSource source("bear-mp3-audio.ts", |
wolenetz
2017/03/24 17:34:25
nit: is this test file really both .69 and .6B com
servolk
2017/03/27 20:10:39
I've made a couple of new test files in the latest
|
+ "video/mp2t; codecs=\"avc1.4D4041,mp4a.69\"", |
+ 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, |