Relanding 1143663007: VideoFrame: Separate Pixel Format from Storage Type.

media/filters/ffmpeg_video_decoder.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/filters/ffmpeg_video_decoder.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 102 matching lines @@
   // When lowres is non-zero, dimensions should be divided by 2^(lowres), but
   // since we don't use this, just DCHECK that it's zero.
   //
   // Always round up to a multiple of two to match VideoFrame restrictions on
   // frame alignment.
   DCHECK_EQ(codec_context->lowres, 0);
   gfx::Size coded_size(
       RoundUp(std::max(size.width(), codec_context->coded_width), 2),
       RoundUp(std::max(size.height(), codec_context->coded_height), 2));
 
-  if (!VideoFrame::IsValidConfig(
-          format, coded_size, gfx::Rect(size), natural_size))
+  if (!VideoFrame::IsValidConfig(format, VideoFrame::STORAGE_UNKNOWN,
+                                 coded_size, gfx::Rect(size), natural_size)) {
     return AVERROR(EINVAL);
+  }
 
   scoped_refptr<VideoFrame> video_frame = frame_pool_.CreateFrame(
       format, coded_size, gfx::Rect(size), natural_size, kNoTimestamp());
   if (format == VideoFrame::YV12 &&
       codec_context->colorspace == AVCOL_SPC_BT709) {
     video_frame->metadata()->SetInteger(VideoFrameMetadata::COLOR_SPACE,
                                         VideoFrame::COLOR_SPACE_HD_REC709);
   }
 
   for (int i = 0; i < 3; i++) {
@@ skipping 217 matching lines @@
   if (!codec || avcodec_open2(codec_context_.get(), codec, NULL) < 0) {
     ReleaseFFmpegResources();
     return false;
   }
 
   av_frame_.reset(av_frame_alloc());
   return true;
 }
 
 }  // namespace media