| Index: media/base/android/media_decoder_job.cc
|
| diff --git a/media/base/android/media_decoder_job.cc b/media/base/android/media_decoder_job.cc
|
| index 7b340765d4954db0ba524f1fb4457ed7f20686e6..19f244c5e3e9a4e27e6b8d07be22b448758b99d8 100644
|
| --- a/media/base/android/media_decoder_job.cc
|
| +++ b/media/base/android/media_decoder_job.cc
|
| @@ -34,8 +34,7 @@ MediaDecoderJob::MediaDecoderJob(
|
|
|
| MediaDecoderJob::~MediaDecoderJob() {}
|
|
|
| -void MediaDecoderJob::OnDataReceived(
|
| - const MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) {
|
| +void MediaDecoderJob::OnDataReceived(const DemuxerData& data) {
|
| DCHECK(ui_loop_->BelongsToCurrentThread());
|
| DCHECK(!on_data_received_cb_.is_null());
|
|
|
| @@ -47,7 +46,7 @@ void MediaDecoderJob::OnDataReceived(
|
| }
|
|
|
| access_unit_index_ = 0;
|
| - received_data_ = params;
|
| + received_data_ = data;
|
| done_cb.Run();
|
| }
|
|
|
| @@ -91,7 +90,7 @@ bool MediaDecoderJob::Decode(
|
| received_data_.access_units[access_unit_index_].status) {
|
| // Clear received data because we need to handle a config change.
|
| decode_cb_.Reset();
|
| - received_data_ = MediaPlayerHostMsg_ReadFromDemuxerAck_Params();
|
| + received_data_ = DemuxerData();
|
| access_unit_index_ = 0;
|
| return false;
|
| }
|
| @@ -112,7 +111,7 @@ void MediaDecoderJob::Flush() {
|
| // Do nothing, flush when the next Decode() happens.
|
| needs_flush_ = true;
|
|
|
| - received_data_ = MediaPlayerHostMsg_ReadFromDemuxerAck_Params();
|
| + received_data_ = DemuxerData();
|
| access_unit_index_ = 0;
|
| on_data_received_cb_.Reset();
|
| }
|
| @@ -178,7 +177,7 @@ void MediaDecoderJob::RequestData(const base::Closure& done_cb) {
|
| DCHECK(ui_loop_->BelongsToCurrentThread());
|
| DCHECK(on_data_received_cb_.is_null());
|
|
|
| - received_data_ = MediaPlayerHostMsg_ReadFromDemuxerAck_Params();
|
| + received_data_ = DemuxerData();
|
| access_unit_index_ = 0;
|
| on_data_received_cb_ = done_cb;
|
|
|
|
|