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

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: Fixed clang build Created 5 years, 7 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
« no previous file with comments | « no previous file | content/browser/media/android/browser_demuxer_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <map>
9
8 #include "base/id_map.h" 10 #include "base/id_map.h"
9 #include "content/public/browser/browser_message_filter.h" 11 #include "content/public/browser/browser_message_filter.h"
10 #include "media/base/android/demuxer_android.h" 12 #include "media/base/android/demuxer_android.h"
11 13
12 namespace content { 14 namespace content {
13 15
14 // Represents the browser process half of an IPC-based demuxer proxy. 16 // Represents the browser process half of an IPC-based demuxer proxy.
15 // It vends out media::DemuxerAndroid instances that are registered with an 17 // It vends out media::DemuxerAndroid instances that are registered with an
16 // end point in the renderer process. 18 // end point in the renderer process.
17 // 19 //
18 // Refer to RendererDemuxerAndroid for the renderer process half. 20 // Refer to RendererDemuxerAndroid for the renderer process half.
19 class CONTENT_EXPORT BrowserDemuxerAndroid : public BrowserMessageFilter { 21 class CONTENT_EXPORT BrowserDemuxerAndroid : public BrowserMessageFilter {
20 public: 22 public:
21 BrowserDemuxerAndroid(); 23 BrowserDemuxerAndroid();
22 24
23 // BrowserMessageFilter overrides. 25 // BrowserMessageFilter overrides.
24 void OverrideThreadForMessage(const IPC::Message& message, 26 base::TaskRunner* OverrideTaskRunnerForMessage(
25 BrowserThread::ID* thread) override; 27 const IPC::Message& message) override;
28
26 bool OnMessageReceived(const IPC::Message& message) override; 29 bool OnMessageReceived(const IPC::Message& message) override;
27 30
28 // Returns an uninitialized demuxer implementation associated with 31 // Returns an uninitialized demuxer implementation associated with
29 // |demuxer_client_id|, which can be used to communicate with the real demuxer 32 // |demuxer_client_id|, which can be used to communicate with the real demuxer
30 // in the renderer process. 33 // in the renderer process.
31 scoped_ptr<media::DemuxerAndroid> CreateDemuxer(int demuxer_client_id); 34 scoped_ptr<media::DemuxerAndroid> CreateDemuxer(int demuxer_client_id);
32 35
33 protected: 36 protected:
34 friend class base::RefCountedThreadSafe<BrowserDemuxerAndroid>; 37 friend class base::RefCountedThreadSafe<BrowserDemuxerAndroid>;
35 ~BrowserDemuxerAndroid() override; 38 ~BrowserDemuxerAndroid() override;
(...skipping 12 matching lines...) Expand all
48 const media::DemuxerConfigs& configs); 51 const media::DemuxerConfigs& configs);
49 void OnReadFromDemuxerAck(int demuxer_client_id, 52 void OnReadFromDemuxerAck(int demuxer_client_id,
50 const media::DemuxerData& data); 53 const media::DemuxerData& data);
51 void OnDemuxerSeekDone(int demuxer_client_id, 54 void OnDemuxerSeekDone(int demuxer_client_id,
52 const base::TimeDelta& actual_browser_seek_time); 55 const base::TimeDelta& actual_browser_seek_time);
53 void OnDurationChanged(int demuxer_client_id, 56 void OnDurationChanged(int demuxer_client_id,
54 const base::TimeDelta& duration); 57 const base::TimeDelta& duration);
55 58
56 IDMap<media::DemuxerAndroidClient> demuxer_clients_; 59 IDMap<media::DemuxerAndroidClient> demuxer_clients_;
57 60
61 // When the demuxer client is created on UI thread but demuxer
62 // messages arrive on Media thread their relative order is undefined.
63 // Use |pending_configs_| map to keep the upcoming configurations
64 // until the client is created.
65 typedef std::map<int, media::DemuxerConfigs> ConfigsPerClient;
66 ConfigsPerClient pending_configs_;
67
68 base::SingleThreadTaskRunner* task_runner_;
69
58 DISALLOW_COPY_AND_ASSIGN(BrowserDemuxerAndroid); 70 DISALLOW_COPY_AND_ASSIGN(BrowserDemuxerAndroid);
59 }; 71 };
60 72
61 } // namespace content 73 } // namespace content
62 74
63 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_ 75 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/media/android/browser_demuxer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698