| OLD | NEW |
| 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 Loading... |
| 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 typedef std::map<int, media::DemuxerConfigs> ConfigsPerClient; |
| 62 ConfigsPerClient pending_configs_; |
| 63 |
| 64 bool enable_media_thread_for_media_playback_; |
| 65 |
| 58 DISALLOW_COPY_AND_ASSIGN(BrowserDemuxerAndroid); | 66 DISALLOW_COPY_AND_ASSIGN(BrowserDemuxerAndroid); |
| 59 }; | 67 }; |
| 60 | 68 |
| 61 } // namespace content | 69 } // namespace content |
| 62 | 70 |
| 63 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_ | 71 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_ |
| OLD | NEW |