media: replace LUMINANCE_F16 by RG_88 for 9/10-bit h264 videos

cc/output/renderer_pixeltest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 #include <stdint.h>
 #include <memory>
 
 #include "base/message_loop/message_loop.h"
 #include "cc/base/math_util.h"
 #include "cc/output/gl_renderer.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/picture_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "cc/resources/video_resource_updater.h"
 #include "cc/test/fake_raster_source.h"
 #include "cc/test/fake_recording_source.h"
 #include "cc/test/pixel_test.h"
+#include "cc/test/test_in_process_context_provider.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "media/base/video_frame.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "third_party/skia/include/effects/SkColorFilterImageFilter.h"
 #include "third_party/skia/include/effects/SkColorMatrixFilter.h"
 #include "ui/gfx/geometry/rect_conversions.h"
@@ skipping 240 matching lines @@
                                tex_coord_rect.width() * uv_tex_size.width(),
                                tex_coord_rect.height() * uv_tex_size.height());
 
   YUVVideoDrawQuad* yuv_quad =
       render_pass->CreateAndAppendDrawQuad<YUVVideoDrawQuad>();
   uint32_t bits_per_channel = 8;
   if (video_frame->format() == media::PIXEL_FORMAT_YUV420P10 ||
       video_frame->format() == media::PIXEL_FORMAT_YUV422P10 ||
       video_frame->format() == media::PIXEL_FORMAT_YUV444P10) {
     bits_per_channel = 10;
+    ResourceFormat yuv_highbit_resource_format =
+        resource_provider->YuvResourceFormat(bits_per_channel);
+    if (yuv_highbit_resource_format != RG_88 &&
+        yuv_highbit_resource_format != RGBA_8888)
+      bits_per_channel = 8;
   }
 
   yuv_quad->SetNew(shared_state, rect, opaque_rect, visible_rect,
                    ya_tex_coord_rect, uv_tex_coord_rect, ya_tex_size,
                    uv_tex_size, y_resource, u_resource, v_resource, a_resource,
                    color_space, video_color_space, 0.0f, 1.0f,
                    bits_per_channel);
 }
 
 // Upshift video frame to 10 bit.
@@ skipping 801 matching lines @@
 
   void SetUp() override {
     GLRendererPixelTest::SetUp();
     video_resource_updater_.reset(new VideoResourceUpdater(
         output_surface_->context_provider(), resource_provider_.get()));
   }
 
   std::unique_ptr<VideoResourceUpdater> video_resource_updater_;
 };
 
+enum class HighbitTexture {
+  Y8,
+  RG88,
+};
+
 class VideoGLRendererPixelHiLoTest
     : public VideoGLRendererPixelTest,
