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

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

Issue 1418513016: Revert of webgl: optimize webgl.texSubImage2D(video) path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 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 <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 // issue that Skia could not handle Android's GL_TEXTURE_EXTERNAL_OES texture 131 // issue that Skia could not handle Android's GL_TEXTURE_EXTERNAL_OES texture
132 // internally. It should be removed and replaced by the normal paint path. 132 // internally. It should be removed and replaced by the normal paint path.
133 // https://code.google.com/p/skia/issues/detail?id=1189 133 // https://code.google.com/p/skia/issues/detail?id=1189
134 virtual void paint(blink::WebCanvas* canvas, 134 virtual void paint(blink::WebCanvas* canvas,
135 const blink::WebRect& rect, 135 const blink::WebRect& rect,
136 unsigned char alpha, 136 unsigned char alpha,
137 SkXfermode::Mode mode); 137 SkXfermode::Mode mode);
138 138
139 bool copyVideoTextureToPlatformTexture( 139 bool copyVideoTextureToPlatformTexture(
140 blink::WebGraphicsContext3D* web_graphics_context, 140 blink::WebGraphicsContext3D* web_graphics_context,
141 const CopyVideoTextureParams& params) override; 141 unsigned int texture,
142 unsigned int internal_format,
143 unsigned int type,
144 bool premultiply_alpha,
145 bool flip_y) override;
142 146
143 // True if the loaded media has a playable video/audio track. 147 // True if the loaded media has a playable video/audio track.
144 virtual bool hasVideo() const; 148 virtual bool hasVideo() const;
145 virtual bool hasAudio() const; 149 virtual bool hasAudio() const;
146 150
147 virtual bool isRemote() const; 151 virtual bool isRemote() const;
148 152
149 // Dimensions of the video. 153 // Dimensions of the video.
150 virtual blink::WebSize naturalSize() const; 154 virtual blink::WebSize naturalSize() const;
151 155
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 531
528 // NOTE: Weak pointers must be invalidated before all other member variables. 532 // NOTE: Weak pointers must be invalidated before all other member variables.
529 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; 533 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
530 534
531 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 535 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
532 }; 536 };
533 537
534 } // namespace content 538 } // namespace content
535 539
536 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 540 #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