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 c1c56042b79dae82dcaf4e75ba6eeceffc2f266b..efbbea8f47b6afd69cc92b8cf90860a7a9d418bb 100644 |
--- a/media/base/android/media_decoder_job.cc |
+++ b/media/base/android/media_decoder_job.cc |
@@ -88,7 +88,7 @@ void MediaDecoderJob::OnDataReceived(const DemuxerData& data) { |
if (stop_decode_pending_) { |
DCHECK(is_decoding()); |
- OnDecodeCompleted(MEDIA_CODEC_ABORT, false, kNoTimestamp(), kNoTimestamp()); |
+ OnDecodeCompleted(MEDIA_CODEC_ABORT, false, kNoTimestamp, kNoTimestamp); |
return; |
} |
@@ -352,9 +352,10 @@ void MediaDecoderJob::DecodeCurrentAccessUnit( |
need_to_reconfig_decoder_job_ || reconfigure_needed; |
// Report MEDIA_CODEC_OK status so decoder will continue decoding and |
// MEDIA_CODEC_OUTPUT_FORMAT_CHANGED status will come later. |
- ui_task_runner_->PostTask(FROM_HERE, base::Bind( |
- &MediaDecoderJob::OnDecodeCompleted, base::Unretained(this), |
- MEDIA_CODEC_OK, false, kNoTimestamp(), kNoTimestamp())); |
+ ui_task_runner_->PostTask( |
+ FROM_HERE, base::Bind(&MediaDecoderJob::OnDecodeCompleted, |
+ base::Unretained(this), MEDIA_CODEC_OK, false, |
+ kNoTimestamp, kNoTimestamp)); |
return; |
} |
// Start draining the decoder so that all the remaining frames are |
@@ -390,7 +391,7 @@ void MediaDecoderJob::DecodeInternal( |
input_buf_index_ = -1; |
MediaCodecStatus flush_status = media_codec_bridge_->Flush(); |
if (flush_status != MEDIA_CODEC_OK) { |
- callback.Run(flush_status, false, kNoTimestamp(), kNoTimestamp()); |
+ callback.Run(flush_status, false, kNoTimestamp, kNoTimestamp); |
return; |
} |
} |
@@ -402,7 +403,7 @@ void MediaDecoderJob::DecodeInternal( |
// For aborted access unit, just skip it and inform the player. |
if (unit.status == DemuxerStream::kAborted) { |
- callback.Run(MEDIA_CODEC_ABORT, false, kNoTimestamp(), kNoTimestamp()); |
+ callback.Run(MEDIA_CODEC_ABORT, false, kNoTimestamp, kNoTimestamp); |
return; |
} |
@@ -410,8 +411,8 @@ void MediaDecoderJob::DecodeInternal( |
if (unit.is_end_of_stream || unit.data.empty()) { |
input_eos_encountered_ = true; |
output_eos_encountered_ = true; |
- callback.Run(MEDIA_CODEC_OUTPUT_END_OF_STREAM, false, kNoTimestamp(), |
- kNoTimestamp()); |
+ callback.Run(MEDIA_CODEC_OUTPUT_END_OF_STREAM, false, kNoTimestamp, |
+ kNoTimestamp); |
return; |
} |
@@ -428,7 +429,7 @@ void MediaDecoderJob::DecodeInternal( |
// change can be resolved. Context: b/21786703 |
DVLOG(1) << "dequeueInputBuffer gave AGAIN_LATER, dequeue output buffers"; |
} else if (input_status != MEDIA_CODEC_OK) { |
- callback.Run(input_status, false, kNoTimestamp(), kNoTimestamp()); |
+ callback.Run(input_status, false, kNoTimestamp, kNoTimestamp); |
return; |
} |
} |
@@ -466,7 +467,7 @@ void MediaDecoderJob::DecodeInternal( |
status != MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER); |
if (status != MEDIA_CODEC_OK) { |
- callback.Run(status, false, kNoTimestamp(), kNoTimestamp()); |
+ callback.Run(status, false, kNoTimestamp, kNoTimestamp); |
return; |
} |
@@ -507,7 +508,7 @@ void MediaDecoderJob::DecodeInternal( |
presentation_timestamp = std::max( |
presentation_timestamp, start_presentation_timestamp); |
} else { |
- presentation_timestamp = kNoTimestamp(); |
+ presentation_timestamp = kNoTimestamp; |
} |
const bool is_late_frame = (time_to_render < base::TimeDelta()); |
@@ -534,7 +535,7 @@ void MediaDecoderJob::OnDecodeCompleted( |
DCHECK(!decode_cb_.is_null()); |
// If output was queued for rendering, then we have completed prerolling. |
- if (current_presentation_timestamp != kNoTimestamp() || |
+ if (current_presentation_timestamp != kNoTimestamp || |
status == MEDIA_CODEC_OUTPUT_END_OF_STREAM) { |
prerolling_ = false; |
} |