From 13a24b6bc90fcfd39c47c8c40d66d46d9c98e750 Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Thu, 29 Sep 2016 08:25:20 -0700 Subject: [PATCH] Remove unused buffer_size Manually cherry-picked from libvpx/nextgenv2: fa99c376e509ef52ed8370019538b23e76477ddb Change-Id: Ia614aaa784c405a3d0f815846a584dd358008b18 --- aomdec.c | 3 +-- test/webm_video_source.h | 4 ++-- webmdec.cc | 12 +++++------- webmdec.h | 9 +++------ 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/aomdec.c b/aomdec.c index 1889a0825..6c4f13c83 100644 --- a/aomdec.c +++ b/aomdec.c @@ -218,8 +218,7 @@ static int read_frame(struct AvxDecInputContext *input, uint8_t **buf, switch (input->aom_input_ctx->file_type) { #if CONFIG_WEBM_IO case FILE_TYPE_WEBM: - return webm_read_frame(input->webm_ctx, buf, bytes_in_buffer, - buffer_size); + return webm_read_frame(input->webm_ctx, buf, bytes_in_buffer); #endif case FILE_TYPE_RAW: return raw_read_frame(input->aom_input_ctx->file, buf, bytes_in_buffer, diff --git a/test/webm_video_source.h b/test/webm_video_source.h index cf9555058..286f69cbf 100644 --- a/test/webm_video_source.h +++ b/test/webm_video_source.h @@ -56,7 +56,7 @@ class WebMVideoSource : public CompressedVideoSource { void FillFrame() { ASSERT_TRUE(aom_ctx_->file != NULL); - const int status = webm_read_frame(webm_ctx_, &buf_, &buf_sz_, &buf_sz_); + const int status = webm_read_frame(webm_ctx_, &buf_, &buf_sz_); ASSERT_GE(status, 0) << "webm_read_frame failed"; if (status == 1) { end_of_file_ = true; @@ -66,7 +66,7 @@ class WebMVideoSource : public CompressedVideoSource { void SeekToNextKeyFrame() { ASSERT_TRUE(aom_ctx_->file != NULL); do { - const int status = webm_read_frame(webm_ctx_, &buf_, &buf_sz_, &buf_sz_); + const int status = webm_read_frame(webm_ctx_, &buf_, &buf_sz_); ASSERT_GE(status, 0) << "webm_read_frame failed"; ++frame_; if (status == 1) { diff --git a/webmdec.cc b/webmdec.cc index 716de2ac6..638100bef 100644 --- a/webmdec.cc +++ b/webmdec.cc @@ -118,7 +118,7 @@ int file_is_webm(struct WebmInputContext *webm_ctx, } int webm_read_frame(struct WebmInputContext *webm_ctx, uint8_t **buffer, - size_t *bytes_in_buffer, size_t *buffer_size) { + size_t *buffer_size) { // This check is needed for frame parallel decoding, in which case this // function could be called even after it has reached end of input stream. if (webm_ctx->reached_eos) { @@ -142,7 +142,7 @@ int webm_read_frame(struct WebmInputContext *webm_ctx, uint8_t **buffer, } else if (block_entry_eos || block_entry->EOS()) { cluster = segment->GetNext(cluster); if (cluster == NULL || cluster->EOS()) { - *bytes_in_buffer = 0; + *buffer_size = 0; webm_ctx->reached_eos = 1; return 1; } @@ -159,7 +159,7 @@ int webm_read_frame(struct WebmInputContext *webm_ctx, uint8_t **buffer, } get_new_block = true; } - if (status) { + if (status || block_entry == NULL) { return -1; } if (get_new_block) { @@ -182,10 +182,9 @@ int webm_read_frame(struct WebmInputContext *webm_ctx, uint8_t **buffer, if (*buffer == NULL) { return -1; } - *buffer_size = frame.len; webm_ctx->buffer = *buffer; } - *bytes_in_buffer = frame.len; + *buffer_size = frame.len; webm_ctx->timestamp_ns = block->GetTime(cluster); webm_ctx->is_key_frame = block->IsKey(); @@ -198,10 +197,9 @@ int webm_guess_framerate(struct WebmInputContext *webm_ctx, struct AvxInputContext *aom_ctx) { uint32_t i = 0; uint8_t *buffer = NULL; - size_t bytes_in_buffer = 0; size_t buffer_size = 0; while (webm_ctx->timestamp_ns < 1000000000 && i < 50) { - if (webm_read_frame(webm_ctx, &buffer, &bytes_in_buffer, &buffer_size)) { + if (webm_read_frame(webm_ctx, &buffer, &buffer_size)) { break; } ++i; diff --git a/webmdec.h b/webmdec.h index d98bede96..329908eeb 100644 --- a/webmdec.h +++ b/webmdec.h @@ -43,21 +43,18 @@ int file_is_webm(struct WebmInputContext *webm_ctx, // Reads a WebM Video Frame. Memory for the buffer is created, owned and managed // by this function. For the first call, |buffer| should be NULL and -// |*bytes_in_buffer| should be 0. Once all the frames are read and used, +// |*buffer_size| should be 0. Once all the frames are read and used, // webm_free() should be called, otherwise there will be a leak. // Parameters: // webm_ctx - WebmInputContext object // buffer - pointer where the frame data will be filled. -// bytes_in_buffer - pointer to buffer size. -// buffer_size - unused TODO(vigneshv): remove this +// buffer_size - pointer to buffer size. // Return values: // 0 - Success // 1 - End of Stream // -1 - Error -// TODO(vigneshv): Make the return values consistent across all functions in -// this file. int webm_read_frame(struct WebmInputContext *webm_ctx, uint8_t **buffer, - size_t *bytes_in_buffer, size_t *buffer_size); + size_t *buffer_size); // Guesses the frame rate of the input file based on the container timestamps. int webm_guess_framerate(struct WebmInputContext *webm_ctx, -- GitLab