Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(236)

Side by Side Diff: source/libvpx/vp8/encoder/firstpass.c

Issue 3417017: Update libvpx sources to v0.9.2-35-ga8a38bc. ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2010 The VP8 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
11 11
12 #include "math.h" 12 #include "math.h"
(...skipping 1383 matching lines...) Expand 10 before | Expand all | Expand 10 after
1396 } 1396 }
1397 1397
1398 if (boost_score > max_boost) 1398 if (boost_score > max_boost)
1399 boost_score = max_boost; 1399 boost_score = max_boost;
1400 } 1400 }
1401 1401
1402 cpi->gfu_boost = (int)(boost_score * 100.0) >> 4; 1402 cpi->gfu_boost = (int)(boost_score * 100.0) >> 4;
1403 1403
1404 // Should we use the alternate refernce frame 1404 // Should we use the alternate refernce frame
1405 if (cpi->oxcf.play_alternate && 1405 if (cpi->oxcf.play_alternate &&
1406 cpi->oxcf.lag_in_frames &&
1406 (i >= MIN_GF_INTERVAL) && 1407 (i >= MIN_GF_INTERVAL) &&
1407 (i <= (cpi->frames_to_key - MIN_GF_INTERVAL)) && // dont use AR F very near next kf 1408 (i <= (cpi->frames_to_key - MIN_GF_INTERVAL)) && // dont use AR F very near next kf
1408 (((next_frame.pcnt_inter > 0.75) && 1409 (((next_frame.pcnt_inter > 0.75) &&
1409 ((mv_in_out_accumulator / (double)i > -0.2) || (mv_in_out_accumulator > -2.0)) && 1410 ((mv_in_out_accumulator / (double)i > -0.2) || (mv_in_out_accumulator > -2.0)) &&
1410 //(cpi->gfu_boost>150) && 1411 //(cpi->gfu_boost>150) &&
1411 (cpi->gfu_boost > 100) && 1412 (cpi->gfu_boost > 100) &&
1412 //(cpi->gfu_boost>AF_THRESH2) && 1413 //(cpi->gfu_boost>AF_THRESH2) &&
1413 //((cpi->gfu_boost/i)>AF_THRESH) && 1414 //((cpi->gfu_boost/i)>AF_THRESH) &&
1414 //(decay_accumulator > 0.5) && 1415 //(decay_accumulator > 0.5) &&
1415 (cpi->gf_decay_rate <= (ARF_DECAY_THRESH + (cpi->gfu_boost / 200))) 1416 (cpi->gf_decay_rate <= (ARF_DECAY_THRESH + (cpi->gfu_boost / 200)))
(...skipping 1161 matching lines...) Expand 10 before | Expand all | Expand 10 after
2577 } 2578 }
2578 2579
2579 if ((cpi->common.Width != new_width) || (cpi->common.Height != new_heigh t)) 2580 if ((cpi->common.Width != new_width) || (cpi->common.Height != new_heigh t))
2580 { 2581 {
2581 cpi->common.Width = new_width; 2582 cpi->common.Width = new_width;
2582 cpi->common.Height = new_height; 2583 cpi->common.Height = new_height;
2583 vp8_alloc_compressor_data(cpi); 2584 vp8_alloc_compressor_data(cpi);
2584 } 2585 }
2585 } 2586 }
2586 } 2587 }
OLDNEW
« no previous file with comments | « source/libvpx/vp8/encoder/firstpass.h ('k') | source/libvpx/vp8/encoder/generic/csystemdependent.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698