Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: components/html_viewer/media_factory.cc

Issue 1648653002: Carry WebMediaSession in WebMediaPlayerParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/html_viewer/media_factory.h" 5 #include "components/html_viewer/media_factory.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 MediaFactory::~MediaFactory() { 76 MediaFactory::~MediaFactory() {
77 } 77 }
78 78
79 blink::WebMediaPlayer* MediaFactory::CreateMediaPlayer( 79 blink::WebMediaPlayer* MediaFactory::CreateMediaPlayer(
80 blink::WebLocalFrame* frame, 80 blink::WebLocalFrame* frame,
81 const blink::WebURL& url, 81 const blink::WebURL& url,
82 blink::WebMediaPlayerClient* client, 82 blink::WebMediaPlayerClient* client,
83 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, 83 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
84 blink::WebContentDecryptionModule* initial_cdm, 84 blink::WebContentDecryptionModule* initial_cdm,
85 blink::WebMediaSession* media_session,
85 mojo::Shell* shell) { 86 mojo::Shell* shell) {
86 #if defined(OS_ANDROID) 87 #if defined(OS_ANDROID)
87 // TODO(xhwang): Get CreateMediaPlayer working on android. 88 // TODO(xhwang): Get CreateMediaPlayer working on android.
88 return nullptr; 89 return nullptr;
89 #else 90 #else
90 scoped_refptr<media::MediaLog> media_log(new media::MediaLog()); 91 scoped_refptr<media::MediaLog> media_log(new media::MediaLog());
91 scoped_ptr<media::RendererFactory> media_renderer_factory; 92 scoped_ptr<media::RendererFactory> media_renderer_factory;
92 93
93 if (enable_mojo_media_renderer_) { 94 if (enable_mojo_media_renderer_) {
94 media_renderer_factory.reset( 95 media_renderer_factory.reset(
95 new media::MojoRendererFactory(GetMediaServiceFactory())); 96 new media::MojoRendererFactory(GetMediaServiceFactory()));
96 } else { 97 } else {
97 media_renderer_factory.reset( 98 media_renderer_factory.reset(
98 new media::DefaultRendererFactory(media_log, 99 new media::DefaultRendererFactory(media_log,
99 nullptr, // No GPU factory. 100 nullptr, // No GPU factory.
100 GetAudioHardwareConfig())); 101 GetAudioHardwareConfig()));
101 } 102 }
102 103
103 media::WebMediaPlayerParams params( 104 media::WebMediaPlayerParams params(
104 media::WebMediaPlayerParams::DeferLoadCB(), CreateAudioRendererSink(), 105 media::WebMediaPlayerParams::DeferLoadCB(), CreateAudioRendererSink(),
105 media_log, GetMediaThreadTaskRunner(), GetMediaThreadTaskRunner(), 106 media_log, GetMediaThreadTaskRunner(), GetMediaThreadTaskRunner(),
106 compositor_task_runner_, media::WebMediaPlayerParams::Context3DCB(), 107 compositor_task_runner_, media::WebMediaPlayerParams::Context3DCB(),
107 base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory, 108 base::Bind(&v8::Isolate::AdjustAmountOfExternalAllocatedMemory,
108 base::Unretained(blink::mainThreadIsolate())), 109 base::Unretained(blink::mainThreadIsolate())),
109 GetMediaPermission(), initial_cdm); 110 GetMediaPermission(), initial_cdm, media_session);
110 base::WeakPtr<media::WebMediaPlayerDelegate> delegate; 111 base::WeakPtr<media::WebMediaPlayerDelegate> delegate;
111 112
112 if (!url_index_.get() || url_index_->frame() != frame) { 113 if (!url_index_.get() || url_index_->frame() != frame) {
113 url_index_.reset(new media::UrlIndex(frame)); 114 url_index_.reset(new media::UrlIndex(frame));
114 } 115 }
115 116
116 return new media::WebMediaPlayerImpl( 117 return new media::WebMediaPlayerImpl(
117 frame, client, encrypted_client, delegate, 118 frame, client, encrypted_client, delegate,
118 std::move(media_renderer_factory), GetCdmFactory(), url_index_, params); 119 std::move(media_renderer_factory), GetCdmFactory(), url_index_, params);
119 #endif // defined(OS_ANDROID) 120 #endif // defined(OS_ANDROID)
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 scoped_refptr<base::SingleThreadTaskRunner> 179 scoped_refptr<base::SingleThreadTaskRunner>
179 MediaFactory::GetMediaThreadTaskRunner() { 180 MediaFactory::GetMediaThreadTaskRunner() {
180 if (!media_thread_.IsRunning()) 181 if (!media_thread_.IsRunning())
181 media_thread_.Start(); 182 media_thread_.Start();
182 183
183 return media_thread_.task_runner(); 184 return media_thread_.task_runner();
184 } 185 }
185 #endif // !defined(OS_ANDROID) 186 #endif // !defined(OS_ANDROID)
186 187
187 } // namespace html_viewer 188 } // namespace html_viewer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698