[M49_2623] Chromium upversion to m49_2623 branch.

[platform/framework/web/chromium-efl.git] / tizen_src / chromium_impl / content / renderer / media / efl / webmediaplayer_efl.h

diff --git a/tizen_src/chromium_impl/content/renderer/media/efl/webmediaplayer_efl.h b/tizen_src/chromium_impl/content/renderer/media/efl/webmediaplayer_efl.h
index a909883..887a8b1 100644 (file)
--- a/tizen_src/chromium_impl/content/renderer/media/efl/webmediaplayer_efl.h
+++ b/tizen_src/chromium_impl/content/renderer/media/efl/webmediaplayer_efl.h
@@ -14,9 +14,9 @@
 #include "content/renderer/media/efl/renderer_media_player_manager_efl.h"
 #include "media/blink/webmediaplayer_util.h"
 #include "media/base/efl/media_player_efl.h"
-#include "media/blink/skcanvas_video_renderer.h"
 #include "media/blink/video_frame_compositor.h"
 #include "media/blink/webmediaplayer_params.h"
+#include "media/renderers/skcanvas_video_renderer.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayerEncryptedMediaClient.h"
 
@@ -77,7 +77,9 @@ class WebMediaPlayerEfl
   void setVolume(double) override;
   blink::WebTimeRanges buffered() const override;
   blink::WebTimeRanges seekable() const override;
-  void setSinkId(const blink::WebString&, media::WebSetSinkIdCB*) override;
+  void setSinkId(const blink::WebString& sink_id,
+                 const blink::WebSecurityOrigin& security_origin,
+                 blink::WebSetSinkIdCallbacks* web_callback) override;
 
   void paint(blink::WebCanvas*,
       const blink::WebRect&,
@@ -143,14 +145,16 @@ class WebMediaPlayerEfl
   void SetNetworkState(WebMediaPlayer::NetworkState state);
 
   void OnNewFrameAvailable(base::SharedMemoryHandle foreign_memory_handle,
-                           uint32 length, base::TimeDelta timestamp);
+                           uint32_t length, base::TimeDelta timestamp);
 
 #if defined(TIZEN_TBM_SUPPORT)
-  void OnNewTbmBufferAvailable(gfx::TbmBufferHandle tbm_handle,
-                               base::TimeDelta timestamp);
+  void OnNewTbmBufferAvailable(
+      const gfx::TbmBufferHandle& tbm_handle,
+      base::TimeDelta timestamp,
+      const base::Closure& cb);
 #endif
 
-  void OnMediaDataChange(int format, int height, int width, int media);
+  void OnMediaDataChange(int width, int height, int media);
   void OnDurationChange(double duration);
   void OnTimeUpdate(double current_time);
   void OnBufferUpdate(
@@ -223,9 +227,8 @@ class WebMediaPlayerEfl
   // Player ID assigned by the |manager_|.
   int player_id_;
 
-  uint32 gst_video_format_;
-  int gst_width_;
-  int gst_height_;
+  int video_width_;
+  int video_height_;
 
   bool audio_;
   bool video_;
@@ -247,7 +250,7 @@ class WebMediaPlayerEfl
   mutable bool did_loading_progress_;
 
   // Factories for supporting video accelerators. May be null.
-  scoped_refptr<media::GpuVideoAcceleratorFactories> gpu_factories_;
+  media::GpuVideoAcceleratorFactories* gpu_factories_;
 #if defined(TIZEN_MULTIMEDIA_EME_SUPPORT)
   scoped_ptr<media::EncryptedMediaPlayerSupport> encrypted_media_support_;
 #endif