Remove VideoDecoderConfig::aspect_ratio_xxx methods.

media/mp4/mp4_stream_parser.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/mp4/mp4_stream_parser.h"
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/time.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/stream_parser_buffer.h"
 #include "media/base/video_decoder_config.h"
+#include "media/base/video_util.h"
 #include "media/mp4/box_definitions.h"
 #include "media/mp4/box_reader.h"
 #include "media/mp4/es_descriptor.h"
 #include "media/mp4/rcheck.h"
 
 namespace media {
 namespace mp4 {
 
 MP4StreamParser::MP4StreamParser(bool has_sbr)
     : state_(kWaitingForInit),
@@ skipping 188 matching lines @@
 
       if (!(entry.format == FOURCC_AVC1 ||
             (entry.format == FOURCC_ENCV &&
              entry.sinf.format.format == FOURCC_AVC1))) {
         LOG(ERROR) << "Unsupported video format.";
         return false;
       }
       RCHECK(EmitKeyNeeded(entry.sinf.info.track_encryption));
 
       // TODO(strobe): Recover correct crop box
+      gfx::Size coded_size(entry.width, entry.height);
+      gfx::Rect visible_rect(coded_size);
+      gfx::Size natural_size = GetNaturalSize(visible_rect,
+                                              entry.pixel_aspect.h_spacing,
+                                              entry.pixel_aspect.v_spacing);
       video_config.Initialize(kCodecH264, H264PROFILE_MAIN,  VideoFrame::YV12,
-                              gfx::Size(entry.width, entry.height),
-                              gfx::Rect(0, 0, entry.width, entry.height),
-                              entry.pixel_aspect.h_spacing,
-                              entry.pixel_aspect.v_spacing,
+                              coded_size, visible_rect, natural_size,
                               // No decoder-specific buffer needed for AVC;
                               // SPS/PPS are embedded in the video stream
-                              NULL, 0, false);
+                              NULL, 0, true);

[acolwell GONE FROM CHROMIUM, 2012/08/01 17:29:23]

This being false was a bug.

       has_video_ = true;
       video_track_id_ = track->header.track_id;
     }
   }
 
   // TODO(strobe): For now, we avoid sending new configs on a new
   // reinitialization segment, and instead simply embed the updated parameter
   // sets into the video stream.  The conditional should be removed when
   // http://crbug.com/122913 is fixed.  (We detect whether we've already sent
   // configs by looking at init_cb_ instead of config_cb_, because init_cb_
@@ skipping 220 matching lines @@
   return true;
 }
 
 void MP4StreamParser::ChangeState(State new_state) {
   DVLOG(2) << "Changing state: " << new_state;
   state_ = new_state;
 }
 
 }  // namespace mp4
 }  // namespace media