Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(852)

Unified Diff: media/test/pipeline_integration_test.cc

Issue 2928873002: Enable VP9 in MP4 by default (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/formats/mp4/box_definitions.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/test/pipeline_integration_test.cc
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index 331b9d38d5b912ee6362d139ff87251a40f86365..caec2c43f69810b52e6615955cdde5b70ed4bd3c 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -1970,12 +1970,6 @@ TEST_F(PipelineIntegrationTest,
MAYBE_EME(EncryptedPlayback_MP4_VP9_CENC_VideoOnly)) {
MockMediaSource source("bear-320x240-v_frag-vp9-cenc.mp4", kMP4VideoVP9,
kAppendWholeFile);
- if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableVp9InMp4)) {
- ASSERT_EQ(ChunkDemuxer::kNotSupported, source.AddId());
- return;
- }
-
FakeEncryptedMedia encrypted_media(new KeyProvidingApp());
EXPECT_EQ(PIPELINE_OK,
StartPipelineWithEncryptedMedia(&source, &encrypted_media));
@@ -2010,12 +2004,6 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource_VideoOnly_MP4_AVC3) {
TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource_VideoOnly_MP4_VP9) {
MockMediaSource source("bear-320x240-v_frag-vp9.mp4", kMP4VideoVP9,
kAppendWholeFile);
- if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableVp9InMp4)) {
- ASSERT_EQ(ChunkDemuxer::kNotSupported, source.AddId());
- return;
- }
-
EXPECT_EQ(PIPELINE_OK, StartPipelineWithMediaSource(&source));
source.EndOfStream();
ASSERT_EQ(PIPELINE_OK, pipeline_status_);
« no previous file with comments | « media/formats/mp4/box_definitions.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698