Reland: Change the video color space default.

media/base/video_decoder_config.cc

 // Copyright (c) 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 "media/base/video_decoder_config.h"
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "media/base/video_frame.h"
 
 namespace media {
 
 VideoDecoderConfig::VideoDecoderConfig()
     : codec_(kUnknownVideoCodec),
       profile_(VIDEO_CODEC_PROFILE_UNKNOWN),
       format_(PIXEL_FORMAT_UNKNOWN),
       is_encrypted_(false) {
 }
 
 VideoDecoderConfig::VideoDecoderConfig(VideoCodec codec,
                                        VideoCodecProfile profile,
                                        VideoPixelFormat format,
+                                       ColorSpace color_space,
                                        const gfx::Size& coded_size,
                                        const gfx::Rect& visible_rect,
                                        const gfx::Size& natural_size,
                                        const uint8* extra_data,
                                        size_t extra_data_size,
                                        bool is_encrypted) {
-  Initialize(codec, profile, format, COLOR_SPACE_UNSPECIFIED, coded_size,
-             visible_rect, natural_size, extra_data, extra_data_size,
-             is_encrypted, true);
+  Initialize(codec, profile, format, color_space, coded_size, visible_rect,
+             natural_size, extra_data, extra_data_size, is_encrypted, true);
 }
 
 VideoDecoderConfig::~VideoDecoderConfig() {}
 
 // Some videos just want to watch the world burn, with a height of 0; cap the
 // "infinite" aspect ratio resulting.
 static const int kInfiniteRatio = 99999;
 
 // Common aspect ratios (multiplied by 100 and truncated) used for histogramming
 // video sizes.  These were taken on 20111103 from
@@ skipping 39 matching lines @@
     UmaHistogramAspectRatio("Media.VideoVisibleAspectRatio", visible_rect);
     UMA_HISTOGRAM_ENUMERATION("Media.VideoFramePixelFormat", format,
                               PIXEL_FORMAT_MAX + 1);
     UMA_HISTOGRAM_ENUMERATION("Media.VideoFrameColorSpace", color_space,
                               COLOR_SPACE_MAX + 1);
   }
 
   codec_ = codec;
   profile_ = profile;
   format_ = format;
+  color_space_ = color_space;
   coded_size_ = coded_size;
   visible_rect_ = visible_rect;
   natural_size_ = natural_size;
   extra_data_.assign(extra_data, extra_data + extra_data_size);
   is_encrypted_ = is_encrypted;
 }
 
 bool VideoDecoderConfig::IsValidConfig() const {
   return codec_ != kUnknownVideoCodec &&
       natural_size_.width() > 0 &&
@@ skipping 50 matching lines @@
       return "theora";
     case kCodecVP8:
       return "vp8";
     case kCodecVP9:
       return "vp9";
   }
   NOTREACHED();
   return "";
 }
 
-VideoCodec VideoDecoderConfig::codec() const {
-  return codec_;
-}
-
-VideoCodecProfile VideoDecoderConfig::profile() const {
-  return profile_;
-}
-
-VideoPixelFormat VideoDecoderConfig::format() const {
-  return format_;
-}
-
-gfx::Size VideoDecoderConfig::coded_size() const {
-  return coded_size_;
-}
-
-gfx::Rect VideoDecoderConfig::visible_rect() const {
-  return visible_rect_;
-}
-
-gfx::Size VideoDecoderConfig::natural_size() const {
-  return natural_size_;
-}
-
 const uint8* VideoDecoderConfig::extra_data() const {
   if (extra_data_.empty())
     return NULL;
   return &extra_data_[0];
 }
 
-size_t VideoDecoderConfig::extra_data_size() const {
-  return extra_data_.size();
-}
-
-bool VideoDecoderConfig::is_encrypted() const {
-  return is_encrypted_;
-}
-
 }  // namespace media