generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "vp9_decodeframe.c: cleanup -wextra warnings"

Browse Source
This commit is contained in:
Yaowu Xu 2014-05-15 06:50:51 -07:00 committed by Gerrit Code Review
commit 71854f3a6e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vp9/common/vp9_common.h
View File

@ -45,7 +45,7 @@ extern "C" {
vpx_memcpy(dest, src, n * sizeof(*src)); \ vpx_memcpy(dest, src, n * sizeof(*src)); \
} }
#define vp9_zero(dest) vpx_memset(&dest, 0, sizeof(dest)) #define vp9_zero(dest) vpx_memset(&(dest), 0, sizeof(dest))
#define vp9_zero_array(dest, n) vpx_memset(dest, 0, n * sizeof(*dest)) #define vp9_zero_array(dest, n) vpx_memset(dest, 0, n * sizeof(*dest))
static INLINE uint8_t clip_pixel(int val) { static INLINE uint8_t clip_pixel(int val) {

3
vp9/decoder/vp9_decodeframe.c
View File

@ -1279,6 +1279,7 @@ static struct vp9_read_bit_buffer* init_read_bit_buffer(
const uint8_t *data, const uint8_t *data,
const uint8_t *data_end, const uint8_t *data_end,
uint8_t *clear_data /* buffer size MAX_VP9_HEADER_SIZE */) { uint8_t *clear_data /* buffer size MAX_VP9_HEADER_SIZE */) {
vp9_zero(*rb);
rb->bit_offset = 0; rb->bit_offset = 0;
rb->error_handler = error_handler; rb->error_handler = error_handler;
rb->error_handler_data = &pbi->common; rb->error_handler_data = &pbi->common;
@ -1299,7 +1300,7 @@ int vp9_decode_frame(VP9Decoder *pbi,
const uint8_t **p_data_end) { const uint8_t **p_data_end) {
VP9_COMMON *const cm = &pbi->common; VP9_COMMON *const cm = &pbi->common;
MACROBLOCKD *const xd = &pbi->mb; MACROBLOCKD *const xd = &pbi->mb;
struct vp9_read_bit_buffer rb = { 0 }; struct vp9_read_bit_buffer rb;
uint8_t clear_data[MAX_VP9_HEADER_SIZE]; uint8_t clear_data[MAX_VP9_HEADER_SIZE];
const size_t first_partition_size = read_uncompressed_header(pbi, const size_t first_partition_size = read_uncompressed_header(pbi,
init_read_bit_buffer(pbi, &rb, data, data_end, clear_data)); init_read_bit_buffer(pbi, &rb, data, data_end, clear_data));