Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1505)

Unified Diff: media/ffmpeg/ffmpeg_common.cc

Issue 10830110: Remove VideoDecoderConfig::aspect_ratio_xxx methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments & rebased Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/video_util.cc ('k') | media/filters/ffmpeg_demuxer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/ffmpeg/ffmpeg_common.cc
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc
index 1a4e41808006e792eb3ecd3a636f5eaaea0ad7a0..740459f707b70adf90b3bccdd7cc8eef805470bd 100644
--- a/media/ffmpeg/ffmpeg_common.cc
+++ b/media/ffmpeg/ffmpeg_common.cc
@@ -5,6 +5,7 @@
#include "media/ffmpeg/ffmpeg_common.h"
#include "base/logging.h"
+#include "media/base/video_util.h"
namespace media {
@@ -250,12 +251,12 @@ void AVStreamToVideoDecoderConfig(
VideoCodec codec = CodecIDToVideoCodec(stream->codec->codec_id);
VideoCodecProfile profile = (codec == kCodecVP8) ? VP8PROFILE_MAIN :
ProfileIDToVideoCodecProfile(stream->codec->profile);
+ gfx::Size natural_size = GetNaturalSize(
+ visible_rect.size(), aspect_ratio.num, aspect_ratio.den);
config->Initialize(codec,
profile,
PixelFormatToVideoFormat(stream->codec->pix_fmt),
- coded_size, visible_rect,
- aspect_ratio.num,
- aspect_ratio.den,
+ coded_size, visible_rect, natural_size,
stream->codec->extradata,
stream->codec->extradata_size,
true);
« no previous file with comments | « media/base/video_util.cc ('k') | media/filters/ffmpeg_demuxer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698