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

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

Issue 478403002: Fix HLS playback on Galaxy S4 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
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 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 // pipeline/decoders. 302 // pipeline/decoders.
303 void ContentDecryptionModuleAttached( 303 void ContentDecryptionModuleAttached(
304 blink::WebContentDecryptionModuleResult result, 304 blink::WebContentDecryptionModuleResult result,
305 bool success); 305 bool success);
306 306
307 bool EnsureTextureBackedSkBitmap(GrContext* gr, SkBitmap& bitmap, 307 bool EnsureTextureBackedSkBitmap(GrContext* gr, SkBitmap& bitmap,
308 const blink::WebSize& size, 308 const blink::WebSize& size,
309 GrSurfaceOrigin origin, 309 GrSurfaceOrigin origin,
310 GrPixelConfig config); 310 GrPixelConfig config);
311 311
312 bool IsHLSStream() const;
313
312 blink::WebFrame* const frame_; 314 blink::WebFrame* const frame_;
313 315
314 blink::WebMediaPlayerClient* const client_; 316 blink::WebMediaPlayerClient* const client_;
315 317
316 // |delegate_| is used to notify the browser process of the player status, so 318 // |delegate_| is used to notify the browser process of the player status, so
317 // that the browser process can control screen locks. 319 // that the browser process can control screen locks.
318 // TODO(qinmin): Currently android mediaplayer takes care of the screen 320 // TODO(qinmin): Currently android mediaplayer takes care of the screen
319 // lock. So this is only used for media source. Will apply this to regular 321 // lock. So this is only used for media source. Will apply this to regular
320 // media tag once http://crbug.com/247892 is fixed. 322 // media tag once http://crbug.com/247892 is fixed.
321 base::WeakPtr<WebMediaPlayerDelegate> delegate_; 323 base::WeakPtr<WebMediaPlayerDelegate> delegate_;
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 477
476 // NOTE: Weak pointers must be invalidated before all other member variables. 478 // NOTE: Weak pointers must be invalidated before all other member variables.
477 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; 479 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
478 480
479 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 481 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
480 }; 482 };
481 483
482 } // namespace content 484 } // namespace content
483 485
484 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 486 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698