Skip to content
GitLab
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
d0307158
Commit
d0307158
authored
Aug 14, 2015
by
Yaowu Xu
Committed by
Gerrit Code Review
Aug 14, 2015
Browse files
Merge "change vp10 to use a different sync code than vp9"
parents
519b526d
d692f26d
Changes
3
Hide whitespace changes
Inline
Side-by-side
vp10/common/common.h
View file @
d0307158
...
...
@@ -60,10 +60,10 @@ static INLINE int get_unsigned_bits(unsigned int num_values) {
"Failed to allocate "#lval); \
} while (0)
#endif
#define VP
9
_SYNC_CODE_0 0x49
#define VP
9
_SYNC_CODE_1 0x83
#define VP
9
_SYNC_CODE_2 0x4
2
// TODO(yaowu: validate the usage of these codes or develop new ones.)
#define VP
10
_SYNC_CODE_0 0x49
#define VP
10
_SYNC_CODE_1 0x83
#define VP
10
_SYNC_CODE_2 0x4
3
#define VP9_FRAME_MARKER 0x2
...
...
vp10/decoder/decodeframe.c
View file @
d0307158
...
...
@@ -2117,9 +2117,9 @@ static struct vpx_read_bit_buffer *init_read_bit_buffer(
//------------------------------------------------------------------------------
int
vp10_read_sync_code
(
struct
vpx_read_bit_buffer
*
const
rb
)
{
return
vpx_rb_read_literal
(
rb
,
8
)
==
VP
9
_SYNC_CODE_0
&&
vpx_rb_read_literal
(
rb
,
8
)
==
VP
9
_SYNC_CODE_1
&&
vpx_rb_read_literal
(
rb
,
8
)
==
VP
9
_SYNC_CODE_2
;
return
vpx_rb_read_literal
(
rb
,
8
)
==
VP
10
_SYNC_CODE_0
&&
vpx_rb_read_literal
(
rb
,
8
)
==
VP
10
_SYNC_CODE_1
&&
vpx_rb_read_literal
(
rb
,
8
)
==
VP
10
_SYNC_CODE_2
;
}
void
vp10_read_frame_size
(
struct
vpx_read_bit_buffer
*
rb
,
...
...
vp10/encoder/bitstream.c
View file @
d0307158
...
...
@@ -1026,9 +1026,9 @@ static void write_frame_size_with_refs(VP10_COMP *cpi,
}
static
void
write_sync_code
(
struct
vpx_write_bit_buffer
*
wb
)
{
vpx_wb_write_literal
(
wb
,
VP
9
_SYNC_CODE_0
,
8
);
vpx_wb_write_literal
(
wb
,
VP
9
_SYNC_CODE_1
,
8
);
vpx_wb_write_literal
(
wb
,
VP
9
_SYNC_CODE_2
,
8
);
vpx_wb_write_literal
(
wb
,
VP
10
_SYNC_CODE_0
,
8
);
vpx_wb_write_literal
(
wb
,
VP
10
_SYNC_CODE_1
,
8
);
vpx_wb_write_literal
(
wb
,
VP
10
_SYNC_CODE_2
,
8
);
}
static
void
write_profile
(
BITSTREAM_PROFILE
profile
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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