OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. | 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 1228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1239 if(cpi->sf.use_fastquant_for_pick) | 1239 if(cpi->sf.use_fastquant_for_pick) |
1240 { | 1240 { |
1241 x->quantize_b = vp8_fast_quantize_b; | 1241 x->quantize_b = vp8_fast_quantize_b; |
1242 x->quantize_b_pair = vp8_fast_quantize_b_pair; | 1242 x->quantize_b_pair = vp8_fast_quantize_b_pair; |
1243 | 1243 |
1244 /* the fast quantizer does not use zbin_extra, so | 1244 /* the fast quantizer does not use zbin_extra, so |
1245 * do not recalculate */ | 1245 * do not recalculate */ |
1246 x->zbin_mode_boost_enabled = 0; | 1246 x->zbin_mode_boost_enabled = 0; |
1247 } | 1247 } |
1248 vp8_rd_pick_inter_mode(cpi, x, recon_yoffset, recon_uvoffset, &rate, | 1248 vp8_rd_pick_inter_mode(cpi, x, recon_yoffset, recon_uvoffset, &rate, |
1249 &distortion, &intra_error); | 1249 &distortion, &intra_error, mb_row, mb_col); |
1250 | 1250 |
1251 /* switch back to the regular quantizer for the encode */ | 1251 /* switch back to the regular quantizer for the encode */ |
1252 if (cpi->sf.improved_quant) | 1252 if (cpi->sf.improved_quant) |
1253 { | 1253 { |
1254 x->quantize_b = vp8_regular_quantize_b; | 1254 x->quantize_b = vp8_regular_quantize_b; |
1255 x->quantize_b_pair = vp8_regular_quantize_b_pair; | 1255 x->quantize_b_pair = vp8_regular_quantize_b_pair; |
1256 } | 1256 } |
1257 | 1257 |
1258 /* restore cpi->zbin_mode_boost_enabled */ | 1258 /* restore cpi->zbin_mode_boost_enabled */ |
1259 x->zbin_mode_boost_enabled = zbin_mode_boost_enabled; | 1259 x->zbin_mode_boost_enabled = zbin_mode_boost_enabled; |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1395 vp8_fix_contexts(xd); | 1395 vp8_fix_contexts(xd); |
1396 } | 1396 } |
1397 else | 1397 else |
1398 { | 1398 { |
1399 vp8_stuff_mb(cpi, x, t); | 1399 vp8_stuff_mb(cpi, x, t); |
1400 } | 1400 } |
1401 } | 1401 } |
1402 | 1402 |
1403 return rate; | 1403 return rate; |
1404 } | 1404 } |
OLD | NEW |