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

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

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
« no previous file with comments | « source/libvpx/vp9/common/vp9_postproc.c ('k') | source/libvpx/vp9/common/vp9_reconinter.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 #include "vpx_dsp/vpx_dsp_common.h"
16 17
17 #ifdef __cplusplus 18 #ifdef __cplusplus
18 extern "C" { 19 extern "C" {
19 #endif 20 #endif
20 21
21 static INLINE int get_segment_id(const VP9_COMMON *cm, 22 static INLINE int get_segment_id(const VP9_COMMON *cm,
22 const uint8_t *segment_ids, 23 const uint8_t *segment_ids,
23 BLOCK_SIZE bsize, int mi_row, int mi_col) { 24 BLOCK_SIZE bsize, int mi_row, int mi_col) {
24 const int mi_offset = mi_row * cm->mi_cols + mi_col; 25 const int mi_offset = mi_row * cm->mi_cols + mi_col;
25 const int bw = num_8x8_blocks_wide_lookup[bsize]; 26 const int bw = num_8x8_blocks_wide_lookup[bsize];
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 assert(0 && "Invalid max_tx_size."); 162 assert(0 && "Invalid max_tx_size.");
162 return NULL; 163 return NULL;
163 } 164 }
164 } 165 }
165 166
166 #ifdef __cplusplus 167 #ifdef __cplusplus
167 } // extern "C" 168 } // extern "C"
168 #endif 169 #endif
169 170
170 #endif // VP9_COMMON_VP9_PRED_COMMON_H_ 171 #endif // VP9_COMMON_VP9_PRED_COMMON_H_
OLDNEW
« no previous file with comments | « source/libvpx/vp9/common/vp9_postproc.c ('k') | source/libvpx/vp9/common/vp9_reconinter.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698