Use width,height for coded_{width,height} in AVStreamToVideoDecoderConfig

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/logging.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
@@ skipping 423 matching lines @@
         av_malloc(config.extra_data().size() + FF_INPUT_BUFFER_PADDING_SIZE));
     memcpy(codec_context->extradata, &config.extra_data()[0],
            config.extra_data().size());
     memset(codec_context->extradata + config.extra_data().size(), '\0',
            FF_INPUT_BUFFER_PADDING_SIZE);
   }
 }
 
 bool AVStreamToVideoDecoderConfig(const AVStream* stream,
                                   VideoDecoderConfig* config) {
-  gfx::Size coded_size(stream->codec->coded_width, stream->codec->coded_height);
+  // Anticipating AVStream.codec.coded_{width,height} will be inaccessible in

[DaleCurtis, 2016/11/15 19:18:22]

Mark VideoDecoderConfig coded_{width,height} as deprecated and add a tracking
bug to remove.

[wolenetz, 2016/11/15 20:03:01]

Done.

+  // ffmpeg soon, just use the width and height, padded below, as hints of the
+  // coded size.
+  gfx::Size coded_size(stream->codec->width, stream->codec->height);
 
   // TODO(vrk): This assumes decoded frame data starts at (0, 0), which is true
   // for now, but may not always be true forever. Fix this in the future.
   gfx::Rect visible_rect(stream->codec->width, stream->codec->height);
 
   AVRational aspect_ratio = { 1, 1 };
   if (stream->sample_aspect_ratio.num)
     aspect_ratio = stream->sample_aspect_ratio;
   else if (stream->codec->sample_aspect_ratio.num)
     aspect_ratio = stream->codec->sample_aspect_ratio;
@@ skipping 373 matching lines @@
 TEST_COLORSPACE(RESERVED);
 TEST_COLORSPACE(FCC);
 TEST_COLORSPACE(BT470BG);
 TEST_COLORSPACE(SMPTE170M);
 TEST_COLORSPACE(SMPTE240M);
 TEST_COLORSPACE(YCOCG);
 TEST_COLORSPACE(BT2020_NCL);
 TEST_COLORSPACE(BT2020_CL);
 
 }  // namespace media