summaryrefslogtreecommitdiff
path: root/chromium/media/base/android/video_decoder_job.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/media/base/android/video_decoder_job.cc')
-rw-r--r--chromium/media/base/android/video_decoder_job.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/media/base/android/video_decoder_job.cc b/chromium/media/base/android/video_decoder_job.cc
index d49d2d2e6a0..d43f45039b1 100644
--- a/chromium/media/base/android/video_decoder_job.cc
+++ b/chromium/media/base/android/video_decoder_job.cc
@@ -27,7 +27,6 @@ base::LazyInstance<VideoDecoderThread>::Leaky
VideoDecoderJob::VideoDecoderJob(
const base::Closure& request_data_cb,
- const base::Closure& request_resources_cb,
const base::Closure& on_demuxer_config_changed_cb)
: MediaDecoderJob(g_video_decoder_thread.Pointer()->task_runner(),
request_data_cb,
@@ -36,8 +35,7 @@ VideoDecoderJob::VideoDecoderJob(
config_width_(0),
config_height_(0),
output_width_(0),
- output_height_(0),
- request_resources_cb_(request_resources_cb) {
+ output_height_(0) {
}
VideoDecoderJob::~VideoDecoderJob() {}
@@ -78,12 +76,15 @@ void VideoDecoderJob::SetDemuxerConfigs(const DemuxerConfigs& configs) {
void VideoDecoderJob::ReleaseOutputBuffer(
int output_buffer_index,
+ size_t offset,
size_t size,
bool render_output,
+ bool is_late_frame,
base::TimeDelta current_presentation_timestamp,
const ReleaseOutputCompletionCallback& callback) {
media_codec_bridge_->ReleaseOutputBuffer(output_buffer_index, render_output);
- callback.Run(current_presentation_timestamp, current_presentation_timestamp);
+ callback.Run(is_late_frame, current_presentation_timestamp,
+ current_presentation_timestamp);
}
bool VideoDecoderJob::ComputeTimeToRender() const {
@@ -140,7 +141,6 @@ MediaDecoderJob::MediaDecoderJobStatus
if (!media_codec_bridge_)
return STATUS_FAILURE;
- request_resources_cb_.Run();
return STATUS_SUCCESS;
}