shithub: libvpx

Info  •  Files  •  Log  •  Branches

TODO cleanup: Remove unused buffer_size

Remove unused variable buffer_size and rename bytes_in_buffer to
buffer_size in webm_read_frame.

Change-Id: I18b6ccbb044cd366610a5e39d83883cc0b174051

--- a/test/webm_video_source.h

+++ b/test/webm_video_source.h

@@ -62,7 +62,7 @@

   void FillFrame() {

     ASSERT_TRUE(vpx_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;

@@ -72,7 +72,7 @@

   void SeekToNextKeyFrame() {

     ASSERT_TRUE(vpx_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) {

--- a/vpxdec.c

+++ b/vpxdec.c

@@ -257,8 +257,7 @@

   switch (input->vpx_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->vpx_input_ctx->file,

--- a/webmdec.cc

+++ b/webmdec.cc

@@ -122,7 +122,6 @@

 int webm_read_frame(struct WebmInputContext *webm_ctx,

                     uint8_t **buffer,

-                    size_t *bytes_in_buffer,

                     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.

@@ -147,7 +146,7 @@

     } 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;

       }

@@ -187,10 +186,9 @@

     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();

@@ -203,10 +201,9 @@

                          struct VpxInputContext *vpx_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;

--- a/webmdec.h

+++ b/webmdec.h

@@ -42,13 +42,12 @@

 // 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

@@ -57,7 +56,6 @@

 // this file.

 int webm_read_frame(struct WebmInputContext *webm_ctx,

                     uint8_t **buffer,

-                    size_t *bytes_in_buffer,

                     size_t *buffer_size);

 // Guesses the frame rate of the input file based on the container timestamps.