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

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: 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_H_
6 #define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_H_ 6 #define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
11 #include <set> 11 #include <set>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/containers/scoped_ptr_hash_map.h" 14 #include "base/containers/scoped_ptr_hash_map.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "content/browser/media/media_web_contents_observer.h" 17 #include "content/browser/media/media_web_contents_observer.h"
18 #include "content/browser/power_save_blocker_impl.h" 18 #include "content/browser/power_save_blocker_impl.h"
19 #include "content/common/content_export.h" 19 #include "content/common/content_export.h"
20 #include "content/public/browser/web_contents_observer.h" 20 #include "content/public/browser/web_contents_observer.h"
21 21
22 namespace content { 22 namespace content {
23 23
24 class BrowserCdmManager; 24 class BrowserCdmManager;
25 class BrowserMediaPlayerManager; 25 class BrowserMediaPlayerManager;
26 class BrowserMediaSessionManager; 26 class BrowserMediaSessionManager;
27 class MediaSessionController;
27 28
28 // This class adds Android specific extensions to the MediaWebContentsObserver. 29 // This class adds Android specific extensions to the MediaWebContentsObserver.
29 class CONTENT_EXPORT MediaWebContentsObserverAndroid 30 class CONTENT_EXPORT MediaWebContentsObserverAndroid
30 : public MediaWebContentsObserver { 31 : public MediaWebContentsObserver {
31 public: 32 public:
32 explicit MediaWebContentsObserverAndroid(WebContents* web_contents); 33 explicit MediaWebContentsObserverAndroid(WebContents* web_contents);
33 ~MediaWebContentsObserverAndroid() override; 34 ~MediaWebContentsObserverAndroid() override;
34 35
35 // Returns the android specific observer for a given web contents. 36 // Returns the android specific observer for a given web contents.
36 static MediaWebContentsObserverAndroid* FromWebContents( 37 static MediaWebContentsObserverAndroid* FromWebContents(
(...skipping 10 matching lines...) Expand all
47 #if defined(VIDEO_HOLE) 48 #if defined(VIDEO_HOLE)
48 void OnFrameInfoUpdated(); 49 void OnFrameInfoUpdated();
49 #endif // defined(VIDEO_HOLE) 50 #endif // defined(VIDEO_HOLE)
50 51
51 // MediaWebContentsObserverAndroid overrides. 52 // MediaWebContentsObserverAndroid overrides.
52 void RenderFrameDeleted(RenderFrameHost* render_frame_host) override; 53 void RenderFrameDeleted(RenderFrameHost* render_frame_host) override;
53 bool OnMessageReceived(const IPC::Message& message, 54 bool OnMessageReceived(const IPC::Message& message,
54 RenderFrameHost* render_frame_host) override; 55 RenderFrameHost* render_frame_host) override;
55 56
56 private: 57 private:
58 // Handles messages for the media player delgate; does not modify the handled
mlamouri (slow - plz ping) 2016/01/14 15:43:08 typo: delegate
59 // state since the superclass needs to handle these as well.
60 void OnMediaPlayerDelegateMessageReceived(const IPC::Message& msg,
61 RenderFrameHost* render_frame_host);
62 void OnMediaDestroyedNotification(RenderFrameHost* render_frame_host,
63 int64_t player_cookie);
64 void OnMediaPlayingNotification(RenderFrameHost* render_frame_host,
65 int64_t player_cookie,
66 bool has_video,
67 bool has_audio,
68 bool is_remote,
69 base::TimeDelta duration);
70 void OnMediaPausedNotification(RenderFrameHost* render_frame_host,
71 int64_t player_cookie,
72 bool reached_end_of_stream);
73
57 // Helper functions to handle media player IPC messages. Returns whether the 74 // Helper functions to handle media player IPC messages. Returns whether the
58 // |message| is handled in the function. 75 // |message| is handled in the function.
59 bool OnMediaPlayerMessageReceived(const IPC::Message& message, 76 bool OnMediaPlayerMessageReceived(const IPC::Message& message,
60 RenderFrameHost* render_frame_host); 77 RenderFrameHost* render_frame_host);
61 78
62 bool OnMediaPlayerSetCdmMessageReceived(const IPC::Message& message, 79 bool OnMediaPlayerSetCdmMessageReceived(const IPC::Message& message,
63 RenderFrameHost* render_frame_host); 80 RenderFrameHost* render_frame_host);
64 81
65 void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id); 82 void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id);
66 83
67 // Map from RenderFrameHost* to BrowserMediaPlayerManager. 84 // Map from RenderFrameHost* to BrowserMediaPlayerManager.
68 using MediaPlayerManagerMap = 85 using MediaPlayerManagerMap =
69 base::ScopedPtrHashMap<RenderFrameHost*, 86 base::ScopedPtrHashMap<RenderFrameHost*,
70 scoped_ptr<BrowserMediaPlayerManager>>; 87 scoped_ptr<BrowserMediaPlayerManager>>;
71 MediaPlayerManagerMap media_player_managers_; 88 MediaPlayerManagerMap media_player_managers_;
72 89
73 // Map from RenderFrameHost* to BrowserMediaSessionManager. 90 // Map from RenderFrameHost* to BrowserMediaSessionManager.
74 using MediaSessionManagerMap = 91 using MediaSessionManagerMap =
75 base::ScopedPtrHashMap<RenderFrameHost*, 92 base::ScopedPtrHashMap<RenderFrameHost*,
76 scoped_ptr<BrowserMediaSessionManager>>; 93 scoped_ptr<BrowserMediaSessionManager>>;
77 MediaSessionManagerMap media_session_managers_; 94 MediaSessionManagerMap media_session_managers_;
78 95
96 // Map of renderer side media players to session controllers.
97 using MediaSessionMap =
98 std::map<MediaPlayerId, scoped_ptr<MediaSessionController>>;
99 MediaSessionMap media_session_map_;
100
79 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid); 101 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid);
80 }; 102 };
81 103
82 } // namespace content 104 } // namespace content
83 105
84 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_H_ 106 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698