| 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 tree_reader_h | 12 #ifndef TREEREADER_H_ |
| 13 #define tree_reader_h 1 | 13 #define TREEREADER_H_ |
| 14 | 14 |
| 15 #include "vp8/common/treecoder.h" | 15 #include "vp8/common/treecoder.h" |
| 16 | |
| 17 #include "dboolhuff.h" | 16 #include "dboolhuff.h" |
| 18 | 17 |
| 19 typedef BOOL_DECODER vp8_reader; | 18 typedef BOOL_DECODER vp8_reader; |
| 20 | 19 |
| 21 #define vp8_read vp8dx_decode_bool | 20 #define vp8_read vp8dx_decode_bool |
| 22 #define vp8_read_literal vp8_decode_value | 21 #define vp8_read_literal vp8_decode_value |
| 23 #define vp8_read_bit( R) vp8_read( R, vp8_prob_half) | 22 #define vp8_read_bit(R) vp8_read(R, vp8_prob_half) |
| 24 | 23 |
| 25 | 24 |
| 26 /* Intent of tree data structure is to make decoding trivial. */ | 25 /* Intent of tree data structure is to make decoding trivial. */ |
| 27 | 26 |
| 28 static int vp8_treed_read( | 27 static int vp8_treed_read( |
| 29 vp8_reader *const r, /* !!! must return a 0 or 1 !!! */ | 28 vp8_reader *const r, /* !!! must return a 0 or 1 !!! */ |
| 30 vp8_tree t, | 29 vp8_tree t, |
| 31 const vp8_prob *const p | 30 const vp8_prob *const p |
| 32 ) | 31 ) |
| 33 { | 32 { |
| 34 register vp8_tree_index i = 0; | 33 register vp8_tree_index i = 0; |
| 35 | 34 |
| 36 while ((i = t[ i + vp8_read(r, p[i>>1])]) > 0) ; | 35 while ((i = t[ i + vp8_read(r, p[i>>1])]) > 0) ; |
| 37 | 36 |
| 38 return -i; | 37 return -i; |
| 39 } | 38 } |
| 40 | 39 |
| 41 #endif /* tree_reader_h */ | 40 #endif // TREEREADER_H_ |
| OLD | NEW |