Reland: Change the video color space default.

content/renderer/pepper/video_decoder_shim.cc

 // Copyright 2014 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 "content/renderer/pepper/video_decoder_shim.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 
@@ skipping 356 matching lines @@
     //   U - 128  : Turns unsigned U into signed U [-128,127]
     //   V - 128  : Turns unsigned V into signed V [-128,127]
     const float yuv_adjust_constrained[3] = {
         -0.0625f, -0.5f, -0.5f,
     };
     // Same as above, but without the head and footroom.
     const float yuv_adjust_full[3] = {
         0.0f, -0.5f, -0.5f,
     };
 
+    yuv_adjust = yuv_adjust_constrained;
+    yuv_matrix = yuv_to_rgb_rec601;
+
+    int result;
+    if (frame->metadata()->GetInteger(media::VideoFrameMetadata::COLOR_SPACE,
+                                      &result)) {
+      if (result == media::COLOR_SPACE_JPEG) {
+        yuv_matrix = yuv_to_rgb_jpeg;
+        yuv_adjust = yuv_adjust_full;
+      } else if (result == media::COLOR_SPACE_HD_REC709) {
+        yuv_matrix = yuv_to_rgb_rec709;
+      }
+    }
+
     switch (frame->format()) {
       case media::PIXEL_FORMAT_YV12:  // 420
       case media::PIXEL_FORMAT_YV12A:
       case media::PIXEL_FORMAT_I420:
         uv_height_divisor_ = 2;
         uv_width_divisor_ = 2;
-        yuv_adjust = yuv_adjust_constrained;
-        int result;
-        if (frame->metadata()->GetInteger(
-                media::VideoFrameMetadata::COLOR_SPACE, &result)) {
-          if (result == media::COLOR_SPACE_JPEG) {
-            yuv_matrix = yuv_to_rgb_jpeg;
-            yuv_adjust = yuv_adjust_full;
-          } else {
-            yuv_matrix = yuv_to_rgb_rec709;
-          }
-        } else {
-          yuv_matrix = yuv_to_rgb_rec601;
-        }
         break;
       case media::PIXEL_FORMAT_YV16:  // 422
         uv_width_divisor_ = 2;
         uv_height_divisor_ = 1;
-        yuv_matrix = yuv_to_rgb_rec601;
-        yuv_adjust = yuv_adjust_constrained;
         break;
       case media::PIXEL_FORMAT_YV24:  // 444
         uv_width_divisor_ = 1;
         uv_height_divisor_ = 1;
-        yuv_matrix = yuv_to_rgb_rec601;
-        yuv_adjust = yuv_adjust_constrained;
         break;
 
       default:
         NOTREACHED();
     }
 
     video_format_ = frame->format();
 
     // Zero these so everything is reset below.
     y_width_ = y_height_ = 0;
@@ skipping 436 matching lines @@
     codec = media::kCodecVP8;
   else if (profile <= media::VP9PROFILE_MAX)
     codec = media::kCodecVP9;
   DCHECK_NE(codec, media::kUnknownVideoCodec);
 
   if (!yuv_converter_->Initialize()) {
     return false;
   }
 
   media::VideoDecoderConfig config(
-      codec, profile, media::PIXEL_FORMAT_YV12,
+      codec, profile, media::PIXEL_FORMAT_YV12, media::COLOR_SPACE_UNSPECIFIED,
       gfx::Size(32, 24),  // Small sizes that won't fail.
       gfx::Rect(32, 24), gfx::Size(32, 24),
       NULL /* extra_data */,  // TODO(bbudge) Verify this isn't needed.
       0 /* extra_data_size */, false /* decryption */);
 
   media_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&VideoDecoderShim::DecoderImpl::Initialize,
                  base::Unretained(decoder_impl_.get()),
                  config));
@@ skipping 215 matching lines @@
 void VideoDecoderShim::DeleteTexture(uint32_t texture_id) {
   gpu::gles2::GLES2Interface* gles2 = context_provider_->ContextGL();
   gles2->DeleteTextures(1, &texture_id);
 }
 
 void VideoDecoderShim::FlushCommandBuffer() {
   context_provider_->ContextGL()->Flush();
 }
 
 }  // namespace content