diff options
| author | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-16 00:20:20 +0000 |
|---|---|---|
| committer | vrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-16 00:20:20 +0000 |
| commit | e4d9491934ef4bb70aeac5c92cbe76e0399e7367 (patch) | |
| tree | 743748d7cc4708e501fb09cfe1e7805b1f1e3dce /media/tools | |
| parent | a1d41ed5a126c9426f986930fb420e0c9c3f7faa (diff) | |
| download | chromium_src-e4d9491934ef4bb70aeac5c92cbe76e0399e7367.zip chromium_src-e4d9491934ef4bb70aeac5c92cbe76e0399e7367.tar.gz chromium_src-e4d9491934ef4bb70aeac5c92cbe76e0399e7367.tar.bz2 | |
Revert 101418 - Fix aspect ratio and clarify video frame dimensions
BUG=18941,94861
TEST=video-aspect-ratio.html
Review URL: http://codereview.chromium.org/7864009
TBR=vrk@google.com
Review URL: http://codereview.chromium.org/7919006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/player_wtl/wtl_renderer.cc | 3 | ||||
| -rw-r--r-- | media/tools/player_x11/gl_video_renderer.cc | 3 | ||||
| -rw-r--r-- | media/tools/player_x11/x11_video_renderer.cc | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/media/tools/player_wtl/wtl_renderer.cc b/media/tools/player_wtl/wtl_renderer.cc index c5d9fd3..baec88e 100644 --- a/media/tools/player_wtl/wtl_renderer.cc +++ b/media/tools/player_wtl/wtl_renderer.cc @@ -13,8 +13,7 @@ WtlVideoRenderer::WtlVideoRenderer(WtlVideoWindow* window) WtlVideoRenderer::~WtlVideoRenderer() {} bool WtlVideoRenderer::OnInitialize(media::VideoDecoder* decoder) { - window_->SetSize( - decoder->natural_size().width(), decoder->natural_size().height()); + window_->SetSize(decoder->width(), decoder->height()); return true; } diff --git a/media/tools/player_x11/gl_video_renderer.cc b/media/tools/player_x11/gl_video_renderer.cc index 6c6cda4..b58b4df 100644 --- a/media/tools/player_x11/gl_video_renderer.cc +++ b/media/tools/player_x11/gl_video_renderer.cc @@ -128,8 +128,7 @@ bool GlVideoRenderer::OnInitialize(media::VideoDecoder* decoder) { LOG(INFO) << "Initializing GL Renderer..."; // Resize the window to fit that of the video. - XResizeWindow(display_, window_, decoder->natural_size().width(), - decoder->natural_size().height()); + XResizeWindow(display_, window_, decoder->width(), decoder->height()); gl_context_ = InitGLContext(display_, window_); if (!gl_context_) diff --git a/media/tools/player_x11/x11_video_renderer.cc b/media/tools/player_x11/x11_video_renderer.cc index a06f6b8..055e54b 100644 --- a/media/tools/player_x11/x11_video_renderer.cc +++ b/media/tools/player_x11/x11_video_renderer.cc @@ -94,8 +94,8 @@ bool X11VideoRenderer::OnInitialize(media::VideoDecoder* decoder) { LOG(INFO) << "Initializing X11 Renderer..."; // Resize the window to fit that of the video. - int width = decoder->natural_size().width(); - int height = decoder->natural_size().height(); + int width = decoder->width(); + int height = decoder->height(); XResizeWindow(display_, window_, width, height); // Allocate an XImage for caching RGB result. |