Add support for Rec709 color space videos in software YUV convert path.

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 384 matching lines @@
     // Note the PRESUBMIT_IGNORE_UMA_MAX below, this silences the PRESUBMIT.py
     // check for uma enum max usage, since we're abusing
     // UMA_HISTOGRAM_ENUMERATION to report a discrete value.
     UMA_HISTOGRAM_ENUMERATION("Media.VideoColorRange",
                               stream->codec->color_range,
                               AVCOL_RANGE_NB);  // PRESUBMIT_IGNORE_UMA_MAX
   }
 
   VideoFrame::Format format = PixelFormatToVideoFormat(stream->codec->pix_fmt);
   if (codec == kCodecVP9) {
     // TODO(tomfinegan): libavcodec doesn't know about VP9.

[DaleCurtis, 2014/12/15 18:47:34]

Can you check with fgalligan@ to see if VP9 needs YV12HD color spaces?

[rileya (GONE FROM CHROMIUM), 2014/12/16 22:05:59]

Will do.

     format = VideoFrame::YV12;
     coded_size = visible_rect.size();
   }
 
+  // YV12 frames may be in HD color space.
+  if (format == VideoFrame::YV12 &&
+      stream->codec->colorspace == AVCOL_SPC_BT709) {
+    format = VideoFrame::YV12HD;
+  }
+
   // Pad out |coded_size| for subsampled YUV formats.
   if (format != VideoFrame::YV24) {
     coded_size.set_width((coded_size.width() + 1) / 2 * 2);
     if (format != VideoFrame::YV16)
       coded_size.set_height((coded_size.height() + 1) / 2 * 2);
   }
 
   bool is_encrypted = false;
   AVDictionaryEntry* key = av_dict_get(stream->metadata, "enc_key_id", NULL, 0);
   if (key)
@@ skipping 119 matching lines @@
       DVLOG(1) << "Unsupported PixelFormat: " << pixel_format;
   }
   return VideoFrame::UNKNOWN;
 }
 
 PixelFormat VideoFormatToPixelFormat(VideoFrame::Format video_format) {
   switch (video_format) {
     case VideoFrame::YV16:
       return PIX_FMT_YUV422P;
     case VideoFrame::YV12:
+    case VideoFrame::YV12HD:
       return PIX_FMT_YUV420P;
     case VideoFrame::YV12J:
       return PIX_FMT_YUVJ420P;
     case VideoFrame::YV12A:
       return PIX_FMT_YUVA420P;
     case VideoFrame::YV24:
       return PIX_FMT_YUV444P;
     default:
       DVLOG(1) << "Unsupported VideoFrame::Format: " << video_format;
   }
@@ skipping 27 matching lines @@
       return false;
 
     *out = parsed_time;
     return true;
   }
 
   return false;
 }
 
 }  // namespace media