diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-07-22 00:05:06 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-07-22 00:05:06 -0400 |
| commit | 7d44c805cfc3aefb8b0850f2e3fca159439aea68 (patch) | |
| tree | e74f1b6fbeb61c2a754b3f2de1e83fa9aa45b7d1 /vp8/encoder/onyx_if.c | |
| parent | 06e9386422c1b64b3fc2973b7c0ffd6546285b80 (diff) | |
| parent | 52d13777daa3317d23733a03c3a6402ec3baf8d0 (diff) | |
| download | libvpx-7d44c805cfc3aefb8b0850f2e3fca159439aea68.tar libvpx-7d44c805cfc3aefb8b0850f2e3fca159439aea68.tar.gz libvpx-7d44c805cfc3aefb8b0850f2e3fca159439aea68.tar.bz2 libvpx-7d44c805cfc3aefb8b0850f2e3fca159439aea68.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/encoder/onyx_if.c')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 3adc13689..270833263 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -961,6 +961,10 @@ void vp8_set_speed_features(VP8_COMP *cpi) sf->improved_quant = 0; sf->improved_dct = 0; + + sf->use_fastquant_for_pick = 1; + sf->no_skip_block4x4_search = 0; + sf->first_step = 1; } if (Speed > 1) @@ -1336,7 +1340,7 @@ static void alloc_raw_frame_buffers(VP8_COMP *cpi) #if VP8_TEMPORAL_ALT_REF if (vp8_yv12_alloc_frame_buffer(&cpi->alt_ref_buffer, - width, height, 16)) + width, height, VP8BORDERINPIXELS)) vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR, "Failed to allocate altref buffer"); @@ -1386,7 +1390,8 @@ void vp8_alloc_compressor_data(VP8_COMP *cpi) vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR, "Failed to allocate last frame buffer"); - if (vp8_yv12_alloc_frame_buffer(&cpi->scaled_source, width, height, 16)) + if (vp8_yv12_alloc_frame_buffer(&cpi->scaled_source, + width, height, VP8BORDERINPIXELS)) vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR, "Failed to allocate scaled source buffer"); |