From: Frank Galligan <fgalligan@google.com>
Date: Tue, 11 Feb 2014 16:19:37 +0000 (-0800)
Subject: Merge "Add get release decoder frame buffer functions."
X-Git-Tag: v1.4.0~2433
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d51ca0db00104fb708482095816b75e6e64d9862;p=libvpx

Merge "Add get release decoder frame buffer functions."
---

d51ca0db00104fb708482095816b75e6e64d9862
diff --cc vp9/common/vp9_onyxc_int.h
index e82556c96,7a1b0ebb8..97983c596
--- a/vp9/common/vp9_onyxc_int.h
+++ b/vp9/common/vp9_onyxc_int.h
@@@ -223,9 -225,17 +225,17 @@@ typedef struct VP9Common 
    int frame_parallel_decoding_mode;
  
    int log2_tile_cols, log2_tile_rows;
+ 
+   // Private data associated with the frame buffer callbacks.
+   void *cb_priv;
+   vpx_get_frame_buffer_cb_fn_t get_fb_cb;
+   vpx_release_frame_buffer_cb_fn_t release_fb_cb;
+ 
+   // Handles memory for the codec.
+   InternalFrameBufferList int_frame_buffers;
  } VP9_COMMON;
  
 -static YV12_BUFFER_CONFIG *get_frame_new_buffer(VP9_COMMON *cm) {
 +static INLINE YV12_BUFFER_CONFIG *get_frame_new_buffer(VP9_COMMON *cm) {
    return &cm->frame_bufs[cm->new_fb_idx].buf;
  }