summaryrefslogtreecommitdiffstats
path: root/webkit/glue/media/video_renderer_impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/glue/media/video_renderer_impl.cc')
-rw-r--r--webkit/glue/media/video_renderer_impl.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/webkit/glue/media/video_renderer_impl.cc b/webkit/glue/media/video_renderer_impl.cc
index 70dbe7a9a..4532935 100644
--- a/webkit/glue/media/video_renderer_impl.cc
+++ b/webkit/glue/media/video_renderer_impl.cc
@@ -21,9 +21,9 @@ VideoRendererImpl::VideoRendererImpl(bool pts_logging)
VideoRendererImpl::~VideoRendererImpl() {}
bool VideoRendererImpl::OnInitialize(media::VideoDecoder* decoder) {
- video_size_.SetSize(decoder->width(), decoder->height());
+ natural_size_ = decoder->natural_size();
bitmap_.setConfig(SkBitmap::kARGB_8888_Config,
- decoder->width(), decoder->height());
+ natural_size_.width(), natural_size_.height());
bitmap_.allocPixels();
bitmap_.eraseRGB(0x00, 0x00, 0x00);
bitmap_.setIsVolatile(true);
@@ -162,12 +162,12 @@ void VideoRendererImpl::SlowPaint(media::VideoFrame* video_frame,
SkMatrix matrix;
matrix.setTranslate(static_cast<SkScalar>(dest_rect.x()),
static_cast<SkScalar>(dest_rect.y()));
- if (dest_rect.width() != video_size_.width() ||
- dest_rect.height() != video_size_.height()) {
+ if (dest_rect.width() != natural_size_.width() ||
+ dest_rect.height() != natural_size_.height()) {
matrix.preScale(SkIntToScalar(dest_rect.width()) /
- SkIntToScalar(video_size_.width()),
+ SkIntToScalar(natural_size_.width()),
SkIntToScalar(dest_rect.height()) /
- SkIntToScalar(video_size_.height()));
+ SkIntToScalar(natural_size_.height()));
}
SkPaint paint;
paint.setFlags(SkPaint::kFilterBitmap_Flag);