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

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

Issue 1076013002: Added stub MediaSourcePlayer for developing behind the flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Got rid of extra namespace, renamed players and the flag Created 5 years, 8 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 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_
6 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_ 6 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_
7 7
8 #include "base/id_map.h" 8 #include "base/id_map.h"
9 #include "base/synchronization/lock.h"
9 #include "content/public/browser/browser_message_filter.h" 10 #include "content/public/browser/browser_message_filter.h"
10 #include "media/base/android/demuxer_android.h" 11 #include "media/base/android/demuxer_android.h"
11 12
12 namespace content { 13 namespace content {
13 14
14 // Represents the browser process half of an IPC-based demuxer proxy. 15 // Represents the browser process half of an IPC-based demuxer proxy.
15 // It vends out media::DemuxerAndroid instances that are registered with an 16 // It vends out media::DemuxerAndroid instances that are registered with an
16 // end point in the renderer process. 17 // end point in the renderer process.
17 // 18 //
18 // Refer to RendererDemuxerAndroid for the renderer process half. 19 // Refer to RendererDemuxerAndroid for the renderer process half.
(...skipping 27 matching lines...) Expand all
46 // IPC message handlers. 47 // IPC message handlers.
47 void OnDemuxerReady(int demuxer_client_id, 48 void OnDemuxerReady(int demuxer_client_id,
48 const media::DemuxerConfigs& configs); 49 const media::DemuxerConfigs& configs);
49 void OnReadFromDemuxerAck(int demuxer_client_id, 50 void OnReadFromDemuxerAck(int demuxer_client_id,
50 const media::DemuxerData& data); 51 const media::DemuxerData& data);
51 void OnDemuxerSeekDone(int demuxer_client_id, 52 void OnDemuxerSeekDone(int demuxer_client_id,
52 const base::TimeDelta& actual_browser_seek_time); 53 const base::TimeDelta& actual_browser_seek_time);
53 void OnDurationChanged(int demuxer_client_id, 54 void OnDurationChanged(int demuxer_client_id,
54 const base::TimeDelta& duration); 55 const base::TimeDelta& duration);
55 56
57 media::DemuxerAndroidClient* Lookup(int demuxer_client_id);
xhwang 2015/04/24 05:04:13 nit: Something like GetDemuxerClient() to be consi
58
59
56 IDMap<media::DemuxerAndroidClient> demuxer_clients_; 60 IDMap<media::DemuxerAndroidClient> demuxer_clients_;
61 base::Lock lock_;
xhwang 2015/04/24 05:04:13 Add a comment why we need this and what needs to b
62 bool enable_media_thread_for_media_playback_;
57 63
58 DISALLOW_COPY_AND_ASSIGN(BrowserDemuxerAndroid); 64 DISALLOW_COPY_AND_ASSIGN(BrowserDemuxerAndroid);
59 }; 65 };
60 66
61 } // namespace content 67 } // namespace content
62 68
63 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_ 69 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698