webkit/media/android/webmediaplayer_android.cc - Issue 10824141: Remove VideoDecoder::natural_size() & added VideoFrame::natural_size().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/media/android/webmediaplayer_android.cc

Issue 10824141: Remove VideoDecoder::natural_size() & added VideoFrame::natural_size(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address CR comments & fix content_unittests. 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

« content/renderer/media/capture_video_decoder_unittest.cc ('K') | « media/tools/shader_bench/shader_bench.cc ('k') | webkit/media/skcanvas_video_renderer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webkit/media/android/webmediaplayer_android.cc

diff --git a/webkit/media/android/webmediaplayer_android.cc b/webkit/media/android/webmediaplayer_android.cc

index ef457b25e5d4f7a9ed113b028d99647e2a57141b..bbf2b8f6cff08f79b298d09fbcdfc90e01087efd 100644

--- a/webkit/media/android/webmediaplayer_android.cc

+++ b/webkit/media/android/webmediaplayer_android.cc

@@ -449,11 +449,11 @@ void WebMediaPlayerAndroid::OnVideoSizeChanged(int width, int height) {

if (natural_size_.width == width && natural_size_.height == height)

return;

- natural_size_.width = width;

- natural_size_.height = height;

+ natural_size_.SetSize(width, height);

if (texture_id_) {

video_frame_.reset(new WebVideoFrameImpl(VideoFrame::WrapNativeTexture(

- texture_id_, kGLTextureExternalOES, width, height, base::TimeDelta(),

+ texture_id_, kGLTextureExternalOES, natural_size_, natural_size_,

+ base::TimeDelta(),

base::Closure())));

}