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

Side by Side Diff: source/libvpx/vp9/common/vp9_pred_common.h

Issue 592203002: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 6 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
« no previous file with comments | « source/libvpx/vp9/common/vp9_onyxc_int.h ('k') | source/libvpx/vp9/common/vp9_pred_common.c » ('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) 2012 The WebM project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 #ifndef VP9_COMMON_VP9_PRED_COMMON_H_ 11 #ifndef VP9_COMMON_VP9_PRED_COMMON_H_
12 #define VP9_COMMON_VP9_PRED_COMMON_H_ 12 #define VP9_COMMON_VP9_PRED_COMMON_H_
13 13
14 #include "vp9/common/vp9_blockd.h" 14 #include "vp9/common/vp9_blockd.h"
15 #include "vp9/common/vp9_onyxc_int.h" 15 #include "vp9/common/vp9_onyxc_int.h"
16 16
17 #ifdef __cplusplus 17 #ifdef __cplusplus
18 extern "C" { 18 extern "C" {
19 #endif 19 #endif
20 20
21 static INLINE const MODE_INFO *get_above_mi(const MACROBLOCKD *const xd) { 21 static INLINE const MODE_INFO *get_above_mi(const MACROBLOCKD *const xd) {
22 return xd->up_available ? xd->mi[-xd->mi_stride] : NULL; 22 return xd->up_available ? xd->mi[-xd->mi_stride].src_mi : NULL;
23 } 23 }
24 24
25 static INLINE const MODE_INFO *get_left_mi(const MACROBLOCKD *const xd) { 25 static INLINE const MODE_INFO *get_left_mi(const MACROBLOCKD *const xd) {
26 return xd->left_available ? xd->mi[-1] : NULL; 26 return xd->left_available ? xd->mi[-1].src_mi : NULL;
27 } 27 }
28 28
29 int vp9_get_segment_id(const VP9_COMMON *cm, const uint8_t *segment_ids, 29 int vp9_get_segment_id(const VP9_COMMON *cm, const uint8_t *segment_ids,
30 BLOCK_SIZE bsize, int mi_row, int mi_col); 30 BLOCK_SIZE bsize, int mi_row, int mi_col);
31 31
32 static INLINE int vp9_get_pred_context_seg_id(const MACROBLOCKD *xd) { 32 static INLINE int vp9_get_pred_context_seg_id(const MACROBLOCKD *xd) {
33 const MODE_INFO *const above_mi = get_above_mi(xd); 33 const MODE_INFO *const above_mi = get_above_mi(xd);
34 const MODE_INFO *const left_mi = get_left_mi(xd); 34 const MODE_INFO *const left_mi = get_left_mi(xd);
35 const int above_sip = (above_mi != NULL) ? 35 const int above_sip = (above_mi != NULL) ?
36 above_mi->mbmi.seg_id_predicted : 0; 36 above_mi->mbmi.seg_id_predicted : 0;
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 assert(0 && "Invalid max_tx_size."); 132 assert(0 && "Invalid max_tx_size.");
133 return NULL; 133 return NULL;
134 } 134 }
135 } 135 }
136 136
137 #ifdef __cplusplus 137 #ifdef __cplusplus
138 } // extern "C" 138 } // extern "C"
139 #endif 139 #endif
140 140
141 #endif // VP9_COMMON_VP9_PRED_COMMON_H_ 141 #endif // VP9_COMMON_VP9_PRED_COMMON_H_
OLDNEW
« no previous file with comments | « source/libvpx/vp9/common/vp9_onyxc_int.h ('k') | source/libvpx/vp9/common/vp9_pred_common.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698