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

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

Issue 1655083002: Enable SurfaceView fullscreen video on Android with WebMediaPlayerImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@avda-sv
Patch Set: cleaned up 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 BrowserSurfaceViewManager;
21 class MediaSessionController; 22 class MediaSessionController;
22 23
23 // This class adds Android specific extensions to the MediaWebContentsObserver. 24 // This class adds Android specific extensions to the MediaWebContentsObserver.
24 class CONTENT_EXPORT MediaWebContentsObserverAndroid 25 class CONTENT_EXPORT MediaWebContentsObserverAndroid
25 : public MediaWebContentsObserver { 26 : public MediaWebContentsObserver {
26 public: 27 public:
27 explicit MediaWebContentsObserverAndroid(WebContents* web_contents); 28 explicit MediaWebContentsObserverAndroid(WebContents* web_contents);
28 ~MediaWebContentsObserverAndroid() override; 29 ~MediaWebContentsObserverAndroid() override;
29 30
30 // Returns the android specific observer for a given web contents. 31 // Returns the android specific observer for a given web contents.
31 static MediaWebContentsObserverAndroid* FromWebContents( 32 static MediaWebContentsObserverAndroid* FromWebContents(
32 WebContents* web_contents); 33 WebContents* web_contents);
33 34
34 // Gets the media player or media session manager associated with the given 35 // Gets one of the managers associated with the given |render_frame_host|.
35 // |render_frame_host| respectively. Creates a new one if it doesn't exist. 36 // Creates a new one if it doesn't exist. The caller doesn't own the
36 // The caller doesn't own the returned pointer. 37 // returned pointer.
37 BrowserMediaPlayerManager* GetMediaPlayerManager( 38 BrowserMediaPlayerManager* GetMediaPlayerManager(
38 RenderFrameHost* render_frame_host); 39 RenderFrameHost* render_frame_host);
39 BrowserMediaSessionManager* GetMediaSessionManager( 40 BrowserMediaSessionManager* GetMediaSessionManager(
40 RenderFrameHost* render_frame_host); 41 RenderFrameHost* render_frame_host);
42 BrowserSurfaceViewManager* GetSurfaceViewManager(
43 RenderFrameHost* render_frame_host);
41 44
42 // Initiates a synchronous MediaSession request for browser side players. 45 // Initiates a synchronous MediaSession request for browser side players.
43 // 46 //
44 // TODO(dalecurtis): Delete this method once we're no longer using WMPA and 47 // TODO(dalecurtis): Delete this method once we're no longer using WMPA and
45 // the BrowserMediaPlayerManagers. Tracked by http://crbug.com/580626 48 // the BrowserMediaPlayerManagers. Tracked by http://crbug.com/580626
46 bool RequestPlay(RenderFrameHost* render_frame_host, 49 bool RequestPlay(RenderFrameHost* render_frame_host,
47 int delegate_id, 50 int delegate_id,
48 bool has_audio, 51 bool has_audio,
49 bool is_remote, 52 bool is_remote,
50 base::TimeDelta duration); 53 base::TimeDelta duration);
51 54
52 #if defined(VIDEO_HOLE) 55 #if defined(VIDEO_HOLE)
53 void OnFrameInfoUpdated(); 56 void OnFrameInfoUpdated();
54 #endif // defined(VIDEO_HOLE) 57 #endif // defined(VIDEO_HOLE)
55 58
56 // MediaWebContentsObserverAndroid overrides. 59 // MediaWebContentsObserver overrides.
57 void RenderFrameDeleted(RenderFrameHost* render_frame_host) override; 60 void RenderFrameDeleted(RenderFrameHost* render_frame_host) override;
58 bool OnMessageReceived(const IPC::Message& message, 61 bool OnMessageReceived(const IPC::Message& message,
59 RenderFrameHost* render_frame_host) override; 62 RenderFrameHost* render_frame_host) override;
60 63
61 private: 64 private:
62 // Handles messages from the WebMediaPlayerDelegate; does not modify the 65 // Handles messages from the WebMediaPlayerDelegate; does not modify the
63 // handled state since the superclass needs to handle these as well. 66 // handled state since the superclass needs to handle these as well.
64 void OnMediaPlayerDelegateMessageReceived(const IPC::Message& msg, 67 void OnMediaPlayerDelegateMessageReceived(const IPC::Message& msg,
65 RenderFrameHost* render_frame_host); 68 RenderFrameHost* render_frame_host);
66 void OnMediaDestroyed(RenderFrameHost* render_frame_host, int delegate_id); 69 void OnMediaDestroyed(RenderFrameHost* render_frame_host, int delegate_id);
(...skipping 11 matching lines...) Expand all
78 // |message| is handled in the function. 81 // |message| is handled in the function.
79 bool OnMediaPlayerMessageReceived(const IPC::Message& message, 82 bool OnMediaPlayerMessageReceived(const IPC::Message& message,
80 RenderFrameHost* render_frame_host); 83 RenderFrameHost* render_frame_host);
81 84
82 bool OnMediaPlayerSetCdmMessageReceived(const IPC::Message& message, 85 bool OnMediaPlayerSetCdmMessageReceived(const IPC::Message& message,
83 RenderFrameHost* render_frame_host); 86 RenderFrameHost* render_frame_host);
84 87
85 bool OnMediaSessionMessageReceived(const IPC::Message& message, 88 bool OnMediaSessionMessageReceived(const IPC::Message& message,
86 RenderFrameHost* render_frame_host); 89 RenderFrameHost* render_frame_host);
87 90
91 bool OnSurfaceViewManagerMessageReceived(const IPC::Message& message,
92 RenderFrameHost* render_frame_host);
93
88 void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id); 94 void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id);
89 95
90 // Map from RenderFrameHost* to BrowserMediaPlayerManager. 96 // Map from RenderFrameHost* to BrowserMediaPlayerManager.
91 using MediaPlayerManagerMap = 97 using MediaPlayerManagerMap =
92 base::ScopedPtrHashMap<RenderFrameHost*, 98 base::ScopedPtrHashMap<RenderFrameHost*,
93 scoped_ptr<BrowserMediaPlayerManager>>; 99 scoped_ptr<BrowserMediaPlayerManager>>;
94 MediaPlayerManagerMap media_player_managers_; 100 MediaPlayerManagerMap media_player_managers_;
95 101
96 // Map from RenderFrameHost* to BrowserMediaSessionManager. 102 // Map from RenderFrameHost* to BrowserMediaSessionManager.
97 using MediaSessionManagerMap = 103 using MediaSessionManagerMap =
98 base::ScopedPtrHashMap<RenderFrameHost*, 104 base::ScopedPtrHashMap<RenderFrameHost*,
99 scoped_ptr<BrowserMediaSessionManager>>; 105 scoped_ptr<BrowserMediaSessionManager>>;
100 MediaSessionManagerMap media_session_managers_; 106 MediaSessionManagerMap media_session_managers_;
101 107
102 // Map of renderer process media players to session controllers. 108 // Map of renderer process media players to session controllers.
103 using MediaSessionMap = 109 using MediaSessionMap =
104 std::map<MediaPlayerId, scoped_ptr<MediaSessionController>>; 110 std::map<MediaPlayerId, scoped_ptr<MediaSessionController>>;
105 MediaSessionMap media_session_map_; 111 MediaSessionMap media_session_map_;
106 112
113 using SurfaceViewManagerMap =
114 base::ScopedPtrHashMap<RenderFrameHost*,
115 scoped_ptr<BrowserSurfaceViewManager>>;
116 SurfaceViewManagerMap surface_view_managers_;
117
107 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid); 118 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserverAndroid);
108 }; 119 };
109 120
110 } // namespace content 121 } // namespace content
111 122
112 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_ 123 #endif // CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_WEB_CONTENTS_OBSERVER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698