| OLD | NEW |
| 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 | 11 |
| 12 #ifndef VP9_DECODER_VP9_TREEREADER_H_ | 12 #ifndef VP9_DECODER_VP9_TREEREADER_H_ |
| 13 #define VP9_DECODER_VP9_TREEREADER_H_ | 13 #define VP9_DECODER_VP9_TREEREADER_H_ |
| 14 | 14 |
| 15 #include "vp9/common/vp9_treecoder.h" | 15 #include "vp9/common/vp9_treecoder.h" |
| 16 #include "vp9/decoder/vp9_dboolhuff.h" | 16 #include "vp9/decoder/vp9_dboolhuff.h" |
| 17 | 17 |
| 18 #define vp9_read_prob(r) ((vp9_prob)vp9_read_literal(r, 8)) | |
| 19 #define vp9_read_and_apply_sign(r, value) (vp9_read_bit(r) ? -(value) : (value)) | 18 #define vp9_read_and_apply_sign(r, value) (vp9_read_bit(r) ? -(value) : (value)) |
| 20 | 19 |
| 21 // Intent of tree data structure is to make decoding trivial. | 20 // Intent of tree data structure is to make decoding trivial. |
| 22 static int treed_read(vp9_reader *const r, /* !!! must return a 0 or 1 !!! */ | 21 static int treed_read(vp9_reader *const r, /* !!! must return a 0 or 1 !!! */ |
| 23 vp9_tree t, | 22 vp9_tree t, |
| 24 const vp9_prob *const p) { | 23 const vp9_prob *const p) { |
| 25 register vp9_tree_index i = 0; | 24 register vp9_tree_index i = 0; |
| 26 | 25 |
| 27 while ((i = t[ i + vp9_read(r, p[i >> 1])]) > 0); | 26 while ((i = t[ i + vp9_read(r, p[i >> 1])]) > 0); |
| 28 | 27 |
| 29 return -i; | 28 return -i; |
| 30 } | 29 } |
| 31 | 30 |
| 32 #endif // VP9_DECODER_VP9_TREEREADER_H_ | 31 #endif // VP9_DECODER_VP9_TREEREADER_H_ |
| OLD | NEW |