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

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

Issue 1339513003: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master
Patch Set: Created 5 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
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
11 #include <assert.h> 11 #include <assert.h>
12 12
13 #include "vp9/common/vp9_common.h" 13 #include "vp9/common/vp9_common.h"
14 #include "vp9/common/vp9_entropy.h" 14 #include "vp9/common/vp9_entropy.h"
15 #include "vp9/common/vp9_entropymode.h" 15 #include "vp9/common/vp9_entropymode.h"
16 #include "vp9/common/vp9_entropymv.h" 16 #include "vp9/common/vp9_entropymv.h"
17 #include "vp9/common/vp9_mvref_common.h" 17 #include "vp9/common/vp9_mvref_common.h"
18 #include "vp9/common/vp9_pred_common.h" 18 #include "vp9/common/vp9_pred_common.h"
19 #include "vp9/common/vp9_reconinter.h" 19 #include "vp9/common/vp9_reconinter.h"
20 #include "vp9/common/vp9_seg_common.h" 20 #include "vp9/common/vp9_seg_common.h"
21 21
22 #include "vp9/decoder/vp9_decodemv.h" 22 #include "vp9/decoder/vp9_decodemv.h"
23 #include "vp9/decoder/vp9_decodeframe.h" 23 #include "vp9/decoder/vp9_decodeframe.h"
24 24
25 #include "vpx_dsp/vpx_dsp_common.h"
26
25 static PREDICTION_MODE read_intra_mode(vpx_reader *r, const vpx_prob *p) { 27 static PREDICTION_MODE read_intra_mode(vpx_reader *r, const vpx_prob *p) {
26 return (PREDICTION_MODE)vpx_read_tree(r, vp9_intra_mode_tree, p); 28 return (PREDICTION_MODE)vpx_read_tree(r, vp9_intra_mode_tree, p);
27 } 29 }
28 30
29 static PREDICTION_MODE read_intra_mode_y(VP9_COMMON *cm, MACROBLOCKD *xd, 31 static PREDICTION_MODE read_intra_mode_y(VP9_COMMON *cm, MACROBLOCKD *xd,
30 vpx_reader *r, int size_group) { 32 vpx_reader *r, int size_group) {
31 const PREDICTION_MODE y_mode = 33 const PREDICTION_MODE y_mode =
32 read_intra_mode(r, cm->fc->y_mode_prob[size_group]); 34 read_intra_mode(r, cm->fc->y_mode_prob[size_group]);
33 FRAME_COUNTS *counts = xd->counts; 35 FRAME_COUNTS *counts = xd->counts;
34 if (counts) 36 if (counts)
(...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 for (w = 0; w < x_mis; ++w) { 624 for (w = 0; w < x_mis; ++w) {
623 MV_REF *const mv = frame_mv + w; 625 MV_REF *const mv = frame_mv + w;
624 mv->ref_frame[0] = mi->mbmi.ref_frame[0]; 626 mv->ref_frame[0] = mi->mbmi.ref_frame[0];
625 mv->ref_frame[1] = mi->mbmi.ref_frame[1]; 627 mv->ref_frame[1] = mi->mbmi.ref_frame[1];
626 mv->mv[0].as_int = mi->mbmi.mv[0].as_int; 628 mv->mv[0].as_int = mi->mbmi.mv[0].as_int;
627 mv->mv[1].as_int = mi->mbmi.mv[1].as_int; 629 mv->mv[1].as_int = mi->mbmi.mv[1].as_int;
628 } 630 }
629 } 631 }
630 } 632 }
631 } 633 }
OLDNEW
« no previous file with comments | « source/libvpx/vp9/decoder/vp9_decodeframe.c ('k') | source/libvpx/vp9/encoder/vp9_aq_complexity.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698