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

Side by Side Diff: content/renderer/media/android/webmediaplayer_android.h

Issue 2562003003: Fix the size of video textures uploaded to WebGL. (Closed)
Patch Set: Rebased. Fixed Android build. Created 3 years, 11 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 unified diff | Download patch
« no previous file with comments | « no previous file | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 // FIXME: This path "only works" on Android. It is a workaround for the 122 // FIXME: This path "only works" on Android. It is a workaround for the
123 // issue that Skia could not handle Android's GL_TEXTURE_EXTERNAL_OES texture 123 // issue that Skia could not handle Android's GL_TEXTURE_EXTERNAL_OES texture
124 // internally. It should be removed and replaced by the normal paint path. 124 // internally. It should be removed and replaced by the normal paint path.
125 // https://code.google.com/p/skia/issues/detail?id=1189 125 // https://code.google.com/p/skia/issues/detail?id=1189
126 void paint(blink::WebCanvas* canvas, 126 void paint(blink::WebCanvas* canvas,
127 const blink::WebRect& rect, 127 const blink::WebRect& rect,
128 SkPaint&) override; 128 SkPaint&) override;
129 129
130 bool copyVideoTextureToPlatformTexture(gpu::gles2::GLES2Interface* gl, 130 bool copyVideoTextureToPlatformTexture(gpu::gles2::GLES2Interface* gl,
131 unsigned int texture, 131 unsigned int texture,
132 unsigned int internal_format,
133 unsigned int type,
134 bool premultiply_alpha, 132 bool premultiply_alpha,
135 bool flip_y) override; 133 bool flip_y) override;
136 134
137 // True if the loaded media has a playable video/audio track. 135 // True if the loaded media has a playable video/audio track.
138 bool hasVideo() const override; 136 bool hasVideo() const override;
139 bool hasAudio() const override; 137 bool hasAudio() const override;
140 138
141 bool isRemote() const override; 139 bool isRemote() const override;
142 140
143 // Dimensions of the video. 141 // Dimensions of the video.
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 424
427 // NOTE: Weak pointers must be invalidated before all other member variables. 425 // NOTE: Weak pointers must be invalidated before all other member variables.
428 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; 426 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
429 427
430 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 428 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
431 }; 429 };
432 430
433 } // namespace content 431 } // namespace content
434 432
435 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 433 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698