Chromium Code Reviews| 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 2369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2380 if (!media_renderer_factory.get()) { | 2380 if (!media_renderer_factory.get()) { |
| 2381 media_renderer_factory.reset(new media::DefaultRendererFactory( | 2381 media_renderer_factory.reset(new media::DefaultRendererFactory( |
| 2382 media_log, render_thread->GetGpuFactories(), | 2382 media_log, render_thread->GetGpuFactories(), |
| 2383 *render_thread->GetAudioHardwareConfig())); | 2383 *render_thread->GetAudioHardwareConfig())); |
| 2384 } | 2384 } |
| 2385 #endif // defined(ENABLE_MOJO_MEDIA) && !defined(OS_ANDROID) | 2385 #endif // defined(ENABLE_MOJO_MEDIA) && !defined(OS_ANDROID) |
| 2386 | 2386 |
| 2387 if (!url_index_.get() || url_index_->frame() != frame) | 2387 if (!url_index_.get() || url_index_->frame() != frame) |
| 2388 url_index_.reset(new media::UrlIndex(frame)); | 2388 url_index_.reset(new media::UrlIndex(frame)); |
| 2389 | 2389 |
| 2390 return new media::WebMediaPlayerImpl( | 2390 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( |
| 2391 frame, client, encrypted_client, GetWebMediaPlayerDelegate()->AsWeakPtr(), | 2391 frame, client, encrypted_client, GetWebMediaPlayerDelegate()->AsWeakPtr(), |
| 2392 std::move(media_renderer_factory), GetCdmFactory(), url_index_, params); | 2392 std::move(media_renderer_factory), GetCdmFactory(), url_index_, params); |
| 2393 #if defined(WIMPI_CAST) | |
|
liberato (no reviews please)
2016/01/08 16:37:58
nit: s/WI/W/
hubbe
2016/01/11 22:47:24
Done.
| |
| 2394 media_player->set_media_player_manager(GetMediaPlayerManager()); | |
| 2395 #endif | |
| 2396 return media_player; | |
| 2393 } | 2397 } |
| 2394 | 2398 |
| 2395 blink::WebMediaSession* RenderFrameImpl::createMediaSession() { | 2399 blink::WebMediaSession* RenderFrameImpl::createMediaSession() { |
| 2396 #if defined(OS_ANDROID) | 2400 #if defined(OS_ANDROID) |
| 2397 return new WebMediaSessionAndroid(GetMediaSessionManager()); | 2401 return new WebMediaSessionAndroid(GetMediaSessionManager()); |
| 2398 #else | 2402 #else |
| 2399 return nullptr; | 2403 return nullptr; |
| 2400 #endif // defined(OS_ANDROID) | 2404 #endif // defined(OS_ANDROID) |
| 2401 } | 2405 } |
| 2402 | 2406 |
| (...skipping 3281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5684 media::ConvertToSwitchOutputDeviceCB(web_callbacks); | 5688 media::ConvertToSwitchOutputDeviceCB(web_callbacks); |
| 5685 scoped_refptr<media::AudioOutputDevice> device = | 5689 scoped_refptr<media::AudioOutputDevice> device = |
| 5686 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), | 5690 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), |
| 5687 security_origin); | 5691 security_origin); |
| 5688 media::OutputDeviceStatus status = device->GetDeviceStatus(); | 5692 media::OutputDeviceStatus status = device->GetDeviceStatus(); |
| 5689 device->Stop(); | 5693 device->Stop(); |
| 5690 callback.Run(status); | 5694 callback.Run(status); |
| 5691 } | 5695 } |
| 5692 | 5696 |
| 5693 } // namespace content | 5697 } // namespace content |
| OLD | NEW |