[MM] Remove dead codes: USE_LEGACY_PLAYER_CAPI

USE_LEGACY_PLAYER_CAPI was used for tizen 2.4 on HAWK-P
but it's not used anymore on Tizen 3.0

Bug: http://165.213.149.170/jira/browse/TNEF-6526

This patch includes patchs from beta branch:
8afad0c [MM] Remove dead codes: USE_LEGACY_PLAYER_CAPI
3b13a6e fixup! [MM] Remove dead codes: USE_LEGACY_PLAYER_CAPI

Reviewed by: sns.park

Change-Id: I1b30dadfc428051e6816beb3c250e6af16db86bd
Signed-off-by: msu.koo <msu.koo@samsung.com>

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 850f5f7..9279947 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
@@ -405,14 +405,9 @@ void MediaPlayerBridgeCapi::Seek(const double time) {
     return;
   }
 
-#if defined(USE_LEGACY_PLAYER_CAPI)
-  int err = player_set_position(player_, ConvertSecondsToMilliSeconds(time),
-                                SeekCompletedCb, this);
-#else
   int err = player_set_play_position(player_,
                                      ConvertSecondsToMilliSeconds(time),
                                      true, SeekCompletedCb, this);
-#endif
 
   if (err != PLAYER_ERROR_NONE) {
     LOG(ERROR) << "|player_set_play_position| failed";
@@ -506,11 +501,7 @@ double MediaPlayerBridgeCapi::GetCurrentTime() {
   }
 
   int postion = 0;
-#if defined(USE_LEGACY_PLAYER_CAPI)
-  player_get_position(player_, &postion);
-#else
   player_get_play_position(player_, &postion);
-#endif
   return ConvertMilliSecondsToSeconds(postion);
 }
 

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 8ef1e92..646d8ba 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
@@ -86,26 +86,8 @@ void OnHandleBufferingMessageCB(int percent, void* user_data) {
   player->OnHandleBufferingMessage(percent);
 }
 
