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

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

Issue 1585163002: Media Session: prepare for implicit activation of user created session (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Be clearer about session being a media_session Created 4 years, 11 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 2360 matching lines...) Expand 10 before | Expand all | Expand 10 after
2371 return NULL; 2371 return NULL;
2372 #endif // defined(ENABLE_PLUGINS) 2372 #endif // defined(ENABLE_PLUGINS)
2373 } 2373 }
2374 2374
2375 blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer( 2375 blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
2376 blink::WebLocalFrame* frame, 2376 blink::WebLocalFrame* frame,
2377 const blink::WebURL& url, 2377 const blink::WebURL& url,
2378 WebMediaPlayerClient* client, 2378 WebMediaPlayerClient* client,
2379 WebMediaPlayerEncryptedMediaClient* encrypted_client, 2379 WebMediaPlayerEncryptedMediaClient* encrypted_client,
2380 WebContentDecryptionModule* initial_cdm, 2380 WebContentDecryptionModule* initial_cdm,
2381 const blink::WebString& sink_id) { 2381 const blink::WebString& sink_id,
2382 WebMediaSession*) {
jochen (gone - plz use gerrit) 2016/01/25 11:34:54 please add parameter names, also for unused variab
2382 #if defined(VIDEO_HOLE) 2383 #if defined(VIDEO_HOLE)
2383 if (!contains_media_player_) { 2384 if (!contains_media_player_) {
2384 render_view_->RegisterVideoHoleFrame(this); 2385 render_view_->RegisterVideoHoleFrame(this);
2385 contains_media_player_ = true; 2386 contains_media_player_ = true;
2386 } 2387 }
2387 #endif // defined(VIDEO_HOLE) 2388 #endif // defined(VIDEO_HOLE)
2388 2389
2389 blink::WebMediaStream web_stream( 2390 blink::WebMediaStream web_stream(
2390 blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url)); 2391 blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url));
2391 if (!web_stream.isNull()) 2392 if (!web_stream.isNull())
(...skipping 3385 matching lines...) Expand 10 before | Expand all | Expand 10 after
5777 media::ConvertToSwitchOutputDeviceCB(web_callbacks); 5778 media::ConvertToSwitchOutputDeviceCB(web_callbacks);
5778 scoped_refptr<media::AudioOutputDevice> device = 5779 scoped_refptr<media::AudioOutputDevice> device =
5779 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), 5780 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(),
5780 security_origin); 5781 security_origin);
5781 media::OutputDeviceStatus status = device->GetDeviceStatus(); 5782 media::OutputDeviceStatus status = device->GetDeviceStatus();
5782 device->Stop(); 5783 device->Stop();
5783 callback.Run(status); 5784 callback.Run(status);
5784 } 5785 }
5785 5786
5786 } // namespace content 5787 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698