Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
7b22c1d4
Commit
7b22c1d4
authored
Mar 22, 2016
by
Alex Converse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Force the VPX boolcoder trees in the ANS test.
Change-Id: I282f958c35aabcdfaf1077f8909c56c999420937
parent
89a8174f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
3 deletions
+15
-3
test/vp10_ans_test.cc
test/vp10_ans_test.cc
+2
-0
vp10/encoder/treewriter.h
vp10/encoder/treewriter.h
+13
-3
No files found.
test/vp10_ans_test.cc
View file @
7b22c1d4
...
...
@@ -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 @
7b22c1d4
...
...
@@ -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