Update VP9 444 tests

Files re-encoded with the updated bitstream: $ ffmpeg -i blackwhite.png -pix_fmt yuv444p blackwhite.y4m $ vpxenc --codec=vp9 --profile=1 --experimental-bitstream -o blackwhite_yuv444p.webm blackwhite.y4m $ ffmpeg -i bear-1280x720.mp4 -vf crop=960:720:0:160,scale=320:240 -pix_fmt yuv444p bear-320x240-P444.y4m $ vpxenc --codec=vp9 --profile=1 --experimental-bitstream -o bear-320x240-P444.webm bear-320x240-P444.y4m BUG=392309 R=scherkus@chromium.org Review URL: https://codereview.chromium.org/396543003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285613 0039d316-1c4b-4281-b951-d872f2087c98
280723148 · Jul 25, 2014 · 0b1c6ee · 0b1c6ee
1 parent 9af8276
commit 0b1c6ee
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 6 deletions.
diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc
@@ -221,9 +221,7 @@ IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pVp8)) {
   RunColorFormatTest("yuv420p.webm", kEnded);
 }
 
-// TODO(johannkoenig): Reenable after landing libvpx roll
-// http://www.crbug.com/392309
-IN_PROC_BROWSER_TEST_F(MediaTest, DISABLED_Yuv444pVp9) {
+IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pVp9)) {
   RunColorFormatTest("yuv444p.webm", "ENDED");
 }
 

diff --git a/content/test/data/media/blackwhite_yuv444p.webm b/content/test/data/media/blackwhite_yuv444p.webm
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
@@ -1495,9 +1495,7 @@ TEST_F(PipelineIntegrationTest,
 }
 
 // Verify that VP9 video with 4:4:4 subsampling can be played back.
-// TODO(johannkoenig): Reenable after landing libvpx roll
-// http://www.crbug.com/392309
-TEST_F(PipelineIntegrationTest, DISABLED_P444_VP9_WebM) {
+TEST_F(PipelineIntegrationTest, P444_VP9_WebM) {
   ASSERT_TRUE(Start(GetTestDataFilePath("bear-320x240-P444.webm"),
                     PIPELINE_OK));
   Play();

diff --git a/media/test/data/bear-320x240-P444.webm b/media/test/data/bear-320x240-P444.webm
diff --git a/media/test/data/blackwhite_yuv444p.webm b/media/test/data/blackwhite_yuv444p.webm