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

Side by Side Diff: content/renderer/media/renderer_webmediaplayer_delegate.cc

Issue 1570043002: Implement MediaSession on top of the WebMediaPlayerDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@media_session
Patch Set: Rebase yet again. 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/media/renderer_webmediaplayer_delegate.h" 5 #include "content/renderer/media/renderer_webmediaplayer_delegate.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "content/common/frame_messages.h" 9 #include "content/common/frame_messages.h"
10 #include "content/public/renderer/render_frame.h" 10 #include "content/public/renderer/render_frame.h"
11 #include "third_party/WebKit/public/platform/WebMediaPlayer.h" 11 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
12 12
13 namespace media { 13 namespace media {
14 14
15 RendererWebMediaPlayerDelegate::RendererWebMediaPlayerDelegate( 15 RendererWebMediaPlayerDelegate::RendererWebMediaPlayerDelegate(
16 content::RenderFrame* render_frame) 16 content::RenderFrame* render_frame)
17 : RenderFrameObserver(render_frame) {} 17 : RenderFrameObserver(render_frame) {}
18 18
19 RendererWebMediaPlayerDelegate::~RendererWebMediaPlayerDelegate() {} 19 RendererWebMediaPlayerDelegate::~RendererWebMediaPlayerDelegate() {}
20 20
21 void RendererWebMediaPlayerDelegate::DidPlay(blink::WebMediaPlayer* player) { 21 // static
22 has_played_media_ = true; 22 int64_t RendererWebMediaPlayerDelegate::GetPlayerId(Observer* observer) {
23 Send(new FrameHostMsg_MediaPlayingNotification( 23 return reinterpret_cast<int64_t>(observer);
24 routing_id(), reinterpret_cast<int64_t>(player), player->hasVideo(),
25 player->hasAudio(), player->isRemote()));
26 }
27
28 void RendererWebMediaPlayerDelegate::DidPause(blink::WebMediaPlayer* player) {
29 Send(new FrameHostMsg_MediaPausedNotification(
30 routing_id(), reinterpret_cast<int64_t>(player)));
31 }
32
33 void RendererWebMediaPlayerDelegate::PlayerGone(blink::WebMediaPlayer* player) {
34 DidPause(player);
35 } 24 }
36 25
37 void RendererWebMediaPlayerDelegate::AddObserver(Observer* observer) { 26 void RendererWebMediaPlayerDelegate::AddObserver(Observer* observer) {
38 observer_list_.AddObserver(observer); 27 observer_list_.AddObserver(observer);
39 } 28 }
40 29
41 void RendererWebMediaPlayerDelegate::RemoveObserver(Observer* observer) { 30 void RendererWebMediaPlayerDelegate::RemoveObserver(Observer* observer) {
42 observer_list_.RemoveObserver(observer); 31 observer_list_.RemoveObserver(observer);
43 } 32 }
44 33
34 void RendererWebMediaPlayerDelegate::DidPlay(Observer* observer,
35 bool has_video,
36 bool has_audio,
37 bool is_remote,
38 base::TimeDelta duration) {
39 DCHECK(observer_list_.HasObserver(observer));
40 has_played_media_ = true;
41 Send(new FrameHostMsg_MediaPlayingNotification(
42 routing_id(), GetPlayerId(observer), has_video, has_audio, is_remote,
43 duration));
44 }
45
46 void RendererWebMediaPlayerDelegate::DidPause(Observer* observer,
47 bool reached_end_of_stream) {
48 DCHECK(observer_list_.HasObserver(observer));
49 Send(new FrameHostMsg_MediaPausedNotification(
50 routing_id(), GetPlayerId(observer), reached_end_of_stream));
51 }
52
53 void RendererWebMediaPlayerDelegate::PlayerGone(Observer* observer) {
54 DCHECK(observer_list_.HasObserver(observer));
55 Send(new FrameHostMsg_MediaDestroyedNotification(routing_id(),
56 GetPlayerId(observer)));
57 }
58
59 bool RendererWebMediaPlayerDelegate::IsHidden() {
60 return render_frame()->IsHidden();
61 }
62
45 void RendererWebMediaPlayerDelegate::WasHidden() { 63 void RendererWebMediaPlayerDelegate::WasHidden() {
46 FOR_EACH_OBSERVER(Observer, observer_list_, OnHidden()); 64 FOR_EACH_OBSERVER(Observer, observer_list_, OnHidden());
47 } 65 }
48 66
49 void RendererWebMediaPlayerDelegate::WasShown() { 67 void RendererWebMediaPlayerDelegate::WasShown() {
50 FOR_EACH_OBSERVER(Observer, observer_list_, OnShown()); 68 FOR_EACH_OBSERVER(Observer, observer_list_, OnShown());
51 } 69 }
52 70
53 bool RendererWebMediaPlayerDelegate::IsHidden() { 71 bool RendererWebMediaPlayerDelegate::OnMessageReceived(
54 return render_frame()->IsHidden(); 72 const IPC::Message& msg) {
73 bool handled = true;
74 IPC_BEGIN_MESSAGE_MAP(RendererWebMediaPlayerDelegate, msg)
75 IPC_MESSAGE_HANDLER(FrameMsg_MediaDelegatePause, OnMediaDelegatePause)
76 IPC_MESSAGE_HANDLER(FrameMsg_MediaDelegatePlay, OnMediaDelegatePlay)
77 IPC_MESSAGE_HANDLER(FrameMsg_MediaDelegateVolumeMultiplierUpdate,
78 OnMediaDelegateVolumeMultiplierUpdate)
79 IPC_MESSAGE_UNHANDLED(handled = false)
80 IPC_END_MESSAGE_MAP()
81 return handled;
82 }
83
84 bool RendererWebMediaPlayerDelegate::GetObserver(int64_t player_cookie,
85 Observer** observer) {
nasko 2016/01/22 17:28:32 Wouldn't returning a pointer to the observer be si
DaleCurtis 2016/01/23 02:11:00 Done.
86 // Translate the player cookie back to a Observer instance and make sure it's
87 // still a valid instance.
88 Observer* result = reinterpret_cast<Observer*>(player_cookie);
nasko 2016/01/22 17:28:32 Using pointer values for cookies should not be don
DaleCurtis 2016/01/23 02:11:00 Done.
89 if (!observer_list_.HasObserver(result))
90 return false;
91
92 *observer = result;
93 return true;
94 }
95
96 void RendererWebMediaPlayerDelegate::OnMediaDelegatePause(
97 int64_t player_cookie) {
98 Observer* observer;
99 if (GetObserver(player_cookie, &observer))
100 observer->OnPause();
101 }
102
103 void RendererWebMediaPlayerDelegate::OnMediaDelegatePlay(
104 int64_t player_cookie) {
105 Observer* observer;
106 if (GetObserver(player_cookie, &observer))
107 observer->OnPlay();
108 }
109
110 void RendererWebMediaPlayerDelegate::OnMediaDelegateVolumeMultiplierUpdate(
111 int64_t player_cookie,
112 double multiplier) {
113 Observer* observer;
114 if (GetObserver(player_cookie, &observer))
115 observer->OnVolumeMultiplierUpdate(multiplier);
55 } 116 }
56 117
57 } // namespace media 118 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698