diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-05-11 00:05:07 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-05-11 00:05:07 -0400 |
| commit | 65b1648f35b3212bd8beb024d7c4095f138274d0 (patch) | |
| tree | 66650904b86c685d29ad8843276e9a95ca3b337a /vp8/encoder/onyx_if.c | |
| parent | 6edd07d6561522f81b2a09a2a160d74808b14363 (diff) | |
| parent | ba6f60dba70ad56fbfd1080bb4555f078bc774bf (diff) | |
| download | libvpx-65b1648f35b3212bd8beb024d7c4095f138274d0.tar libvpx-65b1648f35b3212bd8beb024d7c4095f138274d0.tar.gz libvpx-65b1648f35b3212bd8beb024d7c4095f138274d0.tar.bz2 libvpx-65b1648f35b3212bd8beb024d7c4095f138274d0.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/encoder/onyx_if.c')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index b1e9e25a6..7701d4c16 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -636,9 +636,6 @@ void vp8_set_speed_features(VP8_COMP *cpi) sf->max_step_search_steps = MAX_MVSEARCH_STEPS; sf->improved_mv_pred = 1; - cpi->do_full[0] = 0; - cpi->do_full[1] = 0; - // default thresholds to 0 for (i = 0; i < MAX_MODES; i++) sf->thresh_mult[i] = 0; @@ -1298,7 +1295,7 @@ void vp8_set_speed_features(VP8_COMP *cpi) } if (cpi->sf.optimize_coefficients == 1) - cpi->mb.optimize = 1 + cpi->is_next_src_alt_ref; + cpi->mb.optimize = 1; else cpi->mb.optimize = 0; @@ -1809,7 +1806,7 @@ void vp8_change_config(VP8_PTR ptr, VP8_CONFIG *oxcf) // YX Temp cpi->alt_ref_source = NULL; cpi->is_src_frame_alt_ref = 0; - cpi->is_next_src_alt_ref = 0; + #if 0 // Experimental RD Code @@ -2041,9 +2038,6 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf) cpi->prior_key_frame_distance[i] = (int)cpi->output_frame_rate; } - cpi->check_freq[0] = 15; - cpi->check_freq[1] = 15; - #ifdef OUTPUT_YUV_SRC yuv_file = fopen("bd.yuv", "ab"); #endif @@ -2149,6 +2143,7 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf) cpi->full_search_sad = SEARCH_INVOKE(&cpi->rtcd.search, full_search); cpi->diamond_search_sad = SEARCH_INVOKE(&cpi->rtcd.search, diamond_search); + cpi->refining_search_sad = SEARCH_INVOKE(&cpi->rtcd.search, refining_search); cpi->ready_for_new_frame = 1; @@ -4738,7 +4733,6 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon cm->show_frame = 0; cpi->source_alt_ref_pending = FALSE; // Clear Pending altf Ref flag. cpi->is_src_frame_alt_ref = 0; - cpi->is_next_src_alt_ref = 0; } } #endif @@ -4752,9 +4746,6 @@ int vp8_get_compressed_data(VP8_PTR ptr, unsigned int *frame_flags, unsigned lon cpi->is_src_frame_alt_ref = cpi->alt_ref_source && (cpi->source == cpi->alt_ref_source); - cpi->is_next_src_alt_ref = cpi->alt_ref_source - && (vp8_lookahead_peek(cpi->lookahead, 0) - == cpi->alt_ref_source); if(cpi->is_src_frame_alt_ref) cpi->alt_ref_source = NULL; } |