Fix build errors for Tizen 6.0 UWE

Change-Id: Ie0e3111ed7b50ea4e64415b47039da9bece87f62
Signed-off-by: Satyaveer Singh <satyaveer.s@samsung.com>

diff --git a/media/filters/tizen/cdm_utils.cc b/media/filters/tizen/cdm_utils.cc
index aae50ad6223e5ef5e78c4a72e2e9c630290d4b66..67cf208a18f4954c63d32536febf212f094ff597 100644 (file)
--- a/media/filters/tizen/cdm_utils.cc
+++ b/media/filters/tizen/cdm_utils.cc
@@ -6,8 +6,8 @@
 
 #include <ostream>
 
-#include <drmdecrypt_publish_api.h>
-#include <emeCDM/IEME.h>
+#include <drmdecrypt/drmdecrypt_publish_api.h>
+#include <drmdecrypt/emeCDM/IEME.h>
 
 #include "media/base/tizen/logger/media_logger.h"
 

diff --git a/media/filters/tizen/omx/omx_facade.cc b/media/filters/tizen/omx/omx_facade.cc
index 4ce3a5034cbbaba6ab9d29884b3ee1d7d3ee94ce..ba75b895e9b26569308785fa0d53b2588c3a6778 100644 (file)
--- a/media/filters/tizen/omx/omx_facade.cc
+++ b/media/filters/tizen/omx/omx_facade.cc
@@ -9,7 +9,7 @@
 
 #include <OMX_Component.h>
 #include <OMX_Core.h>
-#include <drmdecrypt_publish_api.h>
+#include <drmdecrypt/drmdecrypt_publish_api.h>
 
 #include "absl/types/optional.h"
 #include "base/check_op.h"

diff --git a/media/filters/tizen/tizen_cdm_bridge.h b/media/filters/tizen/tizen_cdm_bridge.h
index b4350d78e2499f4011d7925305012af81889bea0..34a823080b8cb1406d61882f5824dac12f99a905 100644 (file)
--- a/media/filters/tizen/tizen_cdm_bridge.h
+++ b/media/filters/tizen/tizen_cdm_bridge.h
@@ -7,8 +7,8 @@
 
 #include <map>
 
-#include <drmdecrypt_api.h>
-#include <emeCDM/IEME.h>
+#include <drmdecrypt/drmdecrypt_api.h>
+#include <drmdecrypt/emeCDM/IEME.h>
 
 #include "absl/status/statusor.h"
 #include "base/memory/scoped_refptr.h"

diff --git a/packaging/chromium-efl.spec b/packaging/chromium-efl.spec
index 6bfdc1cecf79d64f2a3d76a9e297e57feacf28d0..cdd43bfc2ebe69aff2b999ce6051b840d403a599 100644 (file)
--- a/packaging/chromium-efl.spec
+++ b/packaging/chromium-efl.spec
@@ -194,7 +194,6 @@ BuildRequires: pkgconfig(ecore-input)
 BuildRequires: pkgconfig(efl-extension)
 BuildRequires: pkgconfig(eldbus)
 BuildRequires: pkgconfig(elementary)
-BuildRequires: pkgconfig(esplusplayer)
 BuildRequires: pkgconfig(evas)
 BuildRequires: pkgconfig(feedback)
 BuildRequires: pkgconfig(fontconfig)
@@ -232,6 +231,11 @@ BuildRequires: pkgconfig(tts)
 BuildRequires: pkgconfig(ui-gadget-1)
 BuildRequires: pkgconfig(vconf)
 BuildRequires: pkgconfig(zlib)
+%if %{tizen_version} > 60
+BuildRequires: pkgconfig(esplusplayer)
+%else
+BuildRequires: pkgconfig(plusplayer)
+%endif
 %if 0%{?__create_next_browser_tpk}
 #Added below pkg for Next Browser
 BuildRequires: dapi-provider-devel

