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
Guillaume Martres
aom-rav1e
Commits
9baa5c99
Commit
9baa5c99
authored
Jan 20, 2016
by
Yaowu Xu
Browse files
MAX_VP9_HEADER_SIZE -> MAX_VP10_HEADER_SIZE
Change-Id: I87600af7f68f9591f4318562801372cf5fd875bc
parent
03568c31
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp10/decoder/decodeframe.c
View file @
9baa5c99
...
...
@@ -43,7 +43,7 @@
#include "vp10/decoder/decoder.h"
#include "vp10/decoder/dsubexp.h"
#define MAX_VP
9
_HEADER_SIZE 80
#define MAX_VP
10
_HEADER_SIZE 80
static
int
is_compound_reference_allowed
(
const
VP10_COMMON
*
cm
)
{
int
i
;
...
...
@@ -2275,12 +2275,12 @@ static struct vpx_read_bit_buffer *init_read_bit_buffer(
struct
vpx_read_bit_buffer
*
rb
,
const
uint8_t
*
data
,
const
uint8_t
*
data_end
,
uint8_t
clear_data
[
MAX_VP
9
_HEADER_SIZE
])
{
uint8_t
clear_data
[
MAX_VP
10
_HEADER_SIZE
])
{
rb
->
bit_offset
=
0
;
rb
->
error_handler
=
error_handler
;
rb
->
error_handler_data
=
&
pbi
->
common
;
if
(
pbi
->
decrypt_cb
)
{
const
int
n
=
(
int
)
VPXMIN
(
MAX_VP
9
_HEADER_SIZE
,
data_end
-
data
);
const
int
n
=
(
int
)
VPXMIN
(
MAX_VP
10
_HEADER_SIZE
,
data_end
-
data
);
pbi
->
decrypt_cb
(
pbi
->
decrypt_state
,
data
,
clear_data
,
n
);
rb
->
bit_buffer
=
clear_data
;
rb
->
bit_buffer_end
=
clear_data
+
n
;
...
...
@@ -2320,7 +2320,7 @@ void vp10_decode_frame(VP10Decoder *pbi,
MACROBLOCKD
*
const
xd
=
&
pbi
->
mb
;
struct
vpx_read_bit_buffer
rb
;
int
context_updated
=
0
;
uint8_t
clear_data
[
MAX_VP
9
_HEADER_SIZE
];
uint8_t
clear_data
[
MAX_VP
10
_HEADER_SIZE
];
const
size_t
first_partition_size
=
read_uncompressed_header
(
pbi
,
init_read_bit_buffer
(
pbi
,
&
rb
,
data
,
data_end
,
clear_data
));
const
int
tile_rows
=
1
<<
cm
->
log2_tile_rows
;
...
...
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