Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
21ce8b96
Commit
21ce8b96
authored
Mar 29, 2016
by
Alex Converse
Committed by
Gerrit Code Review
Mar 29, 2016
Browse files
Merge "Force the VPX boolcoder trees in the ANS test." into nextgenv2
parents
37241e6f
7b22c1d4
Changes
2
Hide whitespace changes
Inline
Side-by-side
test/vp10_ans_test.cc
View file @
21ce8b96
...
...
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#define VP10_FORCE_VPXBOOL_TREEWRITER
#include <assert.h>
#include <math.h>
#include <stdio.h>
...
...
vp10/encoder/treewriter.h
View file @
21ce8b96
...
...
@@ -11,7 +11,15 @@
#ifndef VP10_ENCODER_TREEWRITER_H_
#define VP10_ENCODER_TREEWRITER_H_
#ifdef VP10_FORCE_VPXBOOL_TREEWRITER
#include "vpx_dsp/bitwriter.h"
#define tree_writer vpx_writer
#define tree_bit_write vpx_write
#else
#include "vp10/encoder/bitwriter.h"
#define tree_writer vp10_writer
#define tree_bit_write vp10_write
#endif
#ifdef __cplusplus
extern
"C"
{
...
...
@@ -28,22 +36,24 @@ struct vp10_token {
void
vp10_tokens_from_tree
(
struct
vp10_token
*
,
const
vpx_tree_index
*
);
static
INLINE
void
vp10_write_tree
(
vpx
_writer
*
w
,
const
vpx_tree_index
*
tree
,
static
INLINE
void
vp10_write_tree
(
tree
_writer
*
w
,
const
vpx_tree_index
*
tree
,
const
vpx_prob
*
probs
,
int
bits
,
int
len
,
vpx_tree_index
i
)
{
do
{
const
int
bit
=
(
bits
>>
--
len
)
&
1
;
vpx
_write
(
w
,
bit
,
probs
[
i
>>
1
]);
tree_bit
_write
(
w
,
bit
,
probs
[
i
>>
1
]);
i
=
tree
[
i
+
bit
];
}
while
(
len
);
}
static
INLINE
void
vp10_write_token
(
vpx
_writer
*
w
,
const
vpx_tree_index
*
tree
,
static
INLINE
void
vp10_write_token
(
tree
_writer
*
w
,
const
vpx_tree_index
*
tree
,
const
vpx_prob
*
probs
,
const
struct
vp10_token
*
token
)
{
vp10_write_tree
(
w
,
tree
,
probs
,
token
->
value
,
token
->
len
,
0
);
}
#undef tree_writer
#undef tree_bit_write
#ifdef __cplusplus
}
// extern "C"
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment