diff options
author | John Koleszar <jkoleszar@google.com> | 2012-11-06 16:59:01 -0800 |
---|---|---|
committer | John Koleszar <jkoleszar@google.com> | 2012-11-07 11:30:16 -0800 |
commit | 7b8dfcb5a2cfb01ee7a6009d945d06559b564d06 (patch) | |
tree | 29365387746cff257aede84bf84525435b3d948b /vp8/decoder/treereader.h | |
parent | 82b1a3433df1705e73d83eaeb9731f67c29c8883 (diff) | |
parent | 3c8007f19ecd612a9e3c462b83f7ab740546f8f9 (diff) | |
download | libvpx-7b8dfcb5a2cfb01ee7a6009d945d06559b564d06.tar libvpx-7b8dfcb5a2cfb01ee7a6009d945d06559b564d06.tar.gz libvpx-7b8dfcb5a2cfb01ee7a6009d945d06559b564d06.tar.bz2 libvpx-7b8dfcb5a2cfb01ee7a6009d945d06559b564d06.zip |
Rough merge of master into experimental
Creates a merge between the master and experimental branches. Fixes a
number of conflicts in the build system to allow *either* VP8 or VP9
to be built. Specifically either:
$ configure --disable-vp9 $ configure --disable-vp8
--disable-unit-tests
VP9 still exports its symbols and files as VP8, so that will be
resolved in the next commit.
Unit tests are broken in VP9, but this isn't a new issue. They are
fixed upstream on origin/experimental as of this writing, but rebasing
this merge proved difficult, so will tackle that in a second merge
commit.
Change-Id: I2b7d852c18efd58d1ebc621b8041fe0260442c21
Diffstat (limited to 'vp8/decoder/treereader.h')
-rw-r--r-- | vp8/decoder/treereader.h | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/vp8/decoder/treereader.h b/vp8/decoder/treereader.h new file mode 100644 index 000000000..238ff8536 --- /dev/null +++ b/vp8/decoder/treereader.h @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2010 The WebM project authors. All Rights Reserved. + * + * Use of this source code is governed by a BSD-style license + * that can be found in the LICENSE file in the root of the source + * tree. An additional intellectual property rights grant can be found + * in the file PATENTS. All contributing project authors may + * be found in the AUTHORS file in the root of the source tree. + */ + + +#ifndef tree_reader_h +#define tree_reader_h 1 + +#include "vp8/common/treecoder.h" + +#include "dboolhuff.h" + +typedef BOOL_DECODER vp8_reader; + +#define vp8_read vp8dx_decode_bool +#define vp8_read_literal vp8_decode_value +#define vp8_read_bit( R) vp8_read( R, vp8_prob_half) + + +/* Intent of tree data structure is to make decoding trivial. */ + +static int vp8_treed_read( + vp8_reader *const r, /* !!! must return a 0 or 1 !!! */ + vp8_tree t, + const vp8_prob *const p +) +{ + register vp8_tree_index i = 0; + + while ((i = t[ i + vp8_read(r, p[i>>1])]) > 0) ; + + return -i; +} + +#endif /* tree_reader_h */ |