content/renderer/media/android/webmediaplayer_android.h - Issue 1417853006: gpu: introduce glSetStreamTextureSizeCHROMIUM(GLuint texture, GLint stream_id, GLsizei width, GLsiz…

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: content/renderer/media/android/webmediaplayer_android.h

Issue 1417853006: gpu: introduce glSetStreamTextureSizeCHROMIUM(GLuint texture, GLint stream_id, GLsizei width, GLsiz… Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix android_webview.test failure Created 5 years, 1 month 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/common/gpu/stream_texture_android.h ('K') | « content/renderer/media/android/stream_texture_factory_synchronous_impl.cc ('k') | content/renderer/media/android/webmediaplayer_android.cc » ('j') | gpu/command_buffer/service/gles2_cmd_decoder.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/android/webmediaplayer_android.h

diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h

index bb338153f8fac37a3809049b86557513c440d313..08fb9d263f69d05f8225d8c08e0581ee42be2de4 100644

--- a/content/renderer/media/android/webmediaplayer_android.h

+++ b/content/renderer/media/android/webmediaplayer_android.h

@@ -296,6 +296,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,

void ReallocateVideoFrame();

void SetCurrentFrameInternal(scoped_refptr<media::VideoFrame>& frame);

void RemoveSurfaceTextureAndProxy();

+ void UpdateStreamTextureSize();

void DidLoadMediaInfo(MediaInfoLoader::Status status,

const GURL& redirected_url,

const GURL& first_party_for_cookies,

@@ -432,7 +433,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,

gpu::Mailbox texture_mailbox_;

// Stream texture ID allocated to the video.

- unsigned int stream_id_;

+ int32 stream_id_;

// Whether the media player has been initialized.

bool is_player_initialized_;