From 2f2598a812bf1749c438473715d6ef45566074c2 Mon Sep 17 00:00:00 2001 From: "zhishun.zhou" Date: Fri, 22 Mar 2024 11:54:39 +0800 Subject: [PATCH 1/1] fixup! [M120 Migration] Add new api for webbrowser to get media device list Fix link error when build with "--build-chrome": ld.lld: error: undefined symbol: content::IsWebBrowser() ld.lld: error: undefined symbol: switches::kTizenAppId Change-Id: Id100dd5deaa7bc1c0f8123c0b66b7db75e90ac19 Signed-off-by: zhishun.zhou --- content/browser/renderer_host/media/media_devices_manager.cc | 4 ++-- tizen_src/chromium_impl/media/filters/esplusplayer_util.cc | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/content/browser/renderer_host/media/media_devices_manager.cc b/content/browser/renderer_host/media/media_devices_manager.cc index 880e009..5e58928 100644 --- a/content/browser/renderer_host/media/media_devices_manager.cc +++ b/content/browser/renderer_host/media/media_devices_manager.cc @@ -51,7 +51,7 @@ #endif #if BUILDFLAG(IS_TIZEN_TV) -#include "tizen_src/ewk/efl_integration/common/application_type.h" +#include "third_party/blink/public/platform/web_application_type.h" #endif namespace content { @@ -1031,7 +1031,7 @@ void MediaDevicesManager::DevicesEnumerated( #if BUILDFLAG(IS_TIZEN_TV) // report device list to webbrowser - if (IsWebBrowser() && !enum_cb_.is_null()) { + if (blink::IsWebBrowser() && !enum_cb_.is_null()) { got_result_[static_cast(type)] = true; for (const auto& device : snapshot) { diff --git a/tizen_src/chromium_impl/media/filters/esplusplayer_util.cc b/tizen_src/chromium_impl/media/filters/esplusplayer_util.cc index 6d62cd9..1e42c3d 100644 --- a/tizen_src/chromium_impl/media/filters/esplusplayer_util.cc +++ b/tizen_src/chromium_impl/media/filters/esplusplayer_util.cc @@ -219,9 +219,13 @@ gfx::Size GetDynamicMaxCodecResolution() { int max_width = 0; int max_height = 0; int max_framerate = 0; +#if !defined(BUILD_CHROME) std::string app_id = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( switches::kTizenAppId); +#else + std::string app_id = ""; +#endif // resource center returns decodeer ability not resolution (ex.1088) // http://wiki.vd.sec.samsung.net/display/OSS/02.+Max+Resolution -- 2.7.4