]> granicus.if.org Git - libvpx/commitdiff
Merge "Add get release decoder frame buffer functions."
authorFrank Galligan <fgalligan@google.com>
Tue, 11 Feb 2014 16:19:37 +0000 (08:19 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 11 Feb 2014 16:19:37 +0000 (08:19 -0800)
1  2 
libs.mk
vp9/common/vp9_onyxc_int.h
vp9/encoder/vp9_onyx_if.c
vp9/vp9_common.mk
vp9/vp9_dx_iface.c

diff --cc libs.mk
Simple merge
index e82556c96ea2eceea65db5b2d5417f42004f719f,7a1b0ebb8acf9aa27a69a5a2ae738ea7372eb8fe..97983c596ccec0627ea1f26de31f7b3c3a6d2b06
@@@ -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;
  }
  
Simple merge
Simple merge
Simple merge