diff --git a/sandbox/policy/linux/bpf_hardware_video_decoding_policy_linux.cc b/sandbox/policy/linux/bpf_hardware_video_decoding_policy_linux.cc
index 367766dc7bbe6008b762a9baf843c915ec22cef8..ab14da8e5341b6d3467b3df02b1fad6584c2f566 100644 (file)
--- a/sandbox/policy/linux/bpf_hardware_video_decoding_policy_linux.cc
+++ b/sandbox/policy/linux/bpf_hardware_video_decoding_policy_linux.cc
@@ -6,7 +6,7 @@
 #include "tizen_src/chromium_impl/build/tizen_version.h"
 
 #if BUILDFLAG(IS_TIZEN_TV)
-#if TIZEN_VERSION_AT_LEAST(6, 5, 0)  // for 6.5 TV platform version
+#if TIZEN_VERSION_AT_LEAST(6, 0, 0)  // for 6.0 TV platform version
 #ifndef _LINUX_KCMP_H
 #define _LINUX_KCMP_H
 

diff --git a/third_party/perfetto/src/base/vm_sockets.h b/third_party/perfetto/src/base/vm_sockets.h
index bc77180317c95cb9b3c8abf7054abaf133d15144..3d676ee3d1b6a59ffb21bc68e2ae8e16d726d862 100644 (file)
--- a/third_party/perfetto/src/base/vm_sockets.h
+++ b/third_party/perfetto/src/base/vm_sockets.h
@@ -28,7 +28,7 @@
 
 #ifdef AF_VSOCK
 
-#if TIZEN_VERSION_AT_LEAST(6, 5, 0)  // for 6.5 TV platform version
+#if TIZEN_VERSION_AT_LEAST(6, 0, 0)  // for 6.0 TV platform version
 #include "vm_sockets_linux_system.h"
 #else
 // Use system vm_socket.h if avaialbe.