-#if defined(USE_LEGACY_PLAYER_CAPI)
-static void OnCapiVideoBufStatusCB(unsigned int size, void* user_data) {
-  MediaSourcePlayerCapi* player =
-      static_cast<MediaSourcePlayerCapi*>(user_data);
-  if (!player || player->IsPlayerDestructing())
-    return;
-  player->OnReadDemuxedData(media::DemuxerStream::VIDEO);
-}
-
-static void OnCapiAudioBufStatusCB(unsigned int size, void* user_data) {
-  MediaSourcePlayerCapi* player =
-      static_cast<MediaSourcePlayerCapi*>(user_data);
-  if (!player || player->IsPlayerDestructing())
-    return;
-  player->OnReadDemuxedData(media::DemuxerStream::AUDIO);
-}
-
-#else
-static void OnCapiAudioBufStatusCB(player_media_stream_buffer_status_e status,
-                                   void* user_data) {
+void OnCapiAudioBufStatusCB(player_media_stream_buffer_status_e status,
+                            void* user_data) {
   MediaSourcePlayerCapi* player =
       static_cast<MediaSourcePlayerCapi*>(user_data);
   if (!player || player->IsPlayerDestructing())
@@ -117,8 +99,8 @@ static void OnCapiAudioBufStatusCB(player_media_stream_buffer_status_e status,
   }
 }
 
-static void  OnCapiVideoBufStatusCB(player_media_stream_buffer_status_e status,
-                                    void* user_data) {
+void OnCapiVideoBufStatusCB(player_media_stream_buffer_status_e status,
+                            void* user_data) {
   MediaSourcePlayerCapi* player =
       static_cast<MediaSourcePlayerCapi*>(user_data);
   if (!player || player->IsPlayerDestructing())
@@ -129,7 +111,6 @@ static void  OnCapiVideoBufStatusCB(player_media_stream_buffer_status_e status,
     player->OnUpdateDataStatus(media::DemuxerStream::VIDEO, false);
   }
 }
-#endif  // USE_LEGACY_PLAYER_CAPI
 
 #if !defined(TIZEN_VIDEO_HOLE)
 static void OnMediaPacketDecoded(media_packet_h packet, void* data) {
@@ -275,17 +256,9 @@ MediaSourcePlayerCapi::MediaSourcePlayerCapi(
   }
 #endif
 
-#if defined(USE_LEGACY_PLAYER_CAPI)
-  player_set_x11_display_visible(player_, true);
-#else
   player_set_display_visible(player_, true);
-#endif
 
-#if defined(USE_LEGACY_PLAYER_CAPI)
-  ret = player_set_uri(player_, "external_demuxer://aaaa");
-#else
   ret = player_set_uri(player_, "es_buff://push_mode");
-#endif
   if (ret != PLAYER_ERROR_NONE) {
     HandlePlayerError(ret, "player_set_uri");
     return;
@@ -380,14 +353,9 @@ void MediaSourcePlayerCapi::SeekInternal() {
     return;
 
   int ret = PLAYER_ERROR_NONE;
-#if defined(USE_LEGACY_PLAYER_CAPI)
-  ret = player_set_position(player_,
-      ConvertSecondsToMilliSeconds(seek_offset_), OnSeekCompleteCB, this);
-#else
   ret = player_set_play_position(
       player_, ConvertSecondsToMilliSeconds(seek_offset_),
       true, OnSeekCompleteCB, this);
-#endif
 
   seek_offset_ = 0.0;
 
@@ -461,11 +429,7 @@ double MediaSourcePlayerCapi::GetCurrentTime() {
     return 0.0;
 
   int position = 0;
-#if defined(USE_LEGACY_PLAYER_CAPI)
-  player_get_position(player_, &position);
-#else
   player_get_play_position(player_, &position);
-#endif
   return ConvertMilliSecondsToSeconds(position);
 }
 
@@ -573,11 +537,9 @@ void MediaSourcePlayerCapi::Release() {
     player_unprepare(player_);
   }
   manager()->OnSuspendComplete(GetPlayerId());
-#if !defined(USE_LEGACY_PLAYER_CAPI)
   if (media_packet_)
     media_packet_destroy(media_packet_);
   media_packet_ = NULL;
-#endif
 }
 
 void MediaSourcePlayerCapi::OnDemuxerConfigsAvailable(
@@ -608,40 +570,6 @@ void MediaSourcePlayerCapi::OnDemuxerConfigsAvailable(
   width_ = configs.video_size.width();
   height_ = configs.video_size.height();
 
-#if defined(USE_LEGACY_PLAYER_CAPI)
-  // Configure Audio Stream
-  player_audio_stream_info_s audio_info = {0, };
-
-  if (configs.audio_codec == kCodecAAC || configs.audio_codec == kCodecMP3)
-    audio_info.mime = "audio/mpeg";
-  audio_info.channels = channel;
-  audio_info.sample_rate = samplerate;
-  audio_info.version = 2;
-
-  ret = player_set_audio_stream_info(player_, &audio_info);
-  if (ret != PLAYER_ERROR_NONE) {
-    LOG(ERROR) << "player_set_audio_stream_info Error: " << ret;
-    return;
-  }
-  player_set_buffer_need_audio_data_cb(player_, OnCapiAudioBufStatusCB, this);
-
-  // Configure Video Stream
-  player_video_stream_info_s video_info = {0, };
-
-  if (configs.video_codec == kCodecH264)
-    video_info.mime = "video/x-h264";
-  video_info.width = width_;
-  video_info.height = height_;
-  video_info.framerate_den = 1;
-  video_info.framerate_num = 30;
-
-  ret = player_set_video_stream_info(player_, &video_info);
-  if (ret != PLAYER_ERROR_NONE) {
-    LOG(ERROR) << "player_set_video_stream_info Error: " << ret;
-    return;
-  }
-  player_set_buffer_need_video_data_cb(player_, OnCapiVideoBufStatusCB, this);
-#else
   ret = media_format_create(&audio_format_);
   if (ret != MEDIA_FORMAT_ERROR_NONE) {
     LOG(ERROR) << "media_format_create : 0x" << ret;
@@ -713,7 +641,7 @@ void MediaSourcePlayerCapi::OnDemuxerConfigsAvailable(
     LOG(ERROR) << "player set video buffer status cb failed : 0x" << ret;
     return;
   }
-#endif
+
   // Audio stream is present if sample rate is valid.
   if (samplerate > 0)
     media_type_ |= MEDIA_AUDIO_MASK;
@@ -828,13 +756,6 @@ void MediaSourcePlayerCapi::OnDemuxerDataAvailable(
     LOG(ERROR) << "ERROR : Size of shared memory is Zero";
     return;
   }
-#if defined(USE_LEGACY_PLAYER_CAPI)
-  if (should_feed_audio_ && should_feed_video_ &&
-      !playing_ && player_prepared_ && (seek_state_ == MEDIA_SEEK_NONE)) {
-      if (GetPlayerState() != PLAYER_STATE_PAUSED)
-        Play();
-  }
-#endif
   ReadFromQueueIfAny(meta_data.type);
 
   if (meta_data.type == media::DemuxerStream::AUDIO && !should_feed_audio_) {
@@ -939,15 +860,6 @@ void MediaSourcePlayerCapi::BufferMetaDataAvailable(
 
 void MediaSourcePlayerCapi::SendEosToCapi(
     const media::DemuxedBufferMetaData& meta_data) {
-#if defined(USE_LEGACY_PLAYER_CAPI)
-  int ret = PLAYER_ERROR_NONE;
-  if (meta_data.type == media::DemuxerStream::AUDIO)
-    ret = player_submit_packet(player_, NULL, 0, 0, PLAYER_TRACK_TYPE_AUDIO);
-  else if (meta_data.type == media::DemuxerStream::VIDEO)
-    ret = player_submit_packet(player_, NULL, 0, 0, PLAYER_TRACK_TYPE_VIDEO);
-  if (ret != PLAYER_ERROR_NONE)
-    HandlePlayerError(ret, "player_submit_packet()");
-#else
   if (meta_data.type == media::DemuxerStream::AUDIO) {
     if (!eos_audio_) {
       if (media_packet_create(audio_format_, NULL, NULL, &media_packet_)
@@ -990,9 +902,6 @@ void MediaSourcePlayerCapi::SendEosToCapi(
   if (media_packet_)
     media_packet_destroy(media_packet_);
   media_packet_ = NULL;
-#endif
-
-  return;
 }
 
 void MediaSourcePlayerCapi::ReadFromQueueIfAny(

diff --git a/tizen_src/chromium_impl/media/base/tizen/webaudio_decoder_browser_capi.h b/tizen_src/chromium_impl/media/base/tizen/webaudio_decoder_browser_capi.h
index fd770ec..ea66d80 100644 (file)
--- a/tizen_src/chromium_impl/media/base/tizen/webaudio_decoder_browser_capi.h
+++ b/tizen_src/chromium_impl/media/base/tizen/webaudio_decoder_browser_capi.h
@@ -6,6 +6,7 @@
 #define MEDIA_BASE_TIZEN_WEBAUDIO_DECODER_BROWSER_CAPI_H_
 
 #include <player.h>
+#include <player_internal.h>
 
 #include "base/basictypes.h"
 #include "base/memory/singleton.h"
@@ -14,12 +15,6 @@
 #include "media/base/efl/webaudio_decoder_efl.h"
 #include "media/base/media_export.h"
 
-#if defined(USE_LEGACY_PLAYER_CAPI)
-#include <player_product.h>
-#else
-#include <player_internal.h>
-#endif
-
 namespace media {
 
 struct WAPCMdata;

diff --git a/tizen_src/chromium_impl/media/media_efl.gypi b/tizen_src/chromium_impl/media/media_efl.gypi
index 5d61ed9..9d0ee57 100644 (file)
--- a/tizen_src/chromium_impl/media/media_efl.gypi
+++ b/tizen_src/chromium_impl/media/media_efl.gypi
@@ -150,16 +150,6 @@
                   'base/efl/webaudio_decoder_browser_gstreamer.h',
                 ],
               }],
-              ['building_for_tizen_tv==1 and chromium_efl_tizen_version!="3.0"', {
-                'defines': [
-                  'USE_LEGACY_PLAYER_CAPI=1',
-                ],
-              }],
-              ['building_for_tizen_tv==1 and chromium_efl_tizen_version!="3.0"', {
-                'defines': [
-                  'USE_LEGACY_PLAYER_CAPI=1',
-                ],
-              }],
             ], # conditions
           }], # _target_name=="media"
         ], # target_conditions