Revert of Change the video color space default.

media/ffmpeg/ffmpeg_common.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/ffmpeg/ffmpeg_common.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 413 matching lines @@
   AVDictionaryEntry* key = av_dict_get(stream->metadata, "enc_key_id", NULL, 0);
   if (key)
     is_encrypted = true;
 
   AVDictionaryEntry* webm_alpha =
       av_dict_get(stream->metadata, "alpha_mode", NULL, 0);
   if (webm_alpha && !strcmp(webm_alpha->value, "1")) {
     format = VideoFrame::YV12A;
   }
 
-  // Prefer the color space found by libavcodec if available.
-  VideoFrame::ColorSpace color_space =
-      AVColorSpaceToVideoFrameColorSpace(stream->codec->colorspace);
-  if (color_space == VideoFrame::COLOR_SPACE_UNSPECIFIED) {
-    // Otherwise, assume that SD video is usually Rec.601, and HD is usually
-    // Rec.709.
-    color_space = (natural_size.height() < 720)
-                      ? VideoFrame::COLOR_SPACE_SD_REC601
-                      : VideoFrame::COLOR_SPACE_HD_REC709;
-  }
-
-  config->Initialize(codec, profile, format, color_space, coded_size,
-                     visible_rect, natural_size, stream->codec->extradata,
-                     stream->codec->extradata_size, is_encrypted, record_stats);
+  config->Initialize(codec,
+                     profile,
+                     format,
+                     (stream->codec->colorspace == AVCOL_SPC_BT709)
+                         ? VideoFrame::COLOR_SPACE_HD_REC709
+                         : VideoFrame::COLOR_SPACE_UNSPECIFIED,
+                     coded_size, visible_rect, natural_size,
+                     stream->codec->extradata, stream->codec->extradata_size,
+                     is_encrypted,
+                     record_stats);
 }
 
 void VideoDecoderConfigToAVCodecContext(
     const VideoDecoderConfig& config,
     AVCodecContext* codec_context) {
   codec_context->codec_type = AVMEDIA_TYPE_VIDEO;
   codec_context->codec_id = VideoCodecToCodecID(config.codec());
   codec_context->profile = VideoCodecProfileToProfileID(config.profile());
   codec_context->coded_width = config.coded_size().width();
   codec_context->coded_height = config.coded_size().height();
@@ skipping 103 matching lines @@
     case VideoFrame::YV12A:
       return PIX_FMT_YUVA420P;
     case VideoFrame::YV24:
       return PIX_FMT_YUV444P;
     default:
       DVLOG(1) << "Unsupported VideoFrame::Format: " << video_format;
   }
   return PIX_FMT_NONE;
 }
 
-VideoFrame::ColorSpace AVColorSpaceToVideoFrameColorSpace(
-    AVColorSpace color_space) {
-  switch (color_space) {
-    case AVCOL_SPC_BT709:
-      return VideoFrame::COLOR_SPACE_HD_REC709;
-    case AVCOL_SPC_SMPTE170M:
-    case AVCOL_SPC_BT470BG:
-      return VideoFrame::COLOR_SPACE_SD_REC601;
-    case AVCOL_SPC_UNSPECIFIED:
-      break;
-    default:
-      DVLOG(1) << "Unknown AVColorSpace: " << color_space;
-  }
-  return VideoFrame::COLOR_SPACE_UNSPECIFIED;
-}
-
 bool FFmpegUTCDateToTime(const char* date_utc, base::Time* out) {
   DCHECK(date_utc);
   DCHECK(out);
 
   std::vector<base::StringPiece> fields = base::SplitStringPiece(
       date_utc, " ", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
   if (fields.size() != 2)
     return false;
 
   std::vector<base::StringPiece> date_fields = base::SplitStringPiece(
@@ skipping 21 matching lines @@
       return false;
 
     *out = parsed_time;
     return true;
   }
 
   return false;
 }
 
 }  // namespace media