| 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 2391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2402 if (!media_renderer_factory.get()) { | 2402 if (!media_renderer_factory.get()) { |
| 2403 media_renderer_factory.reset(new media::DefaultRendererFactory( | 2403 media_renderer_factory.reset(new media::DefaultRendererFactory( |
| 2404 media_log, render_thread->GetGpuFactories(), | 2404 media_log, render_thread->GetGpuFactories(), |
| 2405 *render_thread->GetAudioHardwareConfig())); | 2405 *render_thread->GetAudioHardwareConfig())); |
| 2406 } | 2406 } |
| 2407 #endif // defined(ENABLE_MOJO_MEDIA) && !defined(OS_ANDROID) | 2407 #endif // defined(ENABLE_MOJO_MEDIA) && !defined(OS_ANDROID) |
| 2408 | 2408 |
| 2409 if (!url_index_.get() || url_index_->frame() != frame) | 2409 if (!url_index_.get() || url_index_->frame() != frame) |
| 2410 url_index_.reset(new media::UrlIndex(frame)); | 2410 url_index_.reset(new media::UrlIndex(frame)); |
| 2411 | 2411 |
| 2412 return new media::WebMediaPlayerImpl( | 2412 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( |
| 2413 frame, client, encrypted_client, GetWebMediaPlayerDelegate()->AsWeakPtr(), | 2413 frame, client, encrypted_client, GetWebMediaPlayerDelegate()->AsWeakPtr(), |
| 2414 std::move(media_renderer_factory), GetCdmFactory(), url_index_, params); | 2414 std::move(media_renderer_factory), GetCdmFactory(), url_index_, params); |
| 2415 #if defined(OS_ANDROID) // WMPI_CAST |
| 2416 media_player->set_media_player_manager(GetMediaPlayerManager()); |
| 2417 #endif |
| 2418 return media_player; |
| 2415 } | 2419 } |
| 2416 | 2420 |
| 2417 blink::WebMediaSession* RenderFrameImpl::createMediaSession() { | 2421 blink::WebMediaSession* RenderFrameImpl::createMediaSession() { |
| 2418 #if defined(OS_ANDROID) | 2422 #if defined(OS_ANDROID) |
| 2419 return new WebMediaSessionAndroid(GetMediaSessionManager()); | 2423 return new WebMediaSessionAndroid(GetMediaSessionManager()); |
| 2420 #else | 2424 #else |
| 2421 return nullptr; | 2425 return nullptr; |
| 2422 #endif // defined(OS_ANDROID) | 2426 #endif // defined(OS_ANDROID) |
| 2423 } | 2427 } |
| 2424 | 2428 |
| (...skipping 3293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5718 media::ConvertToSwitchOutputDeviceCB(web_callbacks); | 5722 media::ConvertToSwitchOutputDeviceCB(web_callbacks); |
| 5719 scoped_refptr<media::AudioOutputDevice> device = | 5723 scoped_refptr<media::AudioOutputDevice> device = |
| 5720 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), | 5724 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), |
| 5721 security_origin); | 5725 security_origin); |
| 5722 media::OutputDeviceStatus status = device->GetDeviceStatus(); | 5726 media::OutputDeviceStatus status = device->GetDeviceStatus(); |
| 5723 device->Stop(); | 5727 device->Stop(); |
| 5724 callback.Run(status); | 5728 callback.Run(status); |
| 5725 } | 5729 } |
| 5726 | 5730 |
| 5727 } // namespace content | 5731 } // namespace content |
| OLD | NEW |