From: James Zern Date: Tue, 11 Feb 2014 04:08:28 +0000 (-0800) Subject: cosmetics: yv12config.h: remove extra indent X-Git-Tag: v1.4.0~2372 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9bd76daf19fef2e4a90322f4ecb590250b3b1ee0;p=libvpx cosmetics: yv12config.h: remove extra indent + remove commented out fields from YV12_BUFFER_CONFIG Change-Id: Ie4f25df9ccae07e7b8fd31599cb4164949cf6f8f --- diff --git a/vpx_scale/yv12config.h b/vpx_scale/yv12config.h index 525f3a00d..cdde75cc5 100644 --- a/vpx_scale/yv12config.h +++ b/vpx_scale/yv12config.h @@ -24,62 +24,60 @@ extern "C" { #define VP9_ENC_BORDER_IN_PIXELS 160 #define VP9_DEC_BORDER_IN_PIXELS 32 - typedef struct yv12_buffer_config { - int y_width; - int y_height; - int y_crop_width; - int y_crop_height; - int y_stride; - /* int yinternal_width; */ +typedef struct yv12_buffer_config { + int y_width; + int y_height; + int y_crop_width; + int y_crop_height; + int y_stride; - int uv_width; - int uv_height; - int uv_crop_width; - int uv_crop_height; - int uv_stride; - /* int uvinternal_width; */ + int uv_width; + int uv_height; + int uv_crop_width; + int uv_crop_height; + int uv_stride; - int alpha_width; - int alpha_height; - int alpha_stride; + int alpha_width; + int alpha_height; + int alpha_stride; - uint8_t *y_buffer; - uint8_t *u_buffer; - uint8_t *v_buffer; - uint8_t *alpha_buffer; + uint8_t *y_buffer; + uint8_t *u_buffer; + uint8_t *v_buffer; + uint8_t *alpha_buffer; - uint8_t *buffer_alloc; - int buffer_alloc_sz; - int border; - int frame_size; + uint8_t *buffer_alloc; + int buffer_alloc_sz; + int border; + int frame_size; - int corrupted; - int flags; - } YV12_BUFFER_CONFIG; + int corrupted; + int flags; +} YV12_BUFFER_CONFIG; - int vp8_yv12_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, +int vp8_yv12_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, + int width, int height, int border); +int vp8_yv12_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, int width, int height, int border); - int vp8_yv12_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, - int width, int height, int border); - int vp8_yv12_de_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf); +int vp8_yv12_de_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf); - int vp9_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, - int width, int height, int ss_x, int ss_y, - int border); +int vp9_alloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, + int width, int height, int ss_x, int ss_y, + int border); - // Updates the yv12 buffer config with the frame buffer. If cb is not - // NULL, then libvpx is using the frame buffer callbacks to handle memory. - // If cb is not NULL, libvpx will call cb with minimum size in bytes needed - // to decode the current frame. If cb is NULL, libvpx will allocate memory - // internally to decode the current frame. Returns 0 on success. Returns < 0 - // on failure. - int vp9_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, - int width, int height, int ss_x, int ss_y, - int border, - vpx_codec_frame_buffer_t *fb, - vpx_get_frame_buffer_cb_fn_t cb, - void *cb_priv); - int vp9_free_frame_buffer(YV12_BUFFER_CONFIG *ybf); +// Updates the yv12 buffer config with the frame buffer. If cb is not +// NULL, then libvpx is using the frame buffer callbacks to handle memory. +// If cb is not NULL, libvpx will call cb with minimum size in bytes needed +// to decode the current frame. If cb is NULL, libvpx will allocate memory +// internally to decode the current frame. Returns 0 on success. Returns < 0 +// on failure. +int vp9_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, + int width, int height, int ss_x, int ss_y, + int border, + vpx_codec_frame_buffer_t *fb, + vpx_get_frame_buffer_cb_fn_t cb, + void *cb_priv); +int vp9_free_frame_buffer(YV12_BUFFER_CONFIG *ybf); #ifdef __cplusplus }