| OLD | NEW |
| 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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 void SetNeedsEstablishPeer(bool needs_establish_peer); | 249 void SetNeedsEstablishPeer(bool needs_establish_peer); |
| 250 | 250 |
| 251 private: | 251 private: |
| 252 void Pause(bool is_media_related_action); | 252 void Pause(bool is_media_related_action); |
| 253 void DrawRemotePlaybackIcon(); | 253 void DrawRemotePlaybackIcon(); |
| 254 void ReallocateVideoFrame(); | 254 void ReallocateVideoFrame(); |
| 255 void CreateWebLayerIfNeeded(); | 255 void CreateWebLayerIfNeeded(); |
| 256 void SetCurrentFrameInternal(scoped_refptr<media::VideoFrame>& frame); | 256 void SetCurrentFrameInternal(scoped_refptr<media::VideoFrame>& frame); |
| 257 void DidLoadMediaInfo(MediaInfoLoader::Status status); | 257 void DidLoadMediaInfo(MediaInfoLoader::Status status); |
| 258 void DoReleaseRemotePlaybackTexture( | 258 void DoReleaseRemotePlaybackTexture( |
| 259 scoped_ptr<gpu::MailboxHolder> mailbox_holder); | 259 const std::vector<uint32>& release_sync_points); |
| 260 | 260 |
| 261 bool IsKeySystemSupported(const std::string& key_system); | 261 bool IsKeySystemSupported(const std::string& key_system); |
| 262 | 262 |
| 263 // Actually do the work for generateKeyRequest/addKey so they can easily | 263 // Actually do the work for generateKeyRequest/addKey so they can easily |
| 264 // report results to UMA. | 264 // report results to UMA. |
| 265 MediaKeyException GenerateKeyRequestInternal(const std::string& key_system, | 265 MediaKeyException GenerateKeyRequestInternal(const std::string& key_system, |
| 266 const unsigned char* init_data, | 266 const unsigned char* init_data, |
| 267 unsigned init_data_length); | 267 unsigned init_data_length); |
| 268 MediaKeyException AddKeyInternal(const std::string& key_system, | 268 MediaKeyException AddKeyInternal(const std::string& key_system, |
| 269 const unsigned char* key, | 269 const unsigned char* key, |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 | 435 |
| 436 // NOTE: Weak pointers must be invalidated before all other member variables. | 436 // NOTE: Weak pointers must be invalidated before all other member variables. |
| 437 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; | 437 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; |
| 438 | 438 |
| 439 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); | 439 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); |
| 440 }; | 440 }; |
| 441 | 441 |
| 442 } // namespace content | 442 } // namespace content |
| 443 | 443 |
| 444 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ | 444 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ |
| OLD | NEW |