[MM] Remove dead codes: TIZEN_VIDEO_HOLE

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

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

Reviewed by: sns.park

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

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 646d8ba..6b7bc5c 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
@@ -9,15 +9,6 @@
 #include "media/base/tizen/media_source_player_capi.h"
 #include "third_party/libyuv/include/libyuv.h"
 
-#if defined(TIZEN_VIDEO_HOLE)
-#include <Ecore_Evas.h>
-#include <Ecore_X.h>
-#include <X11/extensions/shape.h>
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#endif
-
 namespace {
 const int kDurationUpdateInterval = 100;
 
@@ -112,7 +103,6 @@ void OnCapiVideoBufStatusCB(player_media_stream_buffer_status_e status,
   }
 }
 
-#if !defined(TIZEN_VIDEO_HOLE)
 static void OnMediaPacketDecoded(media_packet_h packet, void* data) {
   if (!packet) {
     LOG(ERROR) << "media_packet handle is null";
@@ -122,7 +112,6 @@ static void OnMediaPacketDecoded(media_packet_h packet, void* data) {
   MediaSourcePlayerCapi* player = static_cast<MediaSourcePlayerCapi*>(data);
   player->OnMediaPacketUpdated(packet);
 }
-#endif
 
 void OnPlaybackCompleteCB(void* user_data) {
   LOG(INFO) << "On playback complete Call back";
@@ -184,11 +173,7 @@ MediaSourcePlayerCapi::MediaSourcePlayerCapi(
       should_feed_video_(false),
       seek_offset_(0),
       seek_state_(MEDIA_SEEK_NONE),
-#if defined(TIZEN_VIDEO_HOLE)
-      native_window_(0),
-#else
       media_packet_(NULL),
-#endif
       audio_format_(NULL),
       video_format_(NULL),
       weak_factory_(this) {
@@ -225,36 +210,12 @@ MediaSourcePlayerCapi::MediaSourcePlayerCapi(
     return;
   }
 
-#if defined(TIZEN_VIDEO_HOLE)
-  ecore_x_init(0);
-  Display* native_display = static_cast<Display*>(ecore_x_display_get());
-
-  native_window_ = XCreateSimpleWindow(native_display,
-                                       manager()->GetEcoreXWindow(),
-                                       10, 10, 10, 10, 0,
-                                       BlackPixel(native_display, 0),
-                                       WhitePixel(native_display, 0));
-  XSetWindowBackgroundPixmap(native_display, native_window_, None);
-  XMapRaised(native_display, native_window_);
-  XFlush(native_display);
-  XSync(native_display, FALSE);
-
-  ret = player_set_display(player_,
-                           PLAYER_DISPLAY_TYPE_OVERLAY,
-                           GET_DISPLAY(native_window_));
-
-  if (ret != PLAYER_ERROR_NONE) {
-    HandleError(blink::WebMediaPlayer::NetworkStateFormatError);
-    return;
-  }
-#else  // VIDEO_HOLE
   ret = player_set_media_packet_video_frame_decoded_cb(
             player_, OnMediaPacketDecoded, this);
   if (ret != PLAYER_ERROR_NONE) {
     HandlePlayerError(ret, "player_set_media_packet_video_frame_decoded_cb");
     return;
   }
-#endif
 
   player_set_display_visible(player_, true);
 
@@ -388,33 +349,11 @@ void MediaSourcePlayerCapi::OnDemuxerSeekDone(
   OnReadDemuxedData(media::DemuxerStream::VIDEO);
 }
 
-#if defined(TIZEN_VIDEO_HOLE)
-void MediaSourcePlayerCapi::PlatformSurfaceUpdated() {
-  manager()->OnPlatformSurfaceUpdated(GetPlayerId(), 0, 0,
-                                      width_, height_);
-}
-
-void MediaSourcePlayerCapi::MoveAndresizeWindow(int x, int y, int width,
-                                                int height) {
-  if (!native_window_)
-    return;
-
-  Display* native_display = static_cast<Display*>(ecore_x_display_get());
-  if (!XMoveResizeWindow(
-      native_display, native_window_, x, y, width, height)) {
-    return;
-  }
-
-  XFlush(native_display);
-  XSync(native_display, false);
-}
-#else
 void MediaSourcePlayerCapi::OnMediaPacketUpdated(media_packet_h packet) {
   task_runner_->PostTask(
       FROM_HERE, base::Bind(&MediaSourcePlayerCapi::DeliverMediaPacket,
                             weak_factory_.GetWeakPtr(), packet));
 }
-#endif  // TIZEN_VIDEO_HOLE
 
 void MediaSourcePlayerCapi::SetVolume(double volume) {
   if (GetPlayerState() <= PLAYER_STATE_IDLE)

diff --git a/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.h b/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.h
index 4bb75ac..7d4fa15 100644 (file)
--- a/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.h
+++ b/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.h
@@ -63,13 +63,7 @@ class MEDIA_EXPORT MediaSourcePlayerCapi
   void OnPrepareComplete();
   void OnPlayerError(int error_code, const char* msg);
 
-  // For handleing video buffer
-#if defined(TIZEN_VIDEO_HOLE)
-  void PlatformSurfaceUpdated();
-  void MoveAndresizeWindow(int x, int y, int width, int height);
-#else
   void OnMediaPacketUpdated(media_packet_h packet);
-#endif
 
  protected:
   void Release() override;
@@ -136,11 +130,7 @@ class MEDIA_EXPORT MediaSourcePlayerCapi
   double seek_offset_;
   MediaSeekState seek_state_;
 
-#if defined(TIZEN_VIDEO_HOLE)
-  unsigned native_window_;
-#else
   media_packet_h media_packet_;
-#endif
 
   // FIXME(Venu): Make them a smart pointer to avoid leak.
   media_format_h audio_format_;