Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Yushin Cho
aom-rav1e
Commits
03568c31
Commit
03568c31
authored
Jan 20, 2016
by
Yaowu Xu
Browse files
VP9_FRAME_MARKER -> VPX_FRAME_MARKER
Change-Id: I402faf4e8df60f02d82ad79dc725722b4e1f8f9c
parent
4273a52c
Changes
4
Hide whitespace changes
Inline
Side-by-side
vp10/common/common.h
View file @
03568c31
...
...
@@ -65,7 +65,7 @@ static INLINE int get_unsigned_bits(unsigned int num_values) {
#define VP10_SYNC_CODE_1 0x83
#define VP10_SYNC_CODE_2 0x43
#define VP
9
_FRAME_MARKER 0x2
#define VP
X
_FRAME_MARKER 0x2
#ifdef __cplusplus
...
...
vp10/decoder/decodeframe.c
View file @
03568c31
...
...
@@ -1868,7 +1868,7 @@ static size_t read_uncompressed_header(VP10Decoder *pbi,
cm
->
last_frame_type
=
cm
->
frame_type
;
cm
->
last_intra_only
=
cm
->
intra_only
;
if
(
vpx_rb_read_literal
(
rb
,
2
)
!=
VP
9
_FRAME_MARKER
)
if
(
vpx_rb_read_literal
(
rb
,
2
)
!=
VP
X
_FRAME_MARKER
)
vpx_internal_error
(
&
cm
->
error
,
VPX_CODEC_UNSUP_BITSTREAM
,
"Invalid frame marker"
);
...
...
vp10/encoder/bitstream.c
View file @
03568c31
...
...
@@ -1271,7 +1271,7 @@ static void write_uncompressed_header(VP10_COMP *cpi,
VP10_COMMON
*
const
cm
=
&
cpi
->
common
;
MACROBLOCKD
*
const
xd
=
&
cpi
->
td
.
mb
.
e_mbd
;
vpx_wb_write_literal
(
wb
,
VP
9
_FRAME_MARKER
,
2
);
vpx_wb_write_literal
(
wb
,
VP
X
_FRAME_MARKER
,
2
);
write_profile
(
cm
->
profile
,
wb
);
...
...
vp10/vp10_dx_iface.c
View file @
03568c31
...
...
@@ -197,7 +197,7 @@ static vpx_codec_err_t decoder_peek_si_internal(const uint8_t *data,
const
int
frame_marker
=
vpx_rb_read_literal
(
&
rb
,
2
);
const
BITSTREAM_PROFILE
profile
=
vp10_read_profile
(
&
rb
);
if
(
frame_marker
!=
VP
9
_FRAME_MARKER
)
if
(
frame_marker
!=
VP
X
_FRAME_MARKER
)
return
VPX_CODEC_UNSUP_BITSTREAM
;
if
(
profile
>=
MAX_PROFILES
)
...
...
Write
Preview
Supports
Markdown
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