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

Side by Side Diff: source/libvpx/vp9/encoder/vp9_firstpass.c

Issue 290613006: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 years, 7 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 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 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 // Disable golden frame for svc first pass for now. 534 // Disable golden frame for svc first pass for now.
535 gld_yv12 = NULL; 535 gld_yv12 = NULL;
536 set_ref_ptrs(cm, xd, ref_frame, NONE); 536 set_ref_ptrs(cm, xd, ref_frame, NONE);
537 537
538 cpi->Source = vp9_scale_if_required(cm, cpi->un_scaled_source, 538 cpi->Source = vp9_scale_if_required(cm, cpi->un_scaled_source,
539 &cpi->scaled_source); 539 &cpi->scaled_source);
540 } 540 }
541 541
542 vp9_setup_src_planes(x, cpi->Source, 0, 0); 542 vp9_setup_src_planes(x, cpi->Source, 0, 0);
543 vp9_setup_pre_planes(xd, 0, first_ref_buf, 0, 0, NULL); 543 vp9_setup_pre_planes(xd, 0, first_ref_buf, 0, 0, NULL);
544 vp9_setup_dst_planes(xd, new_yv12, 0, 0); 544 vp9_setup_dst_planes(xd->plane, new_yv12, 0, 0);
545 545
546 xd->mi = cm->mi_grid_visible; 546 xd->mi = cm->mi_grid_visible;
547 xd->mi[0] = cm->mi; 547 xd->mi[0] = cm->mi;
548 548
549 vp9_setup_block_planes(&x->e_mbd, cm->subsampling_x, cm->subsampling_y); 549 vp9_setup_block_planes(&x->e_mbd, cm->subsampling_x, cm->subsampling_y);
550 550
551 vp9_frame_init_quantizer(cpi); 551 vp9_frame_init_quantizer(cpi);
552 552
553 for (i = 0; i < MAX_MB_PLANE; ++i) { 553 for (i = 0; i < MAX_MB_PLANE; ++i) {
554 p[i].coeff = ctx->coeff_pbuf[i][1]; 554 p[i].coeff = ctx->coeff_pbuf[i][1];
(...skipping 1775 matching lines...) Expand 10 before | Expand all | Expand 10 after
2330 // So now update to the correct value based on the actual bits used. 2330 // So now update to the correct value based on the actual bits used.
2331 cpi->twopass.kf_group_bits += cpi->rc.this_frame_target - bits_used; 2331 cpi->twopass.kf_group_bits += cpi->rc.this_frame_target - bits_used;
2332 } else { 2332 } else {
2333 #endif 2333 #endif
2334 cpi->twopass.kf_group_bits -= bits_used; 2334 cpi->twopass.kf_group_bits -= bits_used;
2335 cpi->twopass.gf_group_bits -= bits_used; 2335 cpi->twopass.gf_group_bits -= bits_used;
2336 cpi->twopass.gf_group_bits = MAX(cpi->twopass.gf_group_bits, 0); 2336 cpi->twopass.gf_group_bits = MAX(cpi->twopass.gf_group_bits, 0);
2337 } 2337 }
2338 cpi->twopass.kf_group_bits = MAX(cpi->twopass.kf_group_bits, 0); 2338 cpi->twopass.kf_group_bits = MAX(cpi->twopass.kf_group_bits, 0);
2339 } 2339 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698