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(
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),
typedef base::OnceCallback<void(const bool)> 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;
#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)
std::unique_ptr<MediaPlayerTizen> 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<MediaPlayerBridgeCapiTV>(
media_resource->GetMediaUrlParams().media_url, user_agent, volume);
~MediaPlayerBridgeCapiFactory() override = default;
std::unique_ptr<MediaPlayerTizen> Create(MediaResource* media_resource,
- content::WebContents* web_contents,
+ const std::string& user_agent,
double volume) override;
};
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<void*>(this) << ") " << __func__;
class MEDIA_EXPORT MediaPlayerBridgeCapiTV : public MediaPlayerBridgeCapi {
public:
MediaPlayerBridgeCapiTV(const GURL& url,
- std::string& user_agent,
+ const std::string& user_agent,
double volume);
~MediaPlayerBridgeCapiTV() override;
std::unique_ptr<MediaPlayerTizen> 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<MediaPlayerESPlusPlayerTV>();
public:
~MediaPlayerESPlusPlayerFactory() override = default;
- std::unique_ptr<MediaPlayerTizen> Create(
- MediaResource* /*media_resource*/,
- content::WebContents* /*web_contents*/,
- double /*volume*/) override;
+ std::unique_ptr<MediaPlayerTizen> Create(MediaResource* /*media_resource*/,
+ const std::string& /*user_agent*/,
+ double /*volume*/) override;
};
} // namespace media
#include "media/base/media_export.h"
-namespace content {
-class WebContents;
-} // namespace content
-
namespace media {
class MediaPlayerTizen;
virtual std::unique_ptr<MediaPlayerTizen> Create(
MediaResource* media_resource,
- content::WebContents* web_contents,
+ const std::string& user_agent,
double volume) = 0;
};
std::unique_ptr<MediaPlayerTizen> MediaPlayerRegistry::CreateMediaPlayer(
MediaResource* media_resource,
- content::WebContents* web_contents,
+ const std::string& user_agent,
double volume,
int& player_id) {
LOG(INFO) << __func__;
// media_resource->GetType() == MediaResource::Type::KUrl
factory = std::make_unique<MediaPlayerBridgeCapiFactory>();
}
- 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;
}
#include "media/filters/longest_conflict_strategy.h"
#include "media/filters/media_capability_manager.h"
-namespace content {
-class WebContents;
-}
-
namespace media {
class MediaPlayerTizen;
std::unique_ptr<MediaPlayerTizen> CreateMediaPlayer(
MediaResource* media_resource,
- content::WebContents* web_contents,
+ const std::string& user_agent,
double volume,
int& player_id);
int RegisterMediaPlayer(MediaPlayerTizen* player);
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;
#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"