change vp10 to use a different sync code than vp9

Change-Id: If5b5beb38c938bd7a6016dedc9bd0c8e06153d73
This commit is contained in:
Yaowu Xu 2015-08-14 13:06:56 -07:00
parent 3d1bb97b1b
commit d692f26dd5
3 changed files with 10 additions and 10 deletions

View File

@ -60,10 +60,10 @@ static INLINE int get_unsigned_bits(unsigned int num_values) {
"Failed to allocate "#lval); \
} while (0)
#endif
#define VP9_SYNC_CODE_0 0x49
#define VP9_SYNC_CODE_1 0x83
#define VP9_SYNC_CODE_2 0x42
// TODO(yaowu: validate the usage of these codes or develop new ones.)
#define VP10_SYNC_CODE_0 0x49
#define VP10_SYNC_CODE_1 0x83
#define VP10_SYNC_CODE_2 0x43
#define VP9_FRAME_MARKER 0x2

View File

@ -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) == VP9_SYNC_CODE_0 &&
vpx_rb_read_literal(rb, 8) == VP9_SYNC_CODE_1 &&
vpx_rb_read_literal(rb, 8) == VP9_SYNC_CODE_2;
return vpx_rb_read_literal(rb, 8) == VP10_SYNC_CODE_0 &&
vpx_rb_read_literal(rb, 8) == VP10_SYNC_CODE_1 &&
vpx_rb_read_literal(rb, 8) == VP10_SYNC_CODE_2;
}
void vp10_read_frame_size(struct vpx_read_bit_buffer *rb,

View File

@ -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, VP9_SYNC_CODE_0, 8);
vpx_wb_write_literal(wb, VP9_SYNC_CODE_1, 8);
vpx_wb_write_literal(wb, VP9_SYNC_CODE_2, 8);
vpx_wb_write_literal(wb, VP10_SYNC_CODE_0, 8);
vpx_wb_write_literal(wb, VP10_SYNC_CODE_1, 8);
vpx_wb_write_literal(wb, VP10_SYNC_CODE_2, 8);
}
static void write_profile(BITSTREAM_PROFILE profile,