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

Side by Side Diff: content/browser/media/android/media_web_contents_observer_android.h

Issue 1570043002: Implement MediaSession on top of the WebMediaPlayerDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@media_session
Patch Set: Reorder. Created 4 years, 10 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_
6 #define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ 6 #define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/containers/scoped_ptr_hash_map.h" 10 #include "base/containers/scoped_ptr_hash_map.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "content/browser/media/media_web_contents_observer.h" 13 #include "content/browser/media/media_web_contents_observer.h"
14 #include "content/common/content_export.h" 14 #include "content/common/content_export.h"
15 15
16 namespace content { 16 namespace content {
17 17
18 class BrowserCdmManager; 18 class BrowserCdmManager;
19 class BrowserMediaPlayerManager; 19 class BrowserMediaPlayerManager;
20 class BrowserMediaSessionManager; 20 class BrowserMediaSessionManager;
21 class MediaSessionController;
21 22
22 // This class adds Android specific extensions to the MediaWebContentsObserver. 23 // This class adds Android specific extensions to the MediaWebContentsObserver.
23 class CONTENT_EXPORT MediaWebContentsObserverAndroid 24 class CONTENT_EXPORT MediaWebContentsObserverAndroid
24 : public MediaWebContentsObserver { 25 : public MediaWebContentsObserver {
25 public: 26 public:
26 explicit MediaWebContentsObserverAndroid(WebContents* web_contents); 27 explicit MediaWebContentsObserverAndroid(WebContents* web_contents);
27 ~MediaWebContentsObserverAndroid() override; 28 ~MediaWebContentsObserverAndroid() override;
28 29
29 // Returns the android specific observer for a given web contents. 30 // Returns the android specific observer for a given web contents.
30 static MediaWebContentsObserverAndroid* FromWebContents( 31 static MediaWebContentsObserverAndroid* FromWebContents(
31 WebContents* web_contents); 32 WebContents* web_contents);
32 33
33 // Gets the media player or media session manager associated with the given 34 // Gets the media player or media session manager associated with the given
34 // |render_frame_host| respectively. Creates a new one if it doesn't exist. 35 // |render_frame_host| respectively. Creates a new one if it doesn't exist.
35 // The caller doesn't own the returned pointer. 36 // The caller doesn't own the returned pointer.
36 BrowserMediaPlayerManager* GetMediaPlayerManager( 37 BrowserMediaPlayerManager* GetMediaPlayerManager(
37 RenderFrameHost* render_frame_host); 38 RenderFrameHost* render_frame_host);
38 BrowserMediaSessionManager* GetMediaSessionManager( 39 BrowserMediaSessionManager* GetMediaSessionManager(
39 RenderFrameHost* render_frame_host); 40 RenderFrameHost* render_frame_host);
40 41
42 // Initiates a synchronous MediaSession request for browser side players.
43 //
44 // TODO(dalecurtis): Delete this method once we're no longer using WMPA and
45 // the BrowserMediaPlayerManagers. Tracked by http://crbug.com/580626
46 bool RequestPlay(RenderFrameHost* render_frame_host,
47 int delegate_id,
48 bool has_audio,
49 bool is_remote,
50 base::TimeDelta duration);
51
41 #if defined(VIDEO_HOLE) 52 #if defined(VIDEO_HOLE)
42 void OnFrameInfoUpdated(); 53 void OnFrameInfoUpdated();
43 #endif // defined(VIDEO_HOLE) 54 #endif // defined(VIDEO_HOLE)
44 55
45 // MediaWebContentsObserverAndroid overrides. 56 // MediaWebContentsObserverAndroid overrides.
46 void RenderFrameDeleted(RenderFrameHost* render_frame_host) override; 57 void RenderFrameDeleted(RenderFrameHost* render_frame_host) override;
47 bool OnMessageReceived(const IPC::Message& message, 58 bool OnMessageReceived(const IPC::Message& message,
48 RenderFrameHost* render_frame_host) override; 59 RenderFrameHost* render_frame_host) override;
49 60
50 private: 61 private:
62 // Handles messages from the WebMediaPlayerDelegate; does not modify the
63 // handled state since the superclass needs to handle these as well.
64 void OnMediaPlayerDelegateMessageReceived(const IPC::Message& msg,
65 RenderFrameHost* render_frame_host);
66 void OnMediaDestroyed(RenderFrameHost* render_frame_host, int delegate_id);
67 void OnMediaPaused(RenderFrameHost* render_frame_host,
68 int delegate_id,
69 bool reached_end_of_stream);
70 void OnMediaPlaying(RenderFrameHost* render_frame_host,
71 int delegate_id,
72 bool has_video,
73 bool has_audio,
74 bool is_remote,
75 base::TimeDelta duration);
76
51 // Helper functions to handle media player IPC messages. Returns whether the 77 // Helper functions to handle media player IPC messages. Returns whether the
52 // |message| is handled in the function. 78 // |message| is handled in the function.
53 bool OnMediaPlayerMessageReceived(const IPC::Message& message, 79 bool OnMediaPlayerMessageReceived(const IPC::Message& message,
54 RenderFrameHost* render_frame_host); 80 RenderFrameHost* render_frame_host);
55 81
56 bool OnMediaPlayerSetCdmMessageReceived(const IPC::Message& message, 82 bool OnMediaPlayerSetCdmMessageReceived(const IPC::Message& message,
57 RenderFrameHost* render_frame_host); 83 RenderFrameHost* render_frame_host);
58 84
59 bool OnMediaSessionMessageReceived(const IPC::Message& message, 85 bool OnMediaSessionMessageReceived(const IPC::Message& message,
60 RenderFrameHost* render_frame_host); 86 RenderFrameHost* render_frame_host);
61 87
62 void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id); 88 void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id);
63 89
64 // Map from RenderFrameHost* to BrowserMediaPlayerManager. 90 // Map from RenderFrameHost* to BrowserMediaPlayerManager.
65 using MediaPlayerManagerMap = 91 using MediaPlayerManagerMap =
66 base::ScopedPtrHashMap<RenderFrameHost*, 92 base::ScopedPtrHashMap<RenderFrameHost*,
67 scoped_ptr<BrowserMediaPlayerManager>>; 93 scoped_ptr<BrowserMediaPlayerManager>>;
68 MediaPlayerManagerMap media_player_managers_; 94 MediaPlayerManagerMap media_player_managers_;
69 95
70 // Map from RenderFrameHost* to BrowserMediaSessionManager. 96 // Map from RenderFrameHost* to BrowserMediaSessionManager.
71 using MediaSessionManagerMap = 97 using MediaSessionManagerMap =
72 base::ScopedPtrHashMap<RenderFrameHost*, 98 base::ScopedPtrHashMap<RenderFrameHost*,
73 scoped_ptr<BrowserMediaSessionManager>>; 99 scoped_ptr<BrowserMediaSessionManager>>;
74 MediaSessionManagerMap media_session_managers_; 100 MediaSessionManagerMap media_session_managers_;
75 101
102 // Map of renderer process media players to session controllers.
103 using MediaSessionMap =
104 std::map<MediaPlayerId, scoped_ptr<MediaSessionController>>;
105 MediaSessionMap media_session_map_;
106
76 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid); 107 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid);
77 }; 108 };
78 109
79 } // namespace content 110 } // namespace content
80 111
81 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ 112 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698