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

Side by Side Diff: source/libvpx/vp9/common/vp9_common_data.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
« no previous file with comments | « source/libvpx/vp9/common/vp9_blockd.h ('k') | source/libvpx/vp9/common/vp9_loopfilter.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) 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 "vp9/common/vp9_common_data.h" 11 #include "vp9/common/vp9_common_data.h"
12 #include "vpx_dsp/vpx_dsp_common.h"
12 13
13 // Log 2 conversion lookup tables for block width and height 14 // Log 2 conversion lookup tables for block width and height
14 const uint8_t b_width_log2_lookup[BLOCK_SIZES] = 15 const uint8_t b_width_log2_lookup[BLOCK_SIZES] =
15 {0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4}; 16 {0, 0, 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4};
16 const uint8_t b_height_log2_lookup[BLOCK_SIZES] = 17 const uint8_t b_height_log2_lookup[BLOCK_SIZES] =
17 {0, 1, 0, 1, 2, 1, 2, 3, 2, 3, 4, 3, 4}; 18 {0, 1, 0, 1, 2, 1, 2, 3, 2, 3, 4, 3, 4};
18 const uint8_t num_4x4_blocks_wide_lookup[BLOCK_SIZES] = 19 const uint8_t num_4x4_blocks_wide_lookup[BLOCK_SIZES] =
19 {1, 1, 2, 2, 2, 4, 4, 4, 8, 8, 8, 16, 16}; 20 {1, 1, 2, 2, 2, 4, 4, 4, 8, 8, 8, 16, 16};
20 const uint8_t num_4x4_blocks_high_lookup[BLOCK_SIZES] = 21 const uint8_t num_4x4_blocks_high_lookup[BLOCK_SIZES] =
21 {1, 2, 1, 2, 4, 2, 4, 8, 4, 8, 16, 8, 16}; 22 {1, 2, 1, 2, 4, 2, 4, 8, 4, 8, 16, 8, 16};
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 {14, 12}, // 8X16 - {0b1110, 0b1100} 152 {14, 12}, // 8X16 - {0b1110, 0b1100}
152 {12, 14}, // 16X8 - {0b1100, 0b1110} 153 {12, 14}, // 16X8 - {0b1100, 0b1110}
153 {12, 12}, // 16X16 - {0b1100, 0b1100} 154 {12, 12}, // 16X16 - {0b1100, 0b1100}
154 {12, 8 }, // 16X32 - {0b1100, 0b1000} 155 {12, 8 }, // 16X32 - {0b1100, 0b1000}
155 {8, 12}, // 32X16 - {0b1000, 0b1100} 156 {8, 12}, // 32X16 - {0b1000, 0b1100}
156 {8, 8 }, // 32X32 - {0b1000, 0b1000} 157 {8, 8 }, // 32X32 - {0b1000, 0b1000}
157 {8, 0 }, // 32X64 - {0b1000, 0b0000} 158 {8, 0 }, // 32X64 - {0b1000, 0b0000}
158 {0, 8 }, // 64X32 - {0b0000, 0b1000} 159 {0, 8 }, // 64X32 - {0b0000, 0b1000}
159 {0, 0 }, // 64X64 - {0b0000, 0b0000} 160 {0, 0 }, // 64X64 - {0b0000, 0b0000}
160 }; 161 };
OLDNEW
« no previous file with comments | « source/libvpx/vp9/common/vp9_blockd.h ('k') | source/libvpx/vp9/common/vp9_loopfilter.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698