| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 2403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2414 if (!media_renderer_factory.get()) { | 2414 if (!media_renderer_factory.get()) { |
| 2415 media_renderer_factory.reset(new media::DefaultRendererFactory( | 2415 media_renderer_factory.reset(new media::DefaultRendererFactory( |
| 2416 media_log, render_thread->GetGpuFactories(), | 2416 media_log, render_thread->GetGpuFactories(), |
| 2417 *render_thread->GetAudioHardwareConfig())); | 2417 *render_thread->GetAudioHardwareConfig())); |
| 2418 } | 2418 } |
| 2419 #endif // defined(ENABLE_MOJO_MEDIA) && !defined(OS_ANDROID) | 2419 #endif // defined(ENABLE_MOJO_MEDIA) && !defined(OS_ANDROID) |
| 2420 | 2420 |
| 2421 if (!url_index_.get() || url_index_->frame() != frame) | 2421 if (!url_index_.get() || url_index_->frame() != frame) |
| 2422 url_index_.reset(new media::UrlIndex(frame)); | 2422 url_index_.reset(new media::UrlIndex(frame)); |
| 2423 | 2423 |
| 2424 return new media::WebMediaPlayerImpl( | 2424 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( |
| 2425 frame, client, encrypted_client, GetWebMediaPlayerDelegate()->AsWeakPtr(), | 2425 frame, client, encrypted_client, GetWebMediaPlayerDelegate()->AsWeakPtr(), |
| 2426 std::move(media_renderer_factory), GetCdmFactory(), url_index_, params); | 2426 std::move(media_renderer_factory), GetCdmFactory(), url_index_, params); |
| 2427 |
| 2428 #if defined(OS_ANDROID) // WMPI_CAST |
| 2429 media_player->SetMediaPlayerManager(GetMediaPlayerManager()); |
| 2430 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor()); |
| 2431 #endif |
| 2432 |
| 2433 return media_player; |
| 2427 } | 2434 } |
| 2428 | 2435 |
| 2429 blink::WebMediaSession* RenderFrameImpl::createMediaSession() { | 2436 blink::WebMediaSession* RenderFrameImpl::createMediaSession() { |
| 2430 #if defined(OS_ANDROID) | 2437 #if defined(OS_ANDROID) |
| 2431 return new WebMediaSessionAndroid(GetMediaSessionManager()); | 2438 return new WebMediaSessionAndroid(GetMediaSessionManager()); |
| 2432 #else | 2439 #else |
| 2433 return nullptr; | 2440 return nullptr; |
| 2434 #endif // defined(OS_ANDROID) | 2441 #endif // defined(OS_ANDROID) |
| 2435 } | 2442 } |
| 2436 | 2443 |
| (...skipping 3294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5731 media::ConvertToSwitchOutputDeviceCB(web_callbacks); | 5738 media::ConvertToSwitchOutputDeviceCB(web_callbacks); |
| 5732 scoped_refptr<media::AudioOutputDevice> device = | 5739 scoped_refptr<media::AudioOutputDevice> device = |
| 5733 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), | 5740 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), |
| 5734 security_origin); | 5741 security_origin); |
| 5735 media::OutputDeviceStatus status = device->GetDeviceStatus(); | 5742 media::OutputDeviceStatus status = device->GetDeviceStatus(); |
| 5736 device->Stop(); | 5743 device->Stop(); |
| 5737 callback.Run(status); | 5744 callback.Run(status); |
| 5738 } | 5745 } |
| 5739 | 5746 |
| 5740 } // namespace content | 5747 } // namespace content |
| OLD | NEW |