diff --git a/tizen_src/build/BUILD.gn b/tizen_src/build/BUILD.gn
index 817166d5cd3f9fc74989256ed6113a741edab735..dfb89d0c6332a35684369bba0332fc991de94ae7 100644 (file)
--- a/tizen_src/build/BUILD.gn
+++ b/tizen_src/build/BUILD.gn
@@ -755,12 +755,22 @@ if (tizen_auto_zoom_enable) {
 }
 
 if (tizen_multimedia) {
-  config("esplusplayer") {
-    ldflags = [ "-lesplusplayer" ]
-  }
+  if (tizen_version > 60) {
+    config("esplusplayer") {
+      ldflags = [ "-lesplusplayer" ]
+    }
+
+    tizen_pkg_config("libesplusplayer") {
+      packages = [ "esplusplayer" ]
+    }
+  } else {
+    config("plusplayer") {
+      ldflags = [ "-lplusplayer" ]
+    }
 
-  tizen_pkg_config("libesplusplayer") {
-    packages = [ "esplusplayer" ]
+    tizen_pkg_config("libplusplayer") {
+      packages = [ "plusplayer" ]
+    }
   }
 }
 
@@ -1030,10 +1040,10 @@ if (is_samsung_next_browser) {
   }
 
   config("VDCurl") {
-  ldflags = [ "-lVDCurl" ]
+    ldflags = [ "-lVDCurl" ]
   }
   tizen_pkg_config("libVDCurl") {
-  packages = [ "VDCurl" ]
+    packages = [ "VDCurl" ]
   }
   config("sso_api") {
     ldflags = [ "-lsso_api" ]
@@ -1060,6 +1070,7 @@ if (is_samsung_next_browser) {
     packages = [ "capi-cloud-tab" ]
   }
 }
+
 #Next browser package ends
 
 tizen_pkg_config("WebProduct") {

diff --git a/tizen_src/chromium_impl/content/browser/browser_efl.gni b/tizen_src/chromium_impl/content/browser/browser_efl.gni
index 18917119958f955e232fc7619145bcda3eb2eedb..93ad21e28b36a6ff4d919927550a69dedce4ae0c 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/browser_efl.gni
+++ b/tizen_src/chromium_impl/content/browser/browser_efl.gni
@@ -177,9 +177,19 @@ if (tizen_atk_support) {
 }
 
 if (tizen_multimedia) {
+  if (tizen_version > 60) {
+    external_content_browser_efl_configs += [
+      "//tizen_src/build:esplusplayer",
+      "//tizen_src/build:libesplusplayer",
+    ]
+  } else {
+    external_content_browser_efl_configs += [
+      "//tizen_src/build:plusplayer",
+      "//tizen_src/build:libplusplayer",
+    ]
+  }
+
   external_content_browser_efl_configs += [
-    "//tizen_src/build:esplusplayer",
-    "//tizen_src/build:libesplusplayer",
     "//tizen_src/build:capi-media-player",
     "//tizen_src/build:libcapi-media-player",
   ]

diff --git a/tizen_src/chromium_impl/media/capture/video/tizen/camera_device_tizen.cc b/tizen_src/chromium_impl/media/capture/video/tizen/camera_device_tizen.cc
index 9a2547314904b7d6c062fa6784fff53c5b0c7051..4200c3919bde98ec966029107462df667c048854 100644 (file)
--- a/tizen_src/chromium_impl/media/capture/video/tizen/camera_device_tizen.cc
+++ b/tizen_src/chromium_impl/media/capture/video/tizen/camera_device_tizen.cc
@@ -96,9 +96,11 @@ media::VideoPixelFormat toChromiumType(camera_pixel_format_e e) {
 #endif
       return media::PIXEL_FORMAT_MJPEG;
     case CAMERA_PIXEL_FORMAT_H264:
+#if defined(TIZEN_NETWORK_CAMERA)
     case CAMERA_PIXEL_FORMAT_VP8:
     case CAMERA_PIXEL_FORMAT_VP9:
       return media::PIXEL_FORMAT_ENCODED;
+#endif
     default:
       NOTREACHED() << "Unknown format #" << e;
   }

diff --git a/tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_tizen.cc b/tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_tizen.cc
index 698b8f319ad17fe185d03f7a130dac7024338401..f6d5708d6a70cc68b1bd25b738ca88ab3e707ad3 100644 (file)
--- a/tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_tizen.cc
+++ b/tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_tizen.cc
@@ -467,8 +467,10 @@ void VideoCaptureDeviceTizen::PreviewCameraCaptured(ScopedMediaPacket pkt) {
 
 constexpr bool IsFormatEncoded(camera_pixel_format_e format) {
   bool is_format_encoded = format == CAMERA_PIXEL_FORMAT_H264;
+#if defined(TIZEN_NETWORK_CAMERA)
   is_format_encoded |= format == CAMERA_PIXEL_FORMAT_VP8;
   is_format_encoded |= format == CAMERA_PIXEL_FORMAT_VP9;
+#endif
 #if defined(TIZEN_MULTIMEDIA_MJPEG_SUPPORT)
   is_format_encoded |= format == CAMERA_PIXEL_FORMAT_MJPEG;
 #endif
@@ -488,9 +490,11 @@ void VideoCaptureDeviceTizen::OnCameraCaptured(camera_preview_data_s* frame,
   CHECK((frame->format == CAMERA_PIXEL_FORMAT_I420) ||
         (frame->format == CAMERA_PIXEL_FORMAT_NV12) ||
         (frame->format == CAMERA_PIXEL_FORMAT_H264) ||
-        (frame->format == CAMERA_PIXEL_FORMAT_YUYV) ||
-        (frame->format == CAMERA_PIXEL_FORMAT_VP8) ||
+        (frame->format == CAMERA_PIXEL_FORMAT_YUYV)
+#if defined(TIZEN_NETWORK_CAMERA)
+        || (frame->format == CAMERA_PIXEL_FORMAT_VP8) ||
         (frame->format == CAMERA_PIXEL_FORMAT_VP9)
+#endif
 #if defined(TIZEN_MULTIMEDIA_MJPEG_SUPPORT)
         || (frame->format == CAMERA_PIXEL_FORMAT_MJPEG)
 #endif

diff --git a/tizen_src/chromium_impl/media/filters/esplusplayer_util.cc b/tizen_src/chromium_impl/media/filters/esplusplayer_util.cc
index cb3a383032559549342529330132a674dd957fc1..da4b8cd206cb2cb032567eb79357c4291c715d35 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/esplusplayer_util.cc
+++ b/tizen_src/chromium_impl/media/filters/esplusplayer_util.cc
@@ -142,7 +142,7 @@ esplusplayer_audio_mime_type ConvertToESPlusAudioMimeType(
     case media::AudioCodec::kAC3:
       audioMimeType = ESPLUSPLAYER_AUDIO_MIME_TYPE_AC3;
       break;
-#if BUILDFLAG(IS_TIZEN_TV)
+#if BUILDFLAG(IS_TIZEN_TV) && TIZEN_VERSION_AT_LEAST(6, 5, 0)
     case media::AudioCodec::kAC4:
       audioMimeType = ESPLUSPLAYER_AUDIO_MIME_TYPE_AC4;
       break;

diff --git a/tizen_src/chromium_impl/media/filters/esplusplayer_util.h b/tizen_src/chromium_impl/media/filters/esplusplayer_util.h
index 4d04cd790809eccd36a4f837faca99c493b7e36b..0038df7834b3e4d6f115e041f910009c16d6eda7 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/esplusplayer_util.h
+++ b/tizen_src/chromium_impl/media/filters/esplusplayer_util.h
@@ -5,7 +5,7 @@
 #ifndef MEDIA_FILTERS_ESPP_PLAYER_UTIL_H_
 #define MEDIA_FILTERS_ESPP_PLAYER_UTIL_H_
 
-#include <esplusplayer_capi.h>
+#include <esplusplayer_capi/esplusplayer_capi.h>
 
 #include "media/base/audio_codecs.h"
 #include "media/base/pipeline_status.h"

diff --git a/tizen_src/chromium_impl/media/filters/ieme_drm_bridge.h b/tizen_src/chromium_impl/media/filters/ieme_drm_bridge.h
index ad3c957886e92cfc3f19919f6453a809aba31777..21cd25f08196e4e5d45dca799d2593a0719117ee 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/ieme_drm_bridge.h
+++ b/tizen_src/chromium_impl/media/filters/ieme_drm_bridge.h
@@ -5,7 +5,7 @@
 #ifndef MEDIA_BASE_ANDROID_IEME_DRM_BRIDGE_H_
 #define MEDIA_BASE_ANDROID_IEME_DRM_BRIDGE_H_
 
-#include <emeCDM/IEME.h>
+#include <drmdecrypt/emeCDM/IEME.h>
 #include <string>
 #include <unordered_map>
 #include <vector>

diff --git a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.cc b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.cc
index 296bce451f96f44a658ae3352621c6d44acd6eb1..93dc38bd9815dad64b2025a788552dcf8211d5e3 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.cc
+++ b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.cc
@@ -1477,13 +1477,17 @@ bool MediaPlayerBridgeCapiTV::ChooseDecoder() {
 
   int ardegree = -1;
   int scan_type = 1;  // default to 1 (progressive) on error.
+#if TIZEN_VERSION_AT_LEAST(6, 5, 0)
   int pl_err = player_get_video_seamless_info(player_, &ardegree, &scan_type);
   if (pl_err != PLAYER_ERROR_NONE) {
     LOG_ID(WARNING, GetPlayerId()) << "Can't get scan type";
   } else {
     LOG_ID(WARNING, GetPlayerId()) << "Got scan type " << scan_type;
   }
-
+#else
+  LOG(WARNING)
+      << "player_get_video_seamless_info is not available in Tizen 6.0";
+#endif
   requires_both_decoders_ = false;
   suitable_decoder_ =
       content::HardwareResourceHelper::Get().GetSuitableResource(

diff --git a/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_tv.cc b/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_tv.cc
index 3a1777c2c0934d7e04ba99312661f0935d7ac1bc..2c62142e1c7c292e6765a16c537802afdd6b15f3 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_tv.cc
+++ b/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_tv.cc
@@ -363,6 +363,7 @@ player_buffer_size_t MediaPlayerESPlusPlayerTV::GetMaxVideoBufferSize(
 
 void MediaPlayerESPlusPlayerTV::SetTbmCallbackPolicy(
     const media::VideoDecoderConfig& video_config) {
+#if TIZEN_VERSION_AT_LEAST(6, 5, 0)
   auto policy = ESPLUSPLAYER_RSC_ALLOC_EXCLUSIVE;
 #if TIZEN_VERSION_AT_LEAST(8, 0, 0)
   // Although we set the decoder config to fit the spec of mfc decoder in
@@ -388,6 +389,11 @@ void MediaPlayerESPlusPlayerTV::SetTbmCallbackPolicy(
         << esplusplayer_get_error_string(
                static_cast<esplusplayer_error_type>(error));
   }
+#else
+  LOG(WARNING)
+      << "esplusplayer_set_resource_allocate_policy is not available in "
+         "Tizen 6.0";
+#endif
 }
 
 bool MediaPlayerESPlusPlayerTV::SetBufferType(

diff --git a/tizen_src/chromium_impl/media/media_efl.gni b/tizen_src/chromium_impl/media/media_efl.gni
index c625bd5988ef707b9c3765fd362351d61141a489..2b575d116501679d2309a7c24a93acef7877d990 100644 (file)
--- a/tizen_src/chromium_impl/media/media_efl.gni
+++ b/tizen_src/chromium_impl/media/media_efl.gni
@@ -23,9 +23,18 @@ external_media_efl_blink_config = []
 external_media_efl_blink_sources = []
 
 if (tizen_multimedia) {
+  if (tizen_version > 60) {
+    external_media_video_decode_config += [
+      "//tizen_src/build:esplusplayer",
+      "//tizen_src/build:libesplusplayer",
+    ]
+  } else {
+    external_media_video_decode_config += [
+      "//tizen_src/build:plusplayer",
+      "//tizen_src/build:libplusplayer",
+    ]
+  }
   external_media_video_decode_config += [
-    "//tizen_src/build:esplusplayer",
-    "//tizen_src/build:libesplusplayer",
     "//tizen_src/chromium_impl/media:media_efl_config",
     "//tizen_src/build:tizen-tv-resource-manager-config",
   ]

diff --git a/tizen_src/chromium_impl/ui/ozone/platform/efl/im_context_efl.cc b/tizen_src/chromium_impl/ui/ozone/platform/efl/im_context_efl.cc
index 872845325afa9006cb1ecf2f9574071b22d74dbc..ec9121d03adb99f8084f67c02c46ea800f0bdd3c 100644 (file)
--- a/tizen_src/chromium_impl/ui/ozone/platform/efl/im_context_efl.cc
+++ b/tizen_src/chromium_impl/ui/ozone/platform/efl/im_context_efl.cc
@@ -934,8 +934,12 @@ bool IMContextEfl::ImeHandleKeyEventEnabled() {
 
 void IMContextEfl::SetIMEPositionAlign(int x, int y, IMEAlign align) {
   LOG(INFO) << "IME Position,x:" << x << ",y:" << y << ",align:" << align;
+#if TIZEN_VERSION_AT_LEAST(8, 0, 0)
   ecore_imf_context_input_panel_position_align_set(
       context_, x, y, (Ecore_IMF_Input_Panel_Align)align);
+#else
+  ecore_imf_context_input_panel_position_set(context_, x, y);
+#endif
 }
 
 #endif