HW Video: Make media::VideoFrame handle the sync point of the compositor as well as webgl

content/renderer/media/android/webmediaplayer_android.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
 
 #include <jni.h>
 #include <string>
 #include <vector>
@@ skipping 219 matching lines @@
   void OnNeedKey(const std::string& type,
                  const std::vector<uint8>& init_data);
 
   // TODO(xhwang): Implement WebMediaPlayer::setContentDecryptionModule().
   // See: http://crbug.com/224786
 
   // Can be called on any thread.
   static void OnReleaseRemotePlaybackTexture(
       const scoped_refptr<base::MessageLoopProxy>& main_loop,
       const base::WeakPtr<WebMediaPlayerAndroid>& player,
-      scoped_ptr<gpu::MailboxHolder> mailbox_holder);
+      scoped_ptr<gpu::MailboxHolder> mailbox_holder,
+      const std::vector<uint32>& release_sync_points);
 
  protected:
   // Helper method to update the playing state.
   void UpdatePlayingState(bool is_playing_);
 
   // Helper methods for posting task for setting states and update WebKit.
   void UpdateNetworkState(blink::WebMediaPlayer::NetworkState state);
   void UpdateReadyState(blink::WebMediaPlayer::ReadyState state);
   void TryCreateStreamTextureProxyIfNeeded();
   void DoCreateStreamTexture();
 
   // Helper method to reestablish the surface texture peer for android
   // media player.
   void EstablishSurfaceTexturePeer();
 
   // Requesting whether the surface texture peer needs to be reestablished.
   void SetNeedsEstablishPeer(bool needs_establish_peer);
 
  private:
   void Pause(bool is_media_related_action);
   void DrawRemotePlaybackIcon();
   void ReallocateVideoFrame();
   void CreateWebLayerIfNeeded();
   void SetCurrentFrameInternal(scoped_refptr<media::VideoFrame>& frame);
   void DidLoadMediaInfo(MediaInfoLoader::Status status);
-  void DoReleaseRemotePlaybackTexture(uint32 sync_point);
+  void DoReleaseRemotePlaybackTexture(
+      const std::vector<uint32>& release_sync_points);
 
   bool IsKeySystemSupported(const std::string& key_system);
 
   // Actually do the work for generateKeyRequest/addKey so they can easily
   // report results to UMA.
   MediaKeyException GenerateKeyRequestInternal(const std::string& key_system,
                                                const unsigned char* init_data,
                                                unsigned init_data_length);
   MediaKeyException AddKeyInternal(const std::string& key_system,
                                    const unsigned char* key,
@@ skipping 167 matching lines @@
   scoped_ptr<ProxyDecryptor> proxy_decryptor_;
 
   base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_