-      public ::testing::WithParamInterface<bool> {};
+      public ::testing::WithParamInterface<
+          ::testing::tuple<bool, HighbitTexture>> {
+ public:
+  void SetSupportHighbitTexture(HighbitTexture texture) {
+    switch (texture) {
+      case HighbitTexture::Y8:
+        resource_provider_->SetYUVHighbitResourceFormatForTesting(LUMINANCE_8);
+        break;
+      case HighbitTexture::RG88:
+        // |context_provider_| for test doesn't support RG texture, so use RGBA.
+        resource_provider_->SetYUVHighbitResourceFormatForTesting(RGBA_8888);
+        break;
+    }
+  }
+};
 
 TEST_P(VideoGLRendererPixelHiLoTest, SimpleYUVRect) {
   gfx::Rect rect(this->device_viewport_size_);
 
   RenderPassId id(1, 1);
   std::unique_ptr<RenderPass> pass = CreateTestRootRenderPass(id, rect);
 
   SharedQuadState* shared_state =
       CreateTestSharedQuadState(gfx::Transform(), rect, pass.get());
 
-  bool highbit = GetParam();
+  const bool highbit = testing::get<0>(GetParam());
+  const HighbitTexture format = testing::get<1>(GetParam());
+  SetSupportHighbitTexture(format);
   CreateTestYUVVideoDrawQuad_Striped(
       shared_state, media::PIXEL_FORMAT_YV12, false, highbit,
       gfx::RectF(0.0f, 0.0f, 1.0f, 1.0f), pass.get(),
       video_resource_updater_.get(), rect, rect, resource_provider_.get());
 
   RenderPassList pass_list;
   pass_list.push_back(std::move(pass));
 
-  EXPECT_TRUE(
-      this->RunPixelTest(&pass_list,
-                         base::FilePath(FILE_PATH_LITERAL("yuv_stripes.png")),
-                         FuzzyPixelOffByOneComparator(true)));
+  base::FilePath file_path =
+      base::FilePath(FILE_PATH_LITERAL("yuv_stripes.png"));
+  if (highbit && format == HighbitTexture::RG88) {
+    file_path = base::FilePath(FILE_PATH_LITERAL("yuv_stripes_rg88.png"));

[dshwang, 2016/10/05 15:13:42]

RG88 path in shader.cc cannot produce exactly same pixels, but looks very
similar.

[hubbe, 2016/10/05 18:03:25]

The values in these files differ quite a lot actually, and they differ by more
than one in lots of places. This is more than I would expect and would seem to
indicate that there is a bug somewhere.

Also, instead of explaining what you're doing with comments in the code review,
use comments in the code instead.

[dshwang, 2016/10/07 12:35:01]

Good point. To verity it, I added |disable_one_component_textures| path in the
pixel test, in which SkCanvasVideoRenderer::ConvertVideoFrameToRGBPixels()
converts PIXEL_FORMAT_YUV420P10 to RGBA and gl_renderer draws it as
TextureDrawQuad.
Surprisingly, the results has some charicteristics
* very different color space
* more similar 2d-linear filter result to HighbitTexture::RG88

For color space, this path doesn't respect video color profile, so color space
is so different. For example, chrome rendering of
media/test/data/bear-320x180-hi10p-vp9.webm by this path is very yellowish.

For 2d-linear filter, the gpu default 2d-linear filter seems to overblur the
image, because
* |disable_one_component_textures| result is more similar to
HighbitTexture::RG88
* If disabling GL_LINEAR in gl_renderer, the result is more similar to
HighbitTexture::RG88
In my opinion, we can live with this different rendering result.
move explanation to comment

+  }
+  EXPECT_TRUE(this->RunPixelTest(&pass_list, file_path,
+                                 FuzzyPixelOffByOneComparator(true)));
 }
 
 TEST_P(VideoGLRendererPixelHiLoTest, ClippedYUVRect) {
   gfx::Rect viewport(this->device_viewport_size_);
   gfx::Rect draw_rect(this->device_viewport_size_.width() * 1.5,
                       this->device_viewport_size_.height() * 1.5);
 
   RenderPassId id(1, 1);
   std::unique_ptr<RenderPass> pass = CreateTestRootRenderPass(id, viewport);
 
   SharedQuadState* shared_state =
       CreateTestSharedQuadState(gfx::Transform(), viewport, pass.get());
 
-  bool highbit = GetParam();
+  const bool highbit = testing::get<0>(GetParam());
+  const HighbitTexture format = testing::get<1>(GetParam());
+  SetSupportHighbitTexture(format);
   CreateTestYUVVideoDrawQuad_Striped(
       shared_state, media::PIXEL_FORMAT_YV12, false, highbit,
       gfx::RectF(0.0f, 0.0f, 1.0f, 1.0f), pass.get(),
       video_resource_updater_.get(), draw_rect, viewport,
       resource_provider_.get());
   RenderPassList pass_list;
   pass_list.push_back(std::move(pass));
 
-  EXPECT_TRUE(this->RunPixelTest(
-      &pass_list, base::FilePath(FILE_PATH_LITERAL("yuv_stripes_clipped.png")),
-      FuzzyPixelOffByOneComparator(true)));
+  base::FilePath file_path =
+      base::FilePath(FILE_PATH_LITERAL("yuv_stripes_clipped.png"));
+  if (highbit && format == HighbitTexture::RG88) {
+    file_path =
+        base::FilePath(FILE_PATH_LITERAL("yuv_stripes_clipped_rg88.png"));

[dshwang, 2016/10/05 15:13:42]

ditto

+  }
+  EXPECT_TRUE(this->RunPixelTest(&pass_list, file_path,
+                                 FuzzyPixelOffByOneComparator(true)));
 }
 
 TEST_F(VideoGLRendererPixelHiLoTest, OffsetYUVRect) {
   gfx::Rect rect(this->device_viewport_size_);
 
   RenderPassId id(1, 1);
   std::unique_ptr<RenderPass> pass = CreateTestRootRenderPass(id, rect);
 
   SharedQuadState* shared_state =
       CreateTestSharedQuadState(gfx::Transform(), rect, pass.get());
@@ skipping 31 matching lines @@
   pass_list.push_back(std::move(pass));
 
   // If we didn't get black out of the YUV values above, then we probably have a
   // color range issue.
   EXPECT_TRUE(this->RunPixelTest(&pass_list,
                                  base::FilePath(FILE_PATH_LITERAL("black.png")),
                                  FuzzyPixelOffByOneComparator(true)));
 }
 
 // First argument (test case prefix) is intentionally left empty.
-INSTANTIATE_TEST_CASE_P(, VideoGLRendererPixelHiLoTest, ::testing::Bool());
+INSTANTIATE_TEST_CASE_P(
+    ,
+    VideoGLRendererPixelHiLoTest,
+    ::testing::Combine(::testing::Bool(),
+                       ::testing::Values(HighbitTexture::Y8,
+                                         HighbitTexture::RG88)));
 
 TEST_F(VideoGLRendererPixelTest, SimpleYUVJRect) {
   gfx::Rect rect(this->device_viewport_size_);
 
   RenderPassId id(1, 1);
   std::unique_ptr<RenderPass> pass = CreateTestRootRenderPass(id, rect);
 
   SharedQuadState* shared_state =
       CreateTestSharedQuadState(gfx::Transform(), rect, pass.get());
 
@@ skipping 1958 matching lines @@
 
   EXPECT_TRUE(this->RunPixelTest(
       &pass_list, base::FilePath(FILE_PATH_LITERAL("spiral.png")),
       FuzzyPixelOffByOneComparator(true)));
 }
 
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace
 }  // namespace cc