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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1809093003: Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Replace RestartableAudioRendererSink with SwitchableAudioRendererSink in webmediaplayer_impl unit t… Created 4 years, 9 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 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 2410 matching lines...) Expand 10 before | Expand all | Expand 10 after
2421 #endif // defined(VIDEO_HOLE) 2421 #endif // defined(VIDEO_HOLE)
2422 2422
2423 blink::WebMediaStream web_stream( 2423 blink::WebMediaStream web_stream(
2424 blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url)); 2424 blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url));
2425 if (!web_stream.isNull()) 2425 if (!web_stream.isNull())
2426 return CreateWebMediaPlayerForMediaStream(client, sink_id, 2426 return CreateWebMediaPlayerForMediaStream(client, sink_id,
2427 frame_->getSecurityOrigin()); 2427 frame_->getSecurityOrigin());
2428 2428
2429 RenderThreadImpl* render_thread = RenderThreadImpl::current(); 2429 RenderThreadImpl* render_thread = RenderThreadImpl::current();
2430 2430
2431 scoped_refptr<media::RestartableAudioRendererSink> audio_renderer_sink = 2431 scoped_refptr<media::SwitchableAudioRendererSink> audio_renderer_sink =
2432 AudioDeviceFactory::NewRestartableAudioRendererSink( 2432 AudioDeviceFactory::NewSwitchableAudioRendererSink(
2433 AudioDeviceFactory::kSourceMediaElement, routing_id_, 0, 2433 AudioDeviceFactory::kSourceMediaElement, routing_id_, 0,
2434 sink_id.utf8(), frame_->getSecurityOrigin()); 2434 sink_id.utf8(), frame_->getSecurityOrigin());
2435 media::WebMediaPlayerParams::Context3DCB context_3d_cb = 2435 media::WebMediaPlayerParams::Context3DCB context_3d_cb =
2436 base::Bind(&GetSharedMainThreadContext3D); 2436 base::Bind(&GetSharedMainThreadContext3D);
2437 2437
2438 scoped_refptr<media::MediaLog> media_log(new RenderMediaLog()); 2438 scoped_refptr<media::MediaLog> media_log(new RenderMediaLog());
2439 #if defined(OS_ANDROID) 2439 #if defined(OS_ANDROID)
2440 if (!media_surface_manager_) 2440 if (!media_surface_manager_)
2441 media_surface_manager_ = new RendererSurfaceViewManager(this); 2441 media_surface_manager_ = new RendererSurfaceViewManager(this);
2442 #endif 2442 #endif
(...skipping 3641 matching lines...) Expand 10 before | Expand all | Expand 10 after
6084 int match_count, 6084 int match_count,
6085 int ordinal, 6085 int ordinal,
6086 const WebRect& selection_rect, 6086 const WebRect& selection_rect,
6087 bool final_status_update) { 6087 bool final_status_update) {
6088 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6088 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6089 selection_rect, ordinal, 6089 selection_rect, ordinal,
6090 final_status_update)); 6090 final_status_update));
6091 } 6091 }
6092 6092
6093 } // namespace content 6093 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698