diff options
Diffstat (limited to 'vp8/encoder')
| -rw-r--r-- | vp8/encoder/bitstream.c | 2 | ||||
| -rw-r--r-- | vp8/encoder/lookahead.c | 6 | ||||
| -rw-r--r-- | vp8/encoder/lookahead.h | 2 | ||||
| -rw-r--r-- | vp8/encoder/mcomp.c | 6 | ||||
| -rw-r--r-- | vp8/encoder/onyx_if.c | 136 | ||||
| -rw-r--r-- | vp8/encoder/temporal_filter.c | 2 | ||||
| -rw-r--r-- | vp8/encoder/tokenize.c | 20 |
7 files changed, 72 insertions, 102 deletions
diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c index 2a5502f88..404bd8ddf 100644 --- a/vp8/encoder/bitstream.c +++ b/vp8/encoder/bitstream.c @@ -1206,7 +1206,7 @@ static void sum_probs_over_prev_coef_context( { for (j=0; j < PREV_COEF_CONTEXTS; ++j) { - const int tmp = out[i]; + const unsigned int tmp = out[i]; out[i] += probs[j][i]; /* check for wrap */ if (out[i] < tmp) diff --git a/vp8/encoder/lookahead.c b/vp8/encoder/lookahead.c index b92e82bdf..3e582e369 100644 --- a/vp8/encoder/lookahead.c +++ b/vp8/encoder/lookahead.c @@ -48,7 +48,7 @@ vp8_lookahead_destroy(struct lookahead_ctx *ctx) { if(ctx->buf) { - int i; + unsigned int i; for(i = 0; i < ctx->max_sz; i++) vp8_yv12_de_alloc_frame_buffer(&ctx->buf[i].img); @@ -65,7 +65,7 @@ vp8_lookahead_init(unsigned int width, unsigned int depth) { struct lookahead_ctx *ctx = NULL; - int i; + unsigned int i; /* Clamp the lookahead queue depth */ if(depth < 1) @@ -188,7 +188,7 @@ vp8_lookahead_pop(struct lookahead_ctx *ctx, struct lookahead_entry* vp8_lookahead_peek(struct lookahead_ctx *ctx, - int index) + unsigned int index) { struct lookahead_entry* buf = NULL; diff --git a/vp8/encoder/lookahead.h b/vp8/encoder/lookahead.h index afb3fd4a9..32bafcd63 100644 --- a/vp8/encoder/lookahead.h +++ b/vp8/encoder/lookahead.h @@ -92,7 +92,7 @@ vp8_lookahead_pop(struct lookahead_ctx *ctx, */ struct lookahead_entry* vp8_lookahead_peek(struct lookahead_ctx *ctx, - int index); + unsigned int index); /**\brief Get the number of frames currently in the lookahead queue diff --git a/vp8/encoder/mcomp.c b/vp8/encoder/mcomp.c index 9d963832a..735af95ca 100644 --- a/vp8/encoder/mcomp.c +++ b/vp8/encoder/mcomp.c @@ -1156,7 +1156,7 @@ int vp8_diamond_search_sadx4 int tot_steps; int_mv this_mv; - int bestsad = INT_MAX; + unsigned int bestsad = UINT_MAX; int best_site = 0; int last_site = 0; @@ -1397,7 +1397,7 @@ int vp8_full_search_sadx3(MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *ref_mv, unsigned char *bestaddress; int_mv *best_mv = &d->bmi.mv; int_mv this_mv; - int bestsad = INT_MAX; + unsigned int bestsad = UINT_MAX; int r, c; unsigned char *check_here; @@ -1527,7 +1527,7 @@ int vp8_full_search_sadx8(MACROBLOCK *x, BLOCK *b, BLOCKD *d, int_mv *ref_mv, unsigned char *bestaddress; int_mv *best_mv = &d->bmi.mv; int_mv this_mv; - int bestsad = INT_MAX; + unsigned int bestsad = UINT_MAX; int r, c; unsigned char *check_here; diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 254c88a1c..860012c11 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -383,29 +383,23 @@ static void dealloc_compressor_data(VP8_COMP *cpi) cpi->mb.pip = 0; } -static void enable_segmentation(VP8_PTR ptr) +static void enable_segmentation(VP8_COMP *cpi) { - VP8_COMP *cpi = (VP8_COMP *)(ptr); - // Set the appropriate feature bit cpi->mb.e_mbd.segmentation_enabled = 1; cpi->mb.e_mbd.update_mb_segmentation_map = 1; cpi->mb.e_mbd.update_mb_segmentation_data = 1; } -static void disable_segmentation(VP8_PTR ptr) +static void disable_segmentation(VP8_COMP *cpi) { - VP8_COMP *cpi = (VP8_COMP *)(ptr); - // Clear the appropriate feature bit cpi->mb.e_mbd.segmentation_enabled = 0; } // Valid values for a segment are 0 to 3 // Segmentation map is arrange as [Rows][Columns] -static void set_segmentation_map(VP8_PTR ptr, unsigned char *segmentation_map) +static void set_segmentation_map(VP8_COMP *cpi, unsigned char *segmentation_map) { - VP8_COMP *cpi = (VP8_COMP *)(ptr); - // Copy in the new segmentation map vpx_memcpy(cpi->segmentation_map, segmentation_map, (cpi->common.mb_rows * cpi->common.mb_cols)); @@ -422,19 +416,15 @@ static void set_segmentation_map(VP8_PTR ptr, unsigned char *segmentation_map) // abs_delta = SEGMENT_DELTADATA (deltas) abs_delta = SEGMENT_ABSDATA (use the absolute values given). // // -static void set_segment_data(VP8_PTR ptr, signed char *feature_data, unsigned char abs_delta) +static void set_segment_data(VP8_COMP *cpi, signed char *feature_data, unsigned char abs_delta) { - VP8_COMP *cpi = (VP8_COMP *)(ptr); - cpi->mb.e_mbd.mb_segement_abs_delta = abs_delta; vpx_memcpy(cpi->segment_feature_data, feature_data, sizeof(cpi->segment_feature_data)); } -static void segmentation_test_function(VP8_PTR ptr) +static void segmentation_test_function(VP8_COMP *cpi) { - VP8_COMP *cpi = (VP8_COMP *)(ptr); - unsigned char *seg_map; signed char feature_data[MB_LVL_MAX][MAX_MB_SEGMENTS]; @@ -462,10 +452,10 @@ static void segmentation_test_function(VP8_PTR ptr) }*/ // Set the segmentation Map - set_segmentation_map(ptr, seg_map); + set_segmentation_map(cpi, seg_map); // Activate segmentation. - enable_segmentation(ptr); + enable_segmentation(cpi); // Set up the quant segment data feature_data[MB_LVL_ALT_Q][0] = 0; @@ -480,7 +470,7 @@ static void segmentation_test_function(VP8_PTR ptr) // Initialise the feature data structure // SEGMENT_DELTADATA 0, SEGMENT_ABSDATA 1 - set_segment_data(ptr, &feature_data[0][0], SEGMENT_DELTADATA); + set_segment_data(cpi, &feature_data[0][0], SEGMENT_DELTADATA); // Delete sementation map vpx_free(seg_map); @@ -554,10 +544,10 @@ static void cyclic_background_refresh(VP8_COMP *cpi, int Q, int lf_adjustment) } // Set the segmentation Map - set_segmentation_map((VP8_PTR)cpi, seg_map); + set_segmentation_map(cpi, seg_map); // Activate segmentation. - enable_segmentation((VP8_PTR)cpi); + enable_segmentation(cpi); // Set up the quant segment data feature_data[MB_LVL_ALT_Q][0] = 0; @@ -573,7 +563,7 @@ static void cyclic_background_refresh(VP8_COMP *cpi, int Q, int lf_adjustment) // Initialise the feature data structure // SEGMENT_DELTADATA 0, SEGMENT_ABSDATA 1 - set_segment_data((VP8_PTR)cpi, &feature_data[0][0], SEGMENT_DELTADATA); + set_segment_data(cpi, &feature_data[0][0], SEGMENT_DELTADATA); // Delete sementation map vpx_free(seg_map); @@ -913,10 +903,10 @@ void vp8_set_speed_features(VP8_COMP *cpi) if (Speed > 6) { - unsigned int i, sum = 0; + unsigned int sum = 0; unsigned int total_mbs = cm->MBs; - int thresh; - int total_skip; + int i, thresh; + unsigned int total_skip; int min = 2000; @@ -1296,9 +1286,8 @@ rescale(int val, int num, int denom) } -static void init_config(VP8_PTR ptr, VP8_CONFIG *oxcf) +static void init_config(VP8_COMP *cpi, VP8_CONFIG *oxcf) { - VP8_COMP *cpi = (VP8_COMP *)(ptr); VP8_COMMON *cm = &cpi->common; cpi->oxcf = *oxcf; @@ -1323,7 +1312,7 @@ static void init_config(VP8_PTR ptr, VP8_CONFIG *oxcf) cpi->frame_rate = 30; // change includes all joint functionality - vp8_change_config(ptr, oxcf); + vp8_change_config(cpi, oxcf); // Initialize active best and worst q and average q values. cpi->active_worst_quality = cpi->oxcf.worst_allowed_q; @@ -1345,8 +1334,8 @@ static void init_config(VP8_PTR ptr, VP8_CONFIG *oxcf) // Temporal scalabilty if (cpi->oxcf.number_of_layers > 1) { - int i; - int prev_layer_frame_rate=0; + unsigned int i; + double prev_layer_frame_rate=0; for (i=0; i<cpi->oxcf.number_of_layers; i++) { @@ -1414,9 +1403,8 @@ static void init_config(VP8_PTR ptr, VP8_CONFIG *oxcf) } -void vp8_change_config(VP8_PTR ptr, VP8_CONFIG *oxcf) +void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf) { - VP8_COMP *cpi = (VP8_COMP *)(ptr); VP8_COMMON *cm = &cpi->common; if (!cpi) @@ -1707,19 +1695,14 @@ static void cal_mvsadcosts(int *mvsadcost[2]) while (++i <= mvfp_max); } -VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf) +struct VP8_COMP* vp8_create_compressor(VP8_CONFIG *oxcf) { int i; - volatile union - { - VP8_COMP *cpi; - VP8_PTR ptr; - } ctx; VP8_COMP *cpi; VP8_COMMON *cm; - cpi = ctx.cpi = vpx_memalign(32, sizeof(VP8_COMP)); + cpi = vpx_memalign(32, sizeof(VP8_COMP)); // Check that the CPI instance is valid if (!cpi) return 0; @@ -1730,10 +1713,8 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf) if (setjmp(cm->error.jmp)) { - VP8_PTR ptr = ctx.ptr; - - ctx.cpi->common.error.setjmp = 0; - vp8_remove_compressor(&ptr); + cpi->common.error.setjmp = 0; + vp8_remove_compressor(&cpi); return 0; } @@ -1744,7 +1725,7 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf) vp8_create_common(&cpi->common); vp8_cmachine_specific_config(cpi); - init_config((VP8_PTR)cpi, oxcf); + init_config(cpi, oxcf); memcpy(cpi->base_skip_false_prob, vp8cx_base_skip_false_prob, sizeof(vp8cx_base_skip_false_prob)); cpi->common.current_video_frame = 0; @@ -1823,7 +1804,7 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf) cpi->cyclic_refresh_map = (signed char *) NULL; // Test function for segmentation - //segmentation_test_function((VP8_PTR) cpi); + //segmentation_test_function( cpi); #ifdef ENTROPY_STATS init_context_counters(); @@ -2043,14 +2024,14 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf) vp8_cal_low_res_mb_cols(cpi); #endif - return (VP8_PTR) cpi; + return cpi; } -void vp8_remove_compressor(VP8_PTR *ptr) +void vp8_remove_compressor(VP8_COMP **ptr) { - VP8_COMP *cpi = (VP8_COMP *)(*ptr); + VP8_COMP *cpi = *ptr; if (!cpi) return; @@ -2461,20 +2442,16 @@ static void generate_psnr_packet(VP8_COMP *cpi) } -int vp8_use_as_reference(VP8_PTR ptr, int ref_frame_flags) +int vp8_use_as_reference(VP8_COMP *cpi, int ref_frame_flags) { - VP8_COMP *cpi = (VP8_COMP *)(ptr); - if (ref_frame_flags > 7) return -1 ; cpi->ref_frame_flags = ref_frame_flags; return 0; } -int vp8_update_reference(VP8_PTR ptr, int ref_frame_flags) +int vp8_update_reference(VP8_COMP *cpi, int ref_frame_flags) { - VP8_COMP *cpi = (VP8_COMP *)(ptr); - if (ref_frame_flags > 7) return -1 ; @@ -2494,9 +2471,8 @@ int vp8_update_reference(VP8_PTR ptr, int ref_frame_flags) return 0; } -int vp8_get_reference(VP8_PTR ptr, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd) +int vp8_get_reference(VP8_COMP *cpi, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd) { - VP8_COMP *cpi = (VP8_COMP *)(ptr); VP8_COMMON *cm = &cpi->common; int ref_fb_idx; @@ -2513,9 +2489,8 @@ int vp8_get_reference(VP8_PTR ptr, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONF return 0; } -int vp8_set_reference(VP8_PTR ptr, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd) +int vp8_set_reference(VP8_COMP *cpi, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONFIG *sd) { - VP8_COMP *cpi = (VP8_COMP *)(ptr); VP8_COMMON *cm = &cpi->common; int ref_fb_idx; @@ -2533,9 +2508,8 @@ int vp8_set_reference(VP8_PTR ptr, VP8_REFFRAME ref_frame_flag, YV12_BUFFER_CONF return 0; } -int vp8_update_entropy(VP8_PTR comp, int update) +int vp8_update_entropy(VP8_COMP *cpi, int update) { - VP8_COMP *cpi = (VP8_COMP *) comp; VP8_COMMON *cm = &cpi->common; cm->refresh_entropy_probs = update; @@ -3192,7 +3166,7 @@ static void encode_frame_to_data_rate vp8_clear_system_state(); // Test code for segmentation of gf/arf (0,0) - //segmentation_test_function((VP8_PTR) cpi); + //segmentation_test_function( cpi); if (cpi->compressor_speed == 2) { @@ -3290,9 +3264,9 @@ static void encode_frame_to_data_rate // Test code for segmentation //if ( (cm->frame_type == KEY_FRAME) || ((cm->current_video_frame % 2) == 0)) //if ( (cm->current_video_frame % 2) == 0 ) - // enable_segmentation((VP8_PTR)cpi); + // enable_segmentation(cpi); //else - // disable_segmentation((VP8_PTR)cpi); + // disable_segmentation(cpi); #if 0 // Experimental code for lagged compress and one pass @@ -3386,7 +3360,7 @@ static void encode_frame_to_data_rate if (cpi->oxcf.number_of_layers > 1) { - int i; + unsigned int i; // Propagate bits saved by dropping the frame to higher layers for (i=cpi->current_layer+1; i<cpi->oxcf.number_of_layers; i++) @@ -4163,7 +4137,7 @@ static void encode_frame_to_data_rate if (cpi->oxcf.number_of_layers > 1) { - int i; + unsigned int i; for (i=cpi->current_layer+1; i<cpi->oxcf.number_of_layers; i++) cpi->layer_context[i].total_byte_count += (*size); } @@ -4274,7 +4248,7 @@ static void encode_frame_to_data_rate // Propagate values to higher temporal layers if (cpi->oxcf.number_of_layers > 1) { - int i; + unsigned int i; for (i=cpi->current_layer+1; i<cpi->oxcf.number_of_layers; i++) { @@ -4589,12 +4563,11 @@ extern void vp8_pop_neon(int64_t *store); #endif -int vp8_receive_raw_frame(VP8_PTR ptr, unsigned int frame_flags, YV12_BUFFER_CONFIG *sd, int64_t time_stamp, int64_t end_time) +int vp8_receive_raw_frame(VP8_COMP *cpi, unsigned int frame_flags, YV12_BUFFER_CONFIG *sd, int64_t time_stamp, int64_t end_time) { #if HAVE_ARMV7 int64_t store_reg[8]; #endif - VP8_COMP *cpi = (VP8_COMP *) ptr; VP8_COMMON *cm = &cpi->common; struct vpx_usec_timer timer; int res = 0; @@ -4643,12 +4616,11 @@ static int frame_is_reference(const VP8_COMP *cpi) } -int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned long *size, unsigned char *dest, unsigned char *dest_end, int64_t *time_stamp, int64_t *time_end, int flush) +int vp8_get_compressed_data(VP8_COMP *cpi, unsigned int *frame_flags, unsigned long *size, unsigned char *dest, unsigned char *dest_end, int64_t *time_stamp, int64_t *time_end, int flush) { #if HAVE_ARMV7 int64_t store_reg[8]; #endif - VP8_COMP *cpi = (VP8_COMP *) ptr; VP8_COMMON *cm; struct vpx_usec_timer tsctimer; struct vpx_usec_timer ticktimer; @@ -5134,10 +5106,8 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon return 0; } -int vp8_get_preview_raw_frame(VP8_PTR comp, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t *flags) +int vp8_get_preview_raw_frame(VP8_COMP *cpi, YV12_BUFFER_CONFIG *dest, vp8_ppflags_t *flags) { - VP8_COMP *cpi = (VP8_COMP *) comp; - if (cpi->common.refresh_alt_ref_frame) return -1; else @@ -5166,9 +5136,8 @@ int vp8_get_preview_raw_frame(VP8_PTR comp, YV12_BUFFER_CONFIG *dest, vp8_ppflag } } -int vp8_set_roimap(VP8_PTR comp, unsigned char *map, unsigned int rows, unsigned int cols, int delta_q[4], int delta_lf[4], unsigned int threshold[4]) +int vp8_set_roimap(VP8_COMP *cpi, unsigned char *map, unsigned int rows, unsigned int cols, int delta_q[4], int delta_lf[4], unsigned int threshold[4]) { - VP8_COMP *cpi = (VP8_COMP *) comp; signed char feature_data[MB_LVL_MAX][MAX_MB_SEGMENTS]; if (cpi->common.mb_rows != rows || cpi->common.mb_cols != cols) @@ -5176,15 +5145,15 @@ int vp8_set_roimap(VP8_PTR comp, unsigned char *map, unsigned int rows, unsigned if (!map) { - disable_segmentation((VP8_PTR)cpi); + disable_segmentation(cpi); return 0; } // Set the segmentation Map - set_segmentation_map((VP8_PTR)cpi, map); + set_segmentation_map(cpi, map); // Activate segmentation. - enable_segmentation((VP8_PTR)cpi); + enable_segmentation(cpi); // Set up the quant segment data feature_data[MB_LVL_ALT_Q][0] = delta_q[0]; @@ -5205,15 +5174,13 @@ int vp8_set_roimap(VP8_PTR comp, unsigned char *map, unsigned int rows, unsigned // Initialise the feature data structure // SEGMENT_DELTADATA 0, SEGMENT_ABSDATA 1 - set_segment_data((VP8_PTR)cpi, &feature_data[0][0], SEGMENT_DELTADATA); + set_segment_data(cpi, &feature_data[0][0], SEGMENT_DELTADATA); return 0; } -int vp8_set_active_map(VP8_PTR comp, unsigned char *map, unsigned int rows, unsigned int cols) +int vp8_set_active_map(VP8_COMP *cpi, unsigned char *map, unsigned int rows, unsigned int cols) { - VP8_COMP *cpi = (VP8_COMP *) comp; - if (rows == cpi->common.mb_rows && cols == cpi->common.mb_cols) { if (map) @@ -5233,10 +5200,8 @@ int vp8_set_active_map(VP8_PTR comp, unsigned char *map, unsigned int rows, unsi } } -int vp8_set_internal_size(VP8_PTR comp, VPX_SCALING horiz_mode, VPX_SCALING vert_mode) +int vp8_set_internal_size(VP8_COMP *cpi, VPX_SCALING horiz_mode, VPX_SCALING vert_mode) { - VP8_COMP *cpi = (VP8_COMP *) comp; - if (horiz_mode <= ONETWO) cpi->common.horiz_scale = horiz_mode; else @@ -5278,8 +5243,7 @@ int vp8_calc_ss_err(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *dest, const } -int vp8_get_quantizer(VP8_PTR c) +int vp8_get_quantizer(VP8_COMP *cpi) { - VP8_COMP *cpi = (VP8_COMP *) c; return cpi->common.base_qindex; } diff --git a/vp8/encoder/temporal_filter.c b/vp8/encoder/temporal_filter.c index b9ade1c6c..0e82507af 100644 --- a/vp8/encoder/temporal_filter.c +++ b/vp8/encoder/temporal_filter.c @@ -98,7 +98,7 @@ void vp8_temporal_filter_apply_c unsigned short *count ) { - int i, j, k; + unsigned int i, j, k; int modifier; int byte = 0; diff --git a/vp8/encoder/tokenize.c b/vp8/encoder/tokenize.c index e81948567..8bfc47f8f 100644 --- a/vp8/encoder/tokenize.c +++ b/vp8/encoder/tokenize.c @@ -514,17 +514,19 @@ static __inline void stuff1st_order_b TOKENEXTRA **tp, ENTROPY_CONTEXT *a, ENTROPY_CONTEXT *l, + int type, VP8_COMP *cpi ) { int pt; /* near block/prev token context index */ + int band; TOKENEXTRA *t = *tp; /* store tokens starting here */ VP8_COMBINEENTROPYCONTEXTS(pt, *a, *l); - + band = type ? 0 : 1; t->Token = DCT_EOB_TOKEN; - t->context_tree = cpi->common.fc.coef_probs [0] [1] [pt]; + t->context_tree = cpi->common.fc.coef_probs [type] [band] [pt]; t->skip_eob_node = 0; - ++cpi->coef_counts [0] [1] [pt] [DCT_EOB_TOKEN]; + ++cpi->coef_counts [type] [band] [pt] [DCT_EOB_TOKEN]; ++t; *tp = t; pt = 0; /* 0 <-> all coeff data is zero */ @@ -561,15 +563,19 @@ void vp8_stuff_mb(VP8_COMP *cpi, MACROBLOCKD *x, TOKENEXTRA **t) ENTROPY_CONTEXT * L = (ENTROPY_CONTEXT *)x->left_context; int plane_type; int b; - - stuff2nd_order_b(t, + plane_type = 3; + if((x->mode_info_context->mbmi.mode != B_PRED + && x->mode_info_context->mbmi.mode != SPLITMV)) + { + stuff2nd_order_b(t, A + vp8_block2above[24], L + vp8_block2left[24], cpi); - plane_type = 0; + plane_type = 0; + } for (b = 0; b < 16; b++) stuff1st_order_b(t, A + vp8_block2above[b], - L + vp8_block2left[b], cpi); + L + vp8_block2left[b], plane_type, cpi); for (b = 16; b < 24; b++) stuff1st_order_buv(t, |