[MM] Remove |format| as argument

Removed the unused argument |format| and changed the order of resolution
parameters |width|, |height|.

Bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=15536

Reviewed by: k2.nagaraju, msu.koo, sm.venugopal

Change-Id: Ic7a9723e39d724f6a78cd777565b9e851cb5a411
Signed-off-by: samyukta.c <samyukta.c@samsung.com>

diff --git a/tizen_src/chromium_impl/content/browser/media/efl/browser_media_player_manager_efl.cc b/tizen_src/chromium_impl/content/browser/media/efl/browser_media_player_manager_efl.cc
index e5ea306..f20de02 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/media/efl/browser_media_player_manager_efl.cc
+++ b/tizen_src/chromium_impl/content/browser/media/efl/browser_media_player_manager_efl.cc
@@ -187,11 +187,10 @@ void BrowserMediaPlayerManagerEfl::OnNetworkStateChange(
       GetRoutingID(), player_id, state));
 }
 
-void BrowserMediaPlayerManagerEfl::OnMediaDataChange(int player_id,
-                                                     int format, int height,
-                                                     int width, int media) {
+void BrowserMediaPlayerManagerEfl::OnMediaDataChange(int player_id, int width,
+                                                     int height, int media) {
   Send(new MediaPlayerEflMsg_MediaDataChanged(GetRoutingID(), player_id,
-                                              format, height, width, media));
+                                              width, height, media));
 }
 
 int BrowserMediaPlayerManagerEfl::GetRoutingID() {

diff --git a/tizen_src/chromium_impl/content/browser/media/efl/browser_media_player_manager_efl.h b/tizen_src/chromium_impl/content/browser/media/efl/browser_media_player_manager_efl.h
index 401e145..591e544 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/media/efl/browser_media_player_manager_efl.h
+++ b/tizen_src/chromium_impl/content/browser/media/efl/browser_media_player_manager_efl.h
@@ -44,8 +44,8 @@ class CONTENT_EXPORT BrowserMediaPlayerManagerEfl
   void OnNetworkStateChange(
       int player_id,
       blink::WebMediaPlayer::NetworkState state) override;
-  void OnMediaDataChange(int player_id, int format, int height,
-                         int width, int media) override;
+  void OnMediaDataChange(int player_id, int width,
+                         int height, int media) override;
   void OnNewFrameAvailable(
       int player_id,
       base::SharedMemoryHandle foreign_memory_handle,

diff --git a/tizen_src/chromium_impl/content/common/media/efl/media_player_messages_efl.h b/tizen_src/chromium_impl/content/common/media/efl/media_player_messages_efl.h
index c0785ac..51515f4 100644 (file)
--- a/tizen_src/chromium_impl/content/common/media/efl/media_player_messages_efl.h
+++ b/tizen_src/chromium_impl/content/common/media/efl/media_player_messages_efl.h
@@ -132,11 +132,10 @@ IPC_MESSAGE_ROUTED2(MediaPlayerEflMsg_NetworkStateChange,
                     blink::WebMediaPlayer::NetworkState /* state */)
 
 // Gst media data has changed.
-IPC_MESSAGE_ROUTED5(MediaPlayerEflMsg_MediaDataChanged,
+IPC_MESSAGE_ROUTED4(MediaPlayerEflMsg_MediaDataChanged,
                     int /* player_id */,
-                    int /* format */,
-                    int /* height */,
                     int /* width */,
+                    int /* height */,
                     int /* media */)
 
 // On new frame available.

diff --git a/tizen_src/chromium_impl/content/renderer/media/efl/renderer_media_player_manager_efl.cc b/tizen_src/chromium_impl/content/renderer/media/efl/renderer_media_player_manager_efl.cc
index a183af3..a9426b3 100644 (file)
--- a/tizen_src/chromium_impl/content/renderer/media/efl/renderer_media_player_manager_efl.cc
+++ b/tizen_src/chromium_impl/content/renderer/media/efl/renderer_media_player_manager_efl.cc
@@ -86,12 +86,11 @@ void RendererMediaPlayerManager::Initialize(
                                         url, volume, demuxer_client_id));
 }
 
-void RendererMediaPlayerManager::OnMediaDataChange(int player_id, int format,
-                                                   int height, int width,
-                                                   int media) {
+void RendererMediaPlayerManager::OnMediaDataChange(int player_id, int width,
+                                                   int height, int media) {
   WebMediaPlayerEfl* player = GetMediaPlayer(player_id);
   if (player)
-    player->OnMediaDataChange(format, height, width, media);
+    player->OnMediaDataChange(width, height, media);
 }
 
 void RendererMediaPlayerManager::OnDurationChange(

diff --git a/tizen_src/chromium_impl/content/renderer/media/efl/renderer_media_player_manager_efl.h b/tizen_src/chromium_impl/content/renderer/media/efl/renderer_media_player_manager_efl.h
index ddbcb86..ee30071 100644 (file)
--- a/tizen_src/chromium_impl/content/renderer/media/efl/renderer_media_player_manager_efl.h
+++ b/tizen_src/chromium_impl/content/renderer/media/efl/renderer_media_player_manager_efl.h
@@ -76,8 +76,7 @@ class RendererMediaPlayerManager : public RenderFrameObserver {
 #endif
 
   WebMediaPlayerEfl* GetMediaPlayer(int player_id);
-  void OnMediaDataChange(int player_id, int format, int height,
-                         int width, int media);
+  void OnMediaDataChange(int player_id, int width, int height, int media);
   void OnDurationChange(int player_id, double duration);
   void OnTimeUpdate(int player_id, double current_time);
   void OnBufferUpdate(

diff --git a/tizen_src/chromium_impl/content/renderer/media/efl/webmediaplayer_efl.cc b/tizen_src/chromium_impl/content/renderer/media/efl/webmediaplayer_efl.cc
index ffc098d..f2cbc0e 100644 (file)
--- a/tizen_src/chromium_impl/content/renderer/media/efl/webmediaplayer_efl.cc
+++ b/tizen_src/chromium_impl/content/renderer/media/efl/webmediaplayer_efl.cc
@@ -510,9 +510,7 @@ void WebMediaPlayerEfl::FrameReady(
                  frame));
 }
 
-// TODO(Venu): Remove |format| as agrument.
-void WebMediaPlayerEfl::OnMediaDataChange(int format, int height,
-                                          int width, int media) {
+void WebMediaPlayerEfl::OnMediaDataChange(int width, int height, int media) {
   video_height_ = height;
   video_width_  = width;
   audio_ = media & media::MEDIA_AUDIO_MASK ? true : false;

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 d016b1c..5f0c8f4 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
@@ -154,7 +154,7 @@ class WebMediaPlayerEfl
       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(

diff --git a/tizen_src/chromium_impl/media/base/efl/media_player_efl.cc b/tizen_src/chromium_impl/media/base/efl/media_player_efl.cc
index 2f0722e..b9ec77c 100644 (file)
--- a/tizen_src/chromium_impl/media/base/efl/media_player_efl.cc
+++ b/tizen_src/chromium_impl/media/base/efl/media_player_efl.cc
@@ -38,9 +38,8 @@ void MediaPlayerEfl::DeliverMediaPacket(ScopedMediaPacket packet) {
     width_ = static_cast<int>(suf_info.width);
     height_ = static_cast<int>(suf_info.height);
 
-    // Format will always convert to I420
     manager()->OnMediaDataChange(
-        GetPlayerId(), TBM_FORMAT_YUV420, height_, width_, MEDIA_VIDEO_MASK);
+        GetPlayerId(), width_, height_, MEDIA_VIDEO_MASK);
   }
 
   // TODO(max): Need to check if we can use "media_packet_get_pts" instead of
@@ -67,6 +66,8 @@ void MediaPlayerEfl::DeliverMediaPacket(ScopedMediaPacket packet) {
   }
 
   unsigned char* y_ptr = static_cast<unsigned char*>(shared_memory.memory());
+
+  // Video format will always be converted to I420
   switch (suf_info.format) {
     case TBM_FORMAT_NV12: {
       unsigned char* u_ptr = y_ptr + suf_info.planes[0].size;

diff --git a/tizen_src/chromium_impl/media/base/efl/media_player_manager_efl.h b/tizen_src/chromium_impl/media/base/efl/media_player_manager_efl.h
index 8b4244e..fdaec52 100644 (file)
--- a/tizen_src/chromium_impl/media/base/efl/media_player_manager_efl.h
+++ b/tizen_src/chromium_impl/media/base/efl/media_player_manager_efl.h
@@ -37,8 +37,8 @@ class MEDIA_EXPORT MediaPlayerManager {
                                   blink::WebMediaPlayer::ReadyState state) = 0;
   virtual void OnNetworkStateChange(
       int player_id, blink::WebMediaPlayer::NetworkState state) = 0;
-  virtual void OnMediaDataChange(int player_id, int format, int height,
-                                 int width, int media) = 0;
+  virtual void OnMediaDataChange(int player_id, int width,
+                                 int height, int media) = 0;
   virtual void OnNewFrameAvailable(
       int player_id,
       base::SharedMemoryHandle handle,

diff --git a/tizen_src/chromium_impl/media/base/tizen/media_player_bridge_capi.cc b/tizen_src/chromium_impl/media/base/tizen/media_player_bridge_capi.cc
index bfb6d17..2540f3b 100644 (file)
--- a/tizen_src/chromium_impl/media/base/tizen/media_player_bridge_capi.cc
+++ b/tizen_src/chromium_impl/media/base/tizen/media_player_bridge_capi.cc
@@ -411,8 +411,7 @@ void MediaPlayerBridgeCapi::UpdateMediaType() {
   if (width_ > 0 && height_ > 0)
     media_type_ |= MEDIA_VIDEO_MASK;
 
-  manager()->OnMediaDataChange(
-      GetPlayerId(), TBM_FORMAT_YUV420, height_, width_, media_type_);
+  manager()->OnMediaDataChange(GetPlayerId(), width_, height_, media_type_);
 }
 
 void MediaPlayerBridgeCapi::UpdateDuration() {

diff --git a/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.cc b/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.cc
index 44173cd..7deda0b 100644 (file)
--- a/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.cc
+++ b/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.cc
@@ -544,8 +544,7 @@ void MediaSourcePlayerCapi::OnDemuxerConfigsAvailable(
   if (width_ > 0 && height_ > 0)
     media_type_ |= MEDIA_VIDEO_MASK;
 
-  manager()->OnMediaDataChange(
-      GetPlayerId(), TBM_FORMAT_YUV420, height_, width_, media_type_);
+  manager()->OnMediaDataChange(GetPlayerId(), width_, height_, media_type_);
   manager()->OnReadyStateChange(
       GetPlayerId(), blink::WebMediaPlayer::ReadyStateHaveMetadata);