diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 00:20:34 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 00:20:34 +0000 |
| commit | c5aee829d059e260b518a2229fdfed6359ec8f46 (patch) | |
| tree | 2bc24bcb8ff9777680ee94d7c7b25432cf19369e /media/mp4 | |
| parent | c6051eb0778c0167a05edbd0851110458b0d8b85 (diff) | |
| download | chromium_src-c5aee829d059e260b518a2229fdfed6359ec8f46.zip chromium_src-c5aee829d059e260b518a2229fdfed6359ec8f46.tar.gz chromium_src-c5aee829d059e260b518a2229fdfed6359ec8f46.tar.bz2 | |
Remove VideoDecoderConfig::aspect_ratio_xxx methods.
BUG=122913
Review URL: https://chromiumcodereview.appspot.com/10830110
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149540 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/mp4')
| -rw-r--r-- | media/mp4/mp4_stream_parser.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/media/mp4/mp4_stream_parser.cc b/media/mp4/mp4_stream_parser.cc index 5bc6fd4..67264f4 100644 --- a/media/mp4/mp4_stream_parser.cc +++ b/media/mp4/mp4_stream_parser.cc @@ -11,6 +11,7 @@ #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" @@ -218,14 +219,16 @@ bool MP4StreamParser::ParseMoov(BoxReader* reader) { 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.size(), + 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); has_video_ = true; video_track_id_ = track->header.track_id; } |