From d6bb795a1286f8f915ab728513d2d7fe1dd9b393 Mon Sep 17 00:00:00 2001 From: Sun-woo Nam Date: Thu, 1 Feb 2024 21:12:01 -0800 Subject: [PATCH] [M120 Migration][MM] Pass |user_agent| instead of WebContents during MediaPlayer creation This is to avoid dependency on //content in //media/filters for resolving DA build errors for tizen 6.0. Reference: https://review.tizen.org/gerrit/#/c/295064/ Change-Id: I01d5d57075b734e15394624e6572ff11cbae1d04 Signed-off-by: Sun-woo Nam --- .../content/browser/media/tizen_renderer_impl.cc | 9 ++++++++- .../chromium_impl/media/filters/media_player_bridge_capi.cc | 2 +- .../chromium_impl/media/filters/media_player_bridge_capi.h | 2 +- .../media/filters/media_player_bridge_capi_factory.cc | 12 +----------- .../media/filters/media_player_bridge_capi_factory.h | 2 +- .../media/filters/media_player_bridge_capi_tv.cc | 2 +- .../media/filters/media_player_bridge_capi_tv.h | 2 +- .../media/filters/media_player_esplusplayer_factory.cc | 2 +- .../media/filters/media_player_esplusplayer_factory.h | 7 +++---- tizen_src/chromium_impl/media/filters/media_player_factory.h | 6 +----- .../chromium_impl/media/filters/media_player_registry.cc | 4 ++-- .../chromium_impl/media/filters/media_player_registry.h | 6 +----- tizen_src/chromium_impl/media/filters/media_player_tizen.h | 1 - .../chromium_impl/media/filters/media_player_tizen_client.h | 1 - 14 files changed, 22 insertions(+), 36 deletions(-) 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 27f4932..c502b70 100644 --- a/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.cc +++ b/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.cc @@ -136,9 +136,16 @@ void TizenRendererImpl::Initialize(media::MediaResource* media_resource, init_cb_ = std::move(init_cb); media_resource_ = media_resource; + std::string user_agent; + if (web_contents_) { + user_agent = web_contents_->GetUserAgentOverride().ua_string_override; + if (user_agent.empty()) + user_agent = content::GetContentClientExport()->browser()->GetUserAgent(); + } + // Create a media player and get player id for the created media player. media_player_ = media::MediaPlayerRegistry::GetInstance()->CreateMediaPlayer( - media_resource_, web_contents_, volume_, player_id_); + media_resource_, user_agent, volume_, player_id_); if (!media_player_->CreatePlayer(player_id_)) { media::MediaPlayerRegistry::GetInstance()->UnregisterMediaPlayer( 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 fa585d8..837352d 100644 --- a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.cc +++ b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.cc @@ -99,7 +99,7 @@ static void InterruptCb(player_interrupted_code_e code, void* data) { namespace media { MediaPlayerBridgeCapi::MediaPlayerBridgeCapi(const GURL& url, - std::string& user_agent, + const std::string& user_agent, double volume) : task_runner_(base::SingleThreadTaskRunner::GetCurrentDefault()), delayed_player_state_(PLAYER_STATE_DELAYED_NULL), 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 b7213ac..a3c7f27 100644 --- a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.h +++ b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.h @@ -46,7 +46,7 @@ class MEDIA_EXPORT MediaPlayerBridgeCapi : public MediaPlayerTizen { typedef base::OnceCallback CompleteCB; MediaPlayerBridgeCapi(const GURL& url, - std::string& user_agent, + const std::string& user_agent, double volume); MediaPlayerBridgeCapi(const MediaPlayerBridgeCapi&) = delete; MediaPlayerBridgeCapi& operator=(const MediaPlayerBridgeCapi&) = delete; diff --git a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_factory.cc b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_factory.cc index 3cb4af7..45b3044 100644 --- a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_factory.cc +++ b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_factory.cc @@ -4,9 +4,6 @@ #include "tizen_src/chromium_impl/media/filters/media_player_bridge_capi_factory.h" -#include "content/common/content_client_export.h" -#include "content/public/browser/content_browser_client.h" -#include "content/public/browser/web_contents.h" #include "media/base/media_resource.h" #include "third_party/blink/public/common/user_agent/user_agent_metadata.h" #if BUILDFLAG(IS_TIZEN_TV) @@ -19,15 +16,8 @@ namespace media { std::unique_ptr MediaPlayerBridgeCapiFactory::Create( MediaResource* media_resource, - content::WebContents* web_contents, + const std::string& user_agent, double volume) { - std::string user_agent; - if (web_contents) { - user_agent = web_contents->GetUserAgentOverride().ua_string_override; - if (user_agent.empty()) { - user_agent = content::GetContentClientExport()->browser()->GetUserAgent(); - } - } #if BUILDFLAG(IS_TIZEN_TV) return std::make_unique( media_resource->GetMediaUrlParams().media_url, user_agent, volume); diff --git a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_factory.h b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_factory.h index cdf9177..e9dbfac 100644 --- a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_factory.h +++ b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_factory.h @@ -20,7 +20,7 @@ class MEDIA_EXPORT MediaPlayerBridgeCapiFactory : public MediaPlayerFactory { ~MediaPlayerBridgeCapiFactory() override = default; std::unique_ptr Create(MediaResource* media_resource, - content::WebContents* web_contents, + const std::string& user_agent, double volume) override; }; 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 5b79cef..7cfb666 100644 --- 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 @@ -13,7 +13,7 @@ const int kSeekableTimeUpdateInterval = 500; namespace media { MediaPlayerBridgeCapiTV::MediaPlayerBridgeCapiTV(const GURL& url, - std::string& user_agent, + const std::string& user_agent, double volume) : MediaPlayerBridgeCapi(url, user_agent, volume), weak_factory_(this) { LOG(INFO) << "(" << static_cast(this) << ") " << __func__; diff --git a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.h b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.h index c009231..b6c5a16 100644 --- a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.h +++ b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.h @@ -15,7 +15,7 @@ namespace media { class MEDIA_EXPORT MediaPlayerBridgeCapiTV : public MediaPlayerBridgeCapi { public: MediaPlayerBridgeCapiTV(const GURL& url, - std::string& user_agent, + const std::string& user_agent, double volume); ~MediaPlayerBridgeCapiTV() override; diff --git a/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_factory.cc b/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_factory.cc index 42704dc..f3b2fc9 100644 --- a/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_factory.cc +++ b/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_factory.cc @@ -15,7 +15,7 @@ namespace media { std::unique_ptr MediaPlayerESPlusPlayerFactory::Create( MediaResource* media_resource, - content::WebContents* web_contents, + const std::string& user_agent, double volume) { #if BUILDFLAG(IS_TIZEN_TV) return std::make_unique(); diff --git a/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_factory.h b/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_factory.h index f973199..44a3c1f 100644 --- a/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_factory.h +++ b/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_factory.h @@ -19,10 +19,9 @@ class MEDIA_EXPORT MediaPlayerESPlusPlayerFactory : public MediaPlayerFactory { public: ~MediaPlayerESPlusPlayerFactory() override = default; - std::unique_ptr Create( - MediaResource* /*media_resource*/, - content::WebContents* /*web_contents*/, - double /*volume*/) override; + std::unique_ptr Create(MediaResource* /*media_resource*/, + const std::string& /*user_agent*/, + double /*volume*/) override; }; } // namespace media diff --git a/tizen_src/chromium_impl/media/filters/media_player_factory.h b/tizen_src/chromium_impl/media/filters/media_player_factory.h index efb2589..e5cc48d 100644 --- a/tizen_src/chromium_impl/media/filters/media_player_factory.h +++ b/tizen_src/chromium_impl/media/filters/media_player_factory.h @@ -9,10 +9,6 @@ #include "media/base/media_export.h" -namespace content { -class WebContents; -} // namespace content - namespace media { class MediaPlayerTizen; @@ -24,7 +20,7 @@ class MEDIA_EXPORT MediaPlayerFactory { virtual std::unique_ptr Create( MediaResource* media_resource, - content::WebContents* web_contents, + const std::string& user_agent, double volume) = 0; }; diff --git a/tizen_src/chromium_impl/media/filters/media_player_registry.cc b/tizen_src/chromium_impl/media/filters/media_player_registry.cc index 4974992..e8f55b8 100644 --- a/tizen_src/chromium_impl/media/filters/media_player_registry.cc +++ b/tizen_src/chromium_impl/media/filters/media_player_registry.cc @@ -24,7 +24,7 @@ MediaPlayerRegistry::~MediaPlayerRegistry() {} std::unique_ptr MediaPlayerRegistry::CreateMediaPlayer( MediaResource* media_resource, - content::WebContents* web_contents, + const std::string& user_agent, double volume, int& player_id) { LOG(INFO) << __func__; @@ -35,7 +35,7 @@ std::unique_ptr MediaPlayerRegistry::CreateMediaPlayer( // media_resource->GetType() == MediaResource::Type::KUrl factory = std::make_unique(); } - auto player = factory->Create(media_resource, web_contents, volume); + auto player = factory->Create(media_resource, user_agent, volume); player_id = RegisterMediaPlayer(player.get()); return player; } diff --git a/tizen_src/chromium_impl/media/filters/media_player_registry.h b/tizen_src/chromium_impl/media/filters/media_player_registry.h index ff0b908..29a051f 100644 --- a/tizen_src/chromium_impl/media/filters/media_player_registry.h +++ b/tizen_src/chromium_impl/media/filters/media_player_registry.h @@ -12,10 +12,6 @@ #include "media/filters/longest_conflict_strategy.h" #include "media/filters/media_capability_manager.h" -namespace content { -class WebContents; -} - namespace media { class MediaPlayerTizen; @@ -30,7 +26,7 @@ class MEDIA_EXPORT MediaPlayerRegistry { std::unique_ptr CreateMediaPlayer( MediaResource* media_resource, - content::WebContents* web_contents, + const std::string& user_agent, double volume, int& player_id); int RegisterMediaPlayer(MediaPlayerTizen* player); diff --git a/tizen_src/chromium_impl/media/filters/media_player_tizen.h b/tizen_src/chromium_impl/media/filters/media_player_tizen.h index a9a3396..defac69 100644 --- a/tizen_src/chromium_impl/media/filters/media_player_tizen.h +++ b/tizen_src/chromium_impl/media/filters/media_player_tizen.h @@ -51,7 +51,6 @@ class MEDIA_EXPORT MediaPlayerTizen { virtual void Initialize(VideoRendererSink* sink) = 0; virtual bool IsInitialized() = 0; virtual void Prepare() = 0; - virtual void PlayerPrepared() {} virtual bool IsPrepared() = 0; virtual bool CanPrepare() = 0; virtual void Release() = 0; 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 1e0c1c8..d98b4d9 100644 --- a/tizen_src/chromium_impl/media/filters/media_player_tizen_client.h +++ b/tizen_src/chromium_impl/media/filters/media_player_tizen_client.h @@ -5,7 +5,6 @@ #ifndef MEDIA_FILTERS_MEDIA_PLAYER_TIZEN_CLIENT_H_ #define MEDIA_FILTERS_MEDIA_PLAYER_TIZEN_CLIENT_H_ -#include "content/public/browser/web_contents.h" #include "media/base/audio_decoder_config.h" #include "media/base/pipeline_status.h" #include "media/base/video_decoder_config.h" -- 2.7.4