diff options
Diffstat (limited to 'vp8/decoder')
-rw-r--r-- | vp8/decoder/decodemv.c | 27 | ||||
-rw-r--r-- | vp8/decoder/decodframe.c | 12 | ||||
-rw-r--r-- | vp8/decoder/detokenize.c | 12 | ||||
-rw-r--r-- | vp8/decoder/onyxd_if.c | 74 | ||||
-rw-r--r-- | vp8/decoder/threading.c | 18 | ||||
-rw-r--r-- | vp8/decoder/x86/x86_dsystemdependent.c | 4 |
6 files changed, 37 insertions, 110 deletions
diff --git a/vp8/decoder/decodemv.c b/vp8/decoder/decodemv.c index ded5fa4eb..e5830e88b 100644 --- a/vp8/decoder/decodemv.c +++ b/vp8/decoder/decodemv.c @@ -228,15 +228,8 @@ unsigned int vp8_mv_cont_count[5][4] = }; #endif -unsigned char vp8_mbsplit_offset[4][16] = { - { 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - { 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - { 0, 2, 8, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15} -}; - -unsigned char vp8_mbsplit_fill_count[4] = {8, 8, 4, 1}; -unsigned char vp8_mbsplit_fill_offset[4][16] = { +static const unsigned char mbsplit_fill_count[4] = {8, 8, 4, 1}; +static const unsigned char mbsplit_fill_offset[4][16] = { { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, { 0, 1, 4, 5, 8, 9, 12, 13, 2, 3, 6, 7, 10, 11, 14, 15}, { 0, 1, 4, 5, 2, 3, 6, 7, 8, 9, 12, 13, 10, 11, 14, 15}, @@ -246,7 +239,7 @@ unsigned char vp8_mbsplit_fill_offset[4][16] = { -void vp8_mb_mode_mv_init(VP8D_COMP *pbi) +static void mb_mode_mv_init(VP8D_COMP *pbi) { vp8_reader *const bc = & pbi->bc; MV_CONTEXT *const mvc = pbi->common.fc.mvc; @@ -287,7 +280,7 @@ void vp8_mb_mode_mv_init(VP8D_COMP *pbi) } } -void vp8_read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, +static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, int mb_row, int mb_col) { const MV Zero = { 0, 0}; @@ -405,10 +398,10 @@ void vp8_read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, /* Fill (uniform) modes, mvs of jth subset. Must do it here because ensuing subsets can refer back to us via "left" or "above". */ - unsigned char *fill_offset; - unsigned int fill_count = vp8_mbsplit_fill_count[s]; + const unsigned char *fill_offset; + unsigned int fill_count = mbsplit_fill_count[s]; - fill_offset = &vp8_mbsplit_fill_offset[s][(unsigned char)j * vp8_mbsplit_fill_count[s]]; + fill_offset = &mbsplit_fill_offset[s][(unsigned char)j * mbsplit_fill_count[s]]; do { mi->bmi[ *fill_offset] = bmi; @@ -525,7 +518,7 @@ void vp8_decode_mode_mvs(VP8D_COMP *pbi) MODE_INFO *mi = pbi->common.mi; int mb_row = -1; - vp8_mb_mode_mv_init(pbi); + mb_mode_mv_init(pbi); while (++mb_row < pbi->common.mb_rows) { @@ -543,11 +536,11 @@ void vp8_decode_mode_mvs(VP8D_COMP *pbi) while (++mb_col < pbi->common.mb_cols) { - /*vp8_read_mb_modes_mv(pbi, xd->mode_info_context, &xd->mode_info_context->mbmi, mb_row, mb_col);*/ + /*read_mb_modes_mv(pbi, xd->mode_info_context, &xd->mode_info_context->mbmi, mb_row, mb_col);*/ if(pbi->common.frame_type == KEY_FRAME) vp8_kfread_modes(pbi, mi, mb_row, mb_col); else - vp8_read_mb_modes_mv(pbi, mi, &mi->mbmi, mb_row, mb_col); + read_mb_modes_mv(pbi, mi, &mi->mbmi, mb_row, mb_col); mi++; /* next macroblock */ } diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index 3d4d9b961..82841e8b8 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -175,7 +175,7 @@ void clamp_mvs(MACROBLOCKD *xd) } -void vp8_decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd) +static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd) { int eobtotal = 0; int i, do_clamp = xd->mode_info_context->mbmi.need_to_clamp_mvs; @@ -320,10 +320,8 @@ FILE *vpxlog = 0; -void vp8_decode_mb_row(VP8D_COMP *pbi, - VP8_COMMON *pc, - int mb_row, - MACROBLOCKD *xd) +static void +decode_mb_row(VP8D_COMP *pbi, VP8_COMMON *pc, int mb_row, MACROBLOCKD *xd) { int i; @@ -395,7 +393,7 @@ void vp8_decode_mb_row(VP8D_COMP *pbi, else pbi->debugoutput =0; */ - vp8_decode_macroblock(pbi, xd); + decode_macroblock(pbi, xd); /* check if the boolean decoder has suffered an error */ xd->corrupted |= vp8dx_bool_error(xd->current_bc); @@ -901,7 +899,7 @@ int vp8_decode_frame(VP8D_COMP *pbi) ibc = 0; } - vp8_decode_mb_row(pbi, pc, mb_row, xd); + decode_mb_row(pbi, pc, mb_row, xd); } } diff --git a/vp8/decoder/detokenize.c b/vp8/decoder/detokenize.c index 83fa14d67..b2e0819b7 100644 --- a/vp8/decoder/detokenize.c +++ b/vp8/decoder/detokenize.c @@ -19,7 +19,13 @@ #define BOOL_DATA UINT8 #define OCB_X PREV_COEF_CONTEXTS * ENTROPY_NODES -DECLARE_ALIGNED(16, UINT8, vp8_coef_bands_x[16]) = { 0, 1 * OCB_X, 2 * OCB_X, 3 * OCB_X, 6 * OCB_X, 4 * OCB_X, 5 * OCB_X, 6 * OCB_X, 6 * OCB_X, 6 * OCB_X, 6 * OCB_X, 6 * OCB_X, 6 * OCB_X, 6 * OCB_X, 6 * OCB_X, 7 * OCB_X}; +DECLARE_ALIGNED(16, static const unsigned char, coef_bands_x[16]) = +{ + 0 * OCB_X, 1 * OCB_X, 2 * OCB_X, 3 * OCB_X, + 6 * OCB_X, 4 * OCB_X, 5 * OCB_X, 6 * OCB_X, + 6 * OCB_X, 6 * OCB_X, 6 * OCB_X, 6 * OCB_X, + 6 * OCB_X, 6 * OCB_X, 6 * OCB_X, 7 * OCB_X +}; #define EOB_CONTEXT_NODE 0 #define ZERO_CONTEXT_NODE 1 #define ONE_CONTEXT_NODE 2 @@ -135,7 +141,7 @@ DECLARE_ALIGNED(16, extern const unsigned char, vp8dx_bitreader_norm[256]); Prob = coef_probs; \ if(c<15) {\ ++c; \ - Prob += vp8_coef_bands_x[c]; \ + Prob += coef_bands_x[c]; \ goto branch; \ } goto BLOCK_FINISHED; /*for malformed input */\ } \ @@ -244,7 +250,7 @@ BLOCK_LOOP: Prob += v * ENTROPY_NODES; DO_WHILE: - Prob += vp8_coef_bands_x[c]; + Prob += coef_bands_x[c]; DECODE_AND_BRANCH_IF_ZERO(Prob[EOB_CONTEXT_NODE], BLOCK_FINISHED); CHECK_0_: diff --git a/vp8/decoder/onyxd_if.c b/vp8/decoder/onyxd_if.c index bfb00a531..ef2e00d61 100644 --- a/vp8/decoder/onyxd_if.c +++ b/vp8/decoder/onyxd_if.c @@ -37,43 +37,6 @@ extern void vp8_init_loop_filter(VP8_COMMON *cm); extern void vp8cx_init_de_quantizer(VP8D_COMP *pbi); -#if CONFIG_DEBUG -void vp8_recon_write_yuv_frame(unsigned char *name, YV12_BUFFER_CONFIG *s) -{ - FILE *yuv_file = fopen((char *)name, "ab"); - unsigned char *src = s->y_buffer; - int h = s->y_height; - - do - { - fwrite(src, s->y_width, 1, yuv_file); - src += s->y_stride; - } - while (--h); - - src = s->u_buffer; - h = s->uv_height; - - do - { - fwrite(src, s->uv_width, 1, yuv_file); - src += s->uv_stride; - } - while (--h); - - src = s->v_buffer; - h = s->uv_height; - - do - { - fwrite(src, s->uv_width, 1, yuv_file); - src += s->uv_stride; - } - while (--h); - - fclose(yuv_file); -} -#endif void vp8dx_initialize() { @@ -155,35 +118,6 @@ void vp8dx_remove_decompressor(VP8D_PTR ptr) } -void vp8dx_set_setting(VP8D_PTR comp, VP8D_SETTING oxst, int x) -{ - VP8D_COMP *pbi = (VP8D_COMP *) comp; - - (void) pbi; - (void) x; - - switch (oxst) - { - case VP8D_OK: - break; - } -} - -int vp8dx_get_setting(VP8D_PTR comp, VP8D_SETTING oxst) -{ - VP8D_COMP *pbi = (VP8D_COMP *) comp; - - (void) pbi; - - switch (oxst) - { - case VP8D_OK: - break; - } - - return -1; -} - int vp8dx_get_reference(VP8D_PTR ptr, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd) { VP8D_COMP *pbi = (VP8D_COMP *) ptr; @@ -203,6 +137,8 @@ int vp8dx_get_reference(VP8D_PTR ptr, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_C return 0; } + + int vp8dx_set_reference(VP8D_PTR ptr, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd) { VP8D_COMP *pbi = (VP8D_COMP *) ptr; @@ -459,12 +395,6 @@ int vp8dx_receive_compressed_data(VP8D_PTR ptr, unsigned long size, const unsign vp8_yv12_extend_frame_borders_ptr(cm->frame_to_show); } -#if 0 - /* DEBUG code */ - /*vp8_recon_write_yuv_frame("recon.yuv", cm->frame_to_show);*/ - if (cm->current_video_frame <= 5) - write_dx_frame_to_file(cm->frame_to_show, cm->current_video_frame); -#endif vp8_clear_system_state(); diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c index 67e578c62..3d9d428ef 100644 --- a/vp8/decoder/threading.c +++ b/vp8/decoder/threading.c @@ -33,7 +33,7 @@ extern void vp8_build_uvmvs(MACROBLOCKD *x, int fullpixel); #define RTCD_VTABLE(x) NULL #endif -void vp8_setup_decoding_thread_data(VP8D_COMP *pbi, MACROBLOCKD *xd, MB_ROW_DEC *mbrd, int count) +static void setup_decoding_thread_data(VP8D_COMP *pbi, MACROBLOCKD *xd, MB_ROW_DEC *mbrd, int count) { VP8_COMMON *const pc = & pbi->common; int i, j; @@ -87,7 +87,7 @@ void vp8_setup_decoding_thread_data(VP8D_COMP *pbi, MACROBLOCKD *xd, MB_ROW_DEC } -void vp8mt_decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, int mb_row, int mb_col) +static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, int mb_row, int mb_col) { int eobtotal = 0; int i, do_clamp = xd->mode_info_context->mbmi.need_to_clamp_mvs; @@ -214,7 +214,7 @@ void vp8mt_decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, int mb_row, int mb } -THREAD_FUNCTION vp8_thread_decoding_proc(void *p_data) +static THREAD_FUNCTION thread_decoding_proc(void *p_data) { int ithread = ((DECODETHREAD_DATA *)p_data)->ithread; VP8D_COMP *pbi = (VP8D_COMP *)(((DECODETHREAD_DATA *)p_data)->ptr1); @@ -318,7 +318,7 @@ THREAD_FUNCTION vp8_thread_decoding_proc(void *p_data) xd->pre.v_buffer = pc->yv12_fb[ref_fb_idx].v_buffer + recon_uvoffset; vp8_build_uvmvs(xd, pc->full_pixel); - vp8mt_decode_macroblock(pbi, xd, mb_row, mb_col); + decode_macroblock(pbi, xd, mb_row, mb_col); if (pbi->common.filter_level) { @@ -450,7 +450,7 @@ void vp8_decoder_create_threads(VP8D_COMP *pbi) pbi->de_thread_data[ithread].ptr1 = (void *)pbi; pbi->de_thread_data[ithread].ptr2 = (void *) &pbi->mb_row_di[ithread]; - pthread_create(&pbi->h_decoding_thread[ithread], 0, vp8_thread_decoding_proc, (&pbi->de_thread_data[ithread])); + pthread_create(&pbi->h_decoding_thread[ithread], 0, thread_decoding_proc, (&pbi->de_thread_data[ithread])); } sem_init(&pbi->h_event_end_decoding, 0, 0); @@ -632,7 +632,7 @@ void vp8_decoder_remove_threads(VP8D_COMP *pbi) } -void vp8mt_lpf_init( VP8D_COMP *pbi, int default_filt_lvl) +static void lpf_init( VP8D_COMP *pbi, int default_filt_lvl) { VP8_COMMON *cm = &pbi->common; MACROBLOCKD *mbd = &pbi->mb; @@ -715,10 +715,10 @@ void vp8mt_decode_mb_rows( VP8D_COMP *pbi, MACROBLOCKD *xd) vpx_memset(pbi->mt_uleft_col[i], (unsigned char)129, 8); vpx_memset(pbi->mt_vleft_col[i], (unsigned char)129, 8); } - vp8mt_lpf_init(pbi, pc->filter_level); + lpf_init(pbi, pc->filter_level); } - vp8_setup_decoding_thread_data(pbi, xd, pbi->mb_row_di, pbi->decoding_thread_count); + setup_decoding_thread_data(pbi, xd, pbi->mb_row_di, pbi->decoding_thread_count); for (i = 0; i < pbi->decoding_thread_count; i++) sem_post(&pbi->h_event_start_decoding[i]); @@ -803,7 +803,7 @@ void vp8mt_decode_mb_rows( VP8D_COMP *pbi, MACROBLOCKD *xd) } vp8_build_uvmvs(xd, pc->full_pixel); - vp8mt_decode_macroblock(pbi, xd, mb_row, mb_col); + decode_macroblock(pbi, xd, mb_row, mb_col); /* check if the boolean decoder has suffered an error */ xd->corrupted |= vp8dx_bool_error(xd->current_bc); diff --git a/vp8/decoder/x86/x86_dsystemdependent.c b/vp8/decoder/x86/x86_dsystemdependent.c index 3f1b7d5ad..5c1684230 100644 --- a/vp8/decoder/x86/x86_dsystemdependent.c +++ b/vp8/decoder/x86/x86_dsystemdependent.c @@ -17,7 +17,7 @@ #if HAVE_MMX void vp8_dequantize_b_impl_mmx(short *sq, short *dq, short *q); -void vp8_dequantize_b_mmx(BLOCKD *d) +static void dequantize_b_mmx(BLOCKD *d) { short *sq = (short *) d->qcoeff; short *dq = (short *) d->dqcoeff; @@ -41,7 +41,7 @@ void vp8_arch_x86_decode_init(VP8D_COMP *pbi) #if HAVE_MMX if (flags & HAS_MMX) { - pbi->dequant.block = vp8_dequantize_b_mmx; + pbi->dequant.block = dequantize_b_mmx; pbi->dequant.idct_add = vp8_dequant_idct_add_mmx; pbi->dequant.dc_idct_add = vp8_dequant_dc_idct_add_mmx; pbi->dequant.dc_idct_add_y_block = vp8_dequant_dc_idct_add_y_block_mmx; |