| Index: media/base/android/media_source_player.h
|
| diff --git a/media/base/android/media_source_player.h b/media/base/android/media_source_player.h
|
| index fd0fafbb1fad5af1faf47a9e86a3755aec882bf2..9a36655323e37794e748416f289591e2bce5c7ee 100644
|
| --- a/media/base/android/media_source_player.h
|
| +++ b/media/base/android/media_source_player.h
|
| @@ -58,10 +58,8 @@ class MEDIA_EXPORT MediaSourcePlayer : public MediaPlayerAndroid {
|
| virtual bool CanSeekBackward() OVERRIDE;
|
| virtual bool IsPlayerReady() OVERRIDE;
|
| virtual void OnSeekRequestAck(unsigned seek_request_id) OVERRIDE;
|
| - virtual void DemuxerReady(
|
| - const MediaPlayerHostMsg_DemuxerReady_Params& params) OVERRIDE;
|
| - virtual void ReadFromDemuxerAck(
|
| - const MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) OVERRIDE;
|
| + virtual void DemuxerReady(const MediaConfigs& configs) OVERRIDE;
|
| + virtual void ReadFromDemuxerAck(const MediaData& data) OVERRIDE;
|
| virtual void DurationChanged(const base::TimeDelta& duration) OVERRIDE;
|
| virtual void SetDrmBridge(MediaDrmBridge* drm_bridge) OVERRIDE;
|
|
|
| @@ -192,8 +190,8 @@ class MEDIA_EXPORT MediaSourcePlayer : public MediaPlayerAndroid {
|
| size_t video_access_unit_index_;
|
| bool waiting_for_audio_data_;
|
| bool waiting_for_video_data_;
|
| - MediaPlayerHostMsg_ReadFromDemuxerAck_Params received_audio_;
|
| - MediaPlayerHostMsg_ReadFromDemuxerAck_Params received_video_;
|
| + MediaData received_audio_;
|
| + MediaData received_video_;
|
|
|
| // A cancelable task that is posted when the audio decoder starts requesting
|
| // new data. This callback runs if no data arrives before the timeout period
|
|
|