| Index: content/renderer/media/android/media_source_delegate.h
|
| diff --git a/content/renderer/media/android/media_source_delegate.h b/content/renderer/media/android/media_source_delegate.h
|
| index 4ac8ed8ade2fdaaed8277f7d3519323b39039f6b..9988d5b6e3bb07d5812b14bb5827af5392837469 100644
|
| --- a/content/renderer/media/android/media_source_delegate.h
|
| +++ b/content/renderer/media/android/media_source_delegate.h
|
| @@ -97,9 +97,6 @@ class MediaSourceDelegate : public media::DemuxerHost {
|
| // Called when DemuxerStreamPlayer needs to read data from ChunkDemuxer.
|
| void OnReadFromDemuxer(media::DemuxerStream::Type type);
|
|
|
| - // Called when the player needs the new config data from ChunkDemuxer.
|
| - void OnMediaConfigRequest();
|
| -
|
| // Called by the Destroyer to destroy an instance of this object.
|
| void Destroy();
|
|
|
| @@ -161,7 +158,7 @@ class MediaSourceDelegate : public media::DemuxerHost {
|
| void SeekInternal(const base::TimeDelta& seek_time);
|
| // Reads an access unit from the demuxer stream |stream| and stores it in
|
| // the |index|th access unit in |params|.
|
| - void ReadFromDemuxerStream(media::DemuxerStream::Type type,
|
| + bool ReadFromDemuxerStream(media::DemuxerStream::Type type,
|
| scoped_ptr<media::DemuxerData> data,
|
| size_t index);
|
| void OnBufferReady(media::DemuxerStream::Type type,
|
| @@ -183,6 +180,11 @@ class MediaSourceDelegate : public media::DemuxerHost {
|
| base::TimeDelta FindBufferedBrowserSeekTime_Locked(
|
| const base::TimeDelta& seek_time) const;
|
|
|
| + // Get the demuxer configs for a particular stream identified by |is_audio|.
|
| + // Returns true on success, of false otherwise.
|
| + bool GetDemuxerConfigFromStream(media::DemuxerConfigs* configs,
|
| + bool is_audio);
|
| +
|
| RendererDemuxerAndroid* demuxer_client_;
|
| int demuxer_client_id_;
|
|
|
|
|