Disable TBM for Rpi4 and Emulator Temporarily

This commit disables TBM for Rpi4 and Emulator temporarily.

Change-Id: I75cb2d4cd1b7d8db0a3b066631f40cba1e39d8ab
Signed-off-by: Suhaspoornachandra <s.poornachan@samsung.com>

diff --git a/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.cc b/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.cc
index 23b325d2d028360e7b8181e6b8a263fcd1e04501..79ad4895bc1b007e0decb2c9b63d0ab79dcdd252 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.cc
+++ b/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.cc
@@ -1197,7 +1197,7 @@ void TizenRendererImpl::OnNewTbmFrameAvailable(uint32_t player_id,
 void TizenRendererImpl::OnMediaPacketExhausted(uint64_t media_packet) {
   media_player_->DestroyMediaPacket(reinterpret_cast<void*>(media_packet));
 }
-#else
+#endif
 void TizenRendererImpl::OnNewFrameAvailable(
     uint32_t playerId,
     base::UnsafeSharedMemoryRegion frame,
@@ -1208,6 +1208,5 @@ void TizenRendererImpl::OnNewFrameAvailable(
   client_extension_->OnNewFrameAvailable(playerId, std::move(frame), size,
                                          timestamp, width, height);
 }
-#endif
 
 }  // namespace content

diff --git a/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.h b/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.h
index dcf03938041f687ca66a3822a069ee791902d6b5..554e31b3afea62d063a9b46a0576fec3059e9537 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.h
+++ b/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.h
@@ -169,14 +169,13 @@ class CONTENT_EXPORT TizenRendererImpl
                               gfx::TbmBufferHandle tbm_handle,
                               base::TimeDelta timestamp) override;
   void OnMediaPacketExhausted(uint64_t media_packet) override;
-#else
+#endif
   void OnNewFrameAvailable(uint32_t playerId,
                            base::UnsafeSharedMemoryRegion frame,
                            uint32_t size,
                            base::TimeDelta timestamp,
                            uint32_t width,
                            uint32_t height) override;
-#endif
 
 #if BUILDFLAG(IS_TIZEN_TV)
   content::WebContentsDelegate* GetWebContentsDelegate() const override;

diff --git a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.cc b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.cc
index b7d5ea8ace0a533490d246dfac64bc1fa4c159fc..6465b77e542abeccd3ce11d2670ac23e696a19a8 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.cc
+++ b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.cc
@@ -1140,7 +1140,8 @@ void MediaPlayerBridgeCapi::DeliverMediaPacket(ScopedMediaPacket packet) {
   // generating a new timestamp in here.
   base::TimeDelta timestamp = GetCurrentTime();
 
-#if defined(TIZEN_TBM_SUPPORT)
+// Temporarily disable TBM for Rpi4 and Emulator
+#if defined(TIZEN_TBM_SUPPORT) && (BUILDFLAG(IS_TIZEN_TV) || BUILDFLAG(IS_TIZEN_DA) || defined(ARCH_CPU_RISCV_FAMILY))
   gfx::TbmBufferHandle tbm_handle;
   tbm_handle.tbm_surface = reinterpret_cast<uint64_t>(tbm_surface);
   tbm_handle.media_packet = reinterpret_cast<uint64_t>(packet.release());
@@ -1232,7 +1233,7 @@ void MediaPlayerBridgeCapi::OnNewTbmBufferAvailable(
   GetMediaPlayerClient()->OnNewTbmFrameAvailable(player_id, tbm_handle,
                                                  timestamp);
 }
-#else
+#endif
 void MediaPlayerBridgeCapi::OnNewFrameAvailable(
     int player_id,
     base::UnsafeSharedMemoryRegion shm_region,
@@ -1240,5 +1241,4 @@ void MediaPlayerBridgeCapi::OnNewFrameAvailable(
     base::TimeDelta timestamp) {
   NOTIMPLEMENTED();
 }
-#endif
 }  // namespace media

diff --git a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.h b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.h
index d77f8f484a58d051492c144e252362e2e95bb2e6..8d1b5a37309964fbafba4b5ecaf6d263ffb81555 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.h
+++ b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.h
@@ -153,12 +153,11 @@ class MEDIA_EXPORT MediaPlayerBridgeCapi : public MediaPlayerTizen {
   void OnNewTbmBufferAvailable(int player_id,
                                gfx::TbmBufferHandle tbm_handle,
                                base::TimeDelta timestamp);
-#else
+#endif
   void OnNewFrameAvailable(int player_id,
                            base::UnsafeSharedMemoryRegion shm_region,
                            uint32_t length,
                            base::TimeDelta timestamp);
-#endif
   player_state_e GetPlayerState();
 
   // Both used by Tizen TV and other platform

diff --git a/tizen_src/chromium_impl/media/filters/media_player_esplusplayer.cc b/tizen_src/chromium_impl/media/filters/media_player_esplusplayer.cc
index dac1b238c5a3814b12a0abc1cc8ed5e719a2abb5..d7c884bf38269fb7b19008e8ebcd67a639c9aa5f 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_esplusplayer.cc
+++ b/tizen_src/chromium_impl/media/filters/media_player_esplusplayer.cc
@@ -1283,7 +1283,8 @@ void MediaPlayerESPlusPlayer::OnFrameReady(
                            << esplayer_
                            << ", state:" << GetString(GetPlayerState());
 
-#if defined(TIZEN_TBM_SUPPORT)
+// Temporarily disable TBM for Rpi4 and Emulator
+#if defined(TIZEN_TBM_SUPPORT) && (BUILDFLAG(IS_TIZEN_TV) || BUILDFLAG(IS_TIZEN_DA) || defined(ARCH_CPU_RISCV_FAMILY))
   gfx::TbmBufferHandle tbm_handle;
   tbm_handle.tbm_surface = reinterpret_cast<uint64_t>(tbm_surface);
   tbm_handle.media_packet = reinterpret_cast<uint64_t>(packet);

diff --git a/tizen_src/chromium_impl/media/filters/media_player_tizen_client.h b/tizen_src/chromium_impl/media/filters/media_player_tizen_client.h
index 5293437d8189a74c2ce5bbbcf1676b3d94f49bf6..a64b5cb9fc23f6fd28eaa4c33206109faa165895 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_tizen_client.h
+++ b/tizen_src/chromium_impl/media/filters/media_player_tizen_client.h
@@ -61,14 +61,13 @@ class MEDIA_EXPORT MediaPlayerTizenClient {
   virtual void OnNewTbmFrameAvailable(uint32_t player_id,
                                       gfx::TbmBufferHandle tbm_buffer_handle,
                                       base::TimeDelta timestamp) = 0;
-#else
+#endif
   virtual void OnNewFrameAvailable(uint32_t playerId,
                                    base::UnsafeSharedMemoryRegion frame,
                                    uint32_t size,
                                    base::TimeDelta timestamp,
                                    uint32_t width,
                                    uint32_t height) = 0;
-#endif
 
 #if BUILDFLAG(IS_TIZEN_TV)
   virtual void AddTrackInfo(media::mojom::MediaTrackInfoPtr trackinfo) = 0;