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

Side by Side Diff: source/libvpx/vp9/decoder/vp9_decodemv.c

Issue 996503002: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « source/libvpx/vp9/decoder/vp9_decodeframe.c ('k') | source/libvpx/vp9/decoder/vp9_decoder.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 const int ctx = vp9_get_intra_inter_context(xd); 450 const int ctx = vp9_get_intra_inter_context(xd);
451 const int is_inter = vp9_read(r, cm->fc->intra_inter_prob[ctx]); 451 const int is_inter = vp9_read(r, cm->fc->intra_inter_prob[ctx]);
452 if (!cm->frame_parallel_decoding_mode) 452 if (!cm->frame_parallel_decoding_mode)
453 ++counts->intra_inter[ctx][is_inter]; 453 ++counts->intra_inter[ctx][is_inter];
454 return is_inter; 454 return is_inter;
455 } 455 }
456 } 456 }
457 457
458 static void fpm_sync(void *const data, int mi_row) { 458 static void fpm_sync(void *const data, int mi_row) {
459 VP9Decoder *const pbi = (VP9Decoder *)data; 459 VP9Decoder *const pbi = (VP9Decoder *)data;
460 vp9_frameworker_wait(pbi->frame_worker_owner, pbi->prev_buf, 460 vp9_frameworker_wait(pbi->frame_worker_owner, pbi->common.prev_frame,
461 mi_row << MI_BLOCK_SIZE_LOG2); 461 mi_row << MI_BLOCK_SIZE_LOG2);
462 } 462 }
463 463
464 static void read_inter_block_mode_info(VP9Decoder *const pbi, 464 static void read_inter_block_mode_info(VP9Decoder *const pbi,
465 MACROBLOCKD *const xd, 465 MACROBLOCKD *const xd,
466 FRAME_COUNTS *counts, 466 FRAME_COUNTS *counts,
467 const TileInfo *const tile, 467 const TileInfo *const tile,
468 MODE_INFO *const mi, 468 MODE_INFO *const mi,
469 int mi_row, int mi_col, vp9_reader *r) { 469 int mi_row, int mi_col, vp9_reader *r) {
470 VP9_COMMON *const cm = &pbi->common; 470 VP9_COMMON *const cm = &pbi->common;
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 MV_REF *const frame_mv = frame_mvs + h * cm->mi_cols; 606 MV_REF *const frame_mv = frame_mvs + h * cm->mi_cols;
607 for (w = 0; w < x_mis; ++w) { 607 for (w = 0; w < x_mis; ++w) {
608 MV_REF *const mv = frame_mv + w; 608 MV_REF *const mv = frame_mv + w;
609 mv->ref_frame[0] = mi->src_mi->mbmi.ref_frame[0]; 609 mv->ref_frame[0] = mi->src_mi->mbmi.ref_frame[0];
610 mv->ref_frame[1] = mi->src_mi->mbmi.ref_frame[1]; 610 mv->ref_frame[1] = mi->src_mi->mbmi.ref_frame[1];
611 mv->mv[0].as_int = mi->src_mi->mbmi.mv[0].as_int; 611 mv->mv[0].as_int = mi->src_mi->mbmi.mv[0].as_int;
612 mv->mv[1].as_int = mi->src_mi->mbmi.mv[1].as_int; 612 mv->mv[1].as_int = mi->src_mi->mbmi.mv[1].as_int;
613 } 613 }
614 } 614 }
615 } 615 }
OLDNEW
« no previous file with comments | « source/libvpx/vp9/decoder/vp9_decodeframe.c ('k') | source/libvpx/vp9/decoder/vp9_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698