| 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_RENDERER_MEDIA_ANDROID_RENDERER_DEMUXER_ANDROID_H_ | 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_DEMUXER_ANDROID_H_ |
| 6 #define CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_DEMUXER_ANDROID_H_ | 6 #define CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_DEMUXER_ANDROID_H_ |
| 7 | 7 |
| 8 #include "base/atomic_sequence_num.h" | 8 #include "base/atomic_sequence_num.h" |
| 9 #include "base/id_map.h" | 9 #include "base/id_map.h" |
| 10 #include "ipc/ipc_channel_proxy.h" | 10 #include "content/child/child_message_filter.h" |
| 11 #include "media/base/android/demuxer_stream_player_params.h" | 11 #include "media/base/android/demuxer_stream_player_params.h" |
| 12 | 12 |
| 13 namespace content { | 13 namespace content { |
| 14 | 14 |
| 15 class MediaSourceDelegate; | 15 class MediaSourceDelegate; |
| 16 class ThreadSafeSender; | |
| 17 | 16 |
| 18 // Represents the renderer process half of an IPC-based implementation of | 17 // Represents the renderer process half of an IPC-based implementation of |
| 19 // media::DemuxerAndroid. | 18 // media::DemuxerAndroid. |
| 20 // | 19 // |
| 21 // Refer to BrowserDemuxerAndroid for the browser process half. | 20 // Refer to BrowserDemuxerAndroid for the browser process half. |
| 22 class RendererDemuxerAndroid : public IPC::ChannelProxy::MessageFilter { | 21 class RendererDemuxerAndroid : public ChildMessageFilter { |
| 23 public: | 22 public: |
| 24 RendererDemuxerAndroid(); | 23 RendererDemuxerAndroid(); |
| 25 | 24 |
| 26 // Returns the next available demuxer client ID for use in IPC messages. | 25 // Returns the next available demuxer client ID for use in IPC messages. |
| 27 // | 26 // |
| 28 // Safe to call on any thread. | 27 // Safe to call on any thread. |
| 29 int GetNextDemuxerClientID(); | 28 int GetNextDemuxerClientID(); |
| 30 | 29 |
| 31 // Associates |delegate| with |demuxer_client_id| for handling incoming IPC | 30 // Associates |delegate| with |demuxer_client_id| for handling incoming IPC |
| 32 // messages. | 31 // messages. |
| 33 // | 32 // |
| 34 // Must be called on media thread. | 33 // Must be called on media thread. |
| 35 void AddDelegate(int demuxer_client_id, MediaSourceDelegate* delegate); | 34 void AddDelegate(int demuxer_client_id, MediaSourceDelegate* delegate); |
| 36 | 35 |
| 37 // Removes the association created by AddDelegate(). | 36 // Removes the association created by AddDelegate(). |
| 38 // | 37 // |
| 39 // Must be called on media thread. | 38 // Must be called on media thread. |
| 40 void RemoveDelegate(int demuxer_client_id); | 39 void RemoveDelegate(int demuxer_client_id); |
| 41 | 40 |
| 42 // IPC::ChannelProxy::MessageFilter overrides. | 41 // ChildMessageFilter overrides. |
| 42 virtual base::TaskRunner* OverrideTaskRunnerForMessage( |
| 43 const IPC::Message& message) OVERRIDE; |
| 43 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; | 44 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |
| 44 | 45 |
| 45 // media::DemuxerAndroidClient "implementation". | 46 // media::DemuxerAndroidClient "implementation". |
| 46 // | 47 // |
| 47 // TODO(scherkus): Consider having RendererDemuxerAndroid actually implement | 48 // TODO(scherkus): Consider having RendererDemuxerAndroid actually implement |
| 48 // media::DemuxerAndroidClient and MediaSourceDelegate actually implement | 49 // media::DemuxerAndroidClient and MediaSourceDelegate actually implement |
| 49 // media::DemuxerAndroid. | 50 // media::DemuxerAndroid. |
| 50 void DemuxerReady(int demuxer_client_id, | 51 void DemuxerReady(int demuxer_client_id, |
| 51 const media::DemuxerConfigs& configs); | 52 const media::DemuxerConfigs& configs); |
| 52 void ReadFromDemuxerAck(int demuxer_client_id, | 53 void ReadFromDemuxerAck(int demuxer_client_id, |
| 53 const media::DemuxerData& data); | 54 const media::DemuxerData& data); |
| 54 void DemuxerSeekDone(int demuxer_client_id); | 55 void DemuxerSeekDone(int demuxer_client_id); |
| 55 void DurationChanged(int demuxer_client_id, const base::TimeDelta& duration); | 56 void DurationChanged(int demuxer_client_id, const base::TimeDelta& duration); |
| 56 | 57 |
| 57 protected: | 58 protected: |
| 58 friend class base::RefCountedThreadSafe<RendererDemuxerAndroid>; | 59 friend class base::RefCountedThreadSafe<RendererDemuxerAndroid>; |
| 59 virtual ~RendererDemuxerAndroid(); | 60 virtual ~RendererDemuxerAndroid(); |
| 60 | 61 |
| 61 private: | 62 private: |
| 62 void DispatchMessage(const IPC::Message& message); | |
| 63 void OnReadFromDemuxer(int demuxer_client_id, | 63 void OnReadFromDemuxer(int demuxer_client_id, |
| 64 media::DemuxerStream::Type type); | 64 media::DemuxerStream::Type type); |
| 65 void OnDemuxerSeekRequest(int demuxer_client_id, | 65 void OnDemuxerSeekRequest(int demuxer_client_id, |
| 66 const base::TimeDelta& time_to_seek); | 66 const base::TimeDelta& time_to_seek); |
| 67 void OnMediaConfigRequest(int demuxer_client_id); | 67 void OnMediaConfigRequest(int demuxer_client_id); |
| 68 | 68 |
| 69 base::AtomicSequenceNumber next_demuxer_client_id_; | 69 base::AtomicSequenceNumber next_demuxer_client_id_; |
| 70 | 70 |
| 71 IDMap<MediaSourceDelegate> delegates_; | 71 IDMap<MediaSourceDelegate> delegates_; |
| 72 scoped_refptr<ThreadSafeSender> thread_safe_sender_; | |
| 73 scoped_refptr<base::MessageLoopProxy> media_message_loop_; | 72 scoped_refptr<base::MessageLoopProxy> media_message_loop_; |
| 74 | 73 |
| 75 DISALLOW_COPY_AND_ASSIGN(RendererDemuxerAndroid); | 74 DISALLOW_COPY_AND_ASSIGN(RendererDemuxerAndroid); |
| 76 }; | 75 }; |
| 77 | 76 |
| 78 } // namespace content | 77 } // namespace content |
| 79 | 78 |
| 80 #endif // CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_DEMUXER_ANDROID_H_ | 79 #endif // CONTENT_RENDERER_MEDIA_ANDROID_RENDERER_DEMUXER_ANDROID_H_ |
| OLD | NEW |