shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Change "ximage" to "vpx_image_t" in comments."

--- a/test/external_frame_buffer_test.cc

+++ b/test/external_frame_buffer_test.cc

@@ -114,9 +114,9 @@

     return 0;

   }

-  // Checks that the ximage data is contained within the external frame buffer

-  // private data passed back in the ximage.

-  void CheckXImageFrameBuffer(const vpx_image_t *img) {

+  // Checks that the vpx_image_t data is contained within the external frame

+  // buffer private data passed back in the vpx_image_t.

+  void CheckImageFrameBuffer(const vpx_image_t *img) {

     if (img->fb_priv != NULL) {

       const struct ExternalFrameBuffer *const ext_fb =

           reinterpret_cast<ExternalFrameBuffer *>(img->fb_priv);

@@ -342,7 +342,7 @@

     // Get decompressed data

     while ((img = dec_iter.Next()) != NULL) {

-      fb_list_.CheckXImageFrameBuffer(img);

+      fb_list_.CheckImageFrameBuffer(img);

     }

   }

--- a/vpx/vpx_frame_buffer.h

+++ b/vpx/vpx_frame_buffer.h

@@ -52,9 +52,9 @@

  * data. The callback is triggered when the decoder needs a frame buffer to

  * decode a compressed image into. This function may be called more than once

  * for every call to vpx_codec_decode. The application may set fb->priv to

- * some data which will be passed back in the ximage and the release function

- * call. |fb| is guaranteed to not be NULL. On success the callback must

- * return 0. Any failure the callback must return a value less than 0.

+ * some data which will be passed back in the vpx_image_t and the release

+ * function call. |fb| is guaranteed to not be NULL. On success the callback

+ * must return 0. Any failure the callback must return a value less than 0.

  *

  * \param[in] priv         Callback's private data

  * \param[in] min_size     Size in bytes needed by the buffer