diff options
| author | Yaowu Xu <yaowu@google.com> | 2015-08-14 13:06:56 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2015-08-14 13:06:56 -0700 |
| commit | d692f26dd552644ea44c93ca22a1a9c5393ca4c7 (patch) | |
| tree | d5e700f9f027e118ec562c3bfb4f5401a6e44b8c /vp10 | |
| parent | 3d1bb97b1b8018c6ba3524473fa4f99032f35397 (diff) | |
| download | libvpx-d692f26dd552644ea44c93ca22a1a9c5393ca4c7.tar libvpx-d692f26dd552644ea44c93ca22a1a9c5393ca4c7.tar.gz libvpx-d692f26dd552644ea44c93ca22a1a9c5393ca4c7.tar.bz2 libvpx-d692f26dd552644ea44c93ca22a1a9c5393ca4c7.zip | |
change vp10 to use a different sync code than vp9
Change-Id: If5b5beb38c938bd7a6016dedc9bd0c8e06153d73
Diffstat (limited to 'vp10')
| -rw-r--r-- | vp10/common/common.h | 8 | ||||
| -rw-r--r-- | vp10/decoder/decodeframe.c | 6 | ||||
| -rw-r--r-- | vp10/encoder/bitstream.c | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/vp10/common/common.h b/vp10/common/common.h index e5789727f..4abcbf633 100644 --- a/vp10/common/common.h +++ b/vp10/common/common.h @@ -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 diff --git a/vp10/decoder/decodeframe.c b/vp10/decoder/decodeframe.c index f50207785..e7da1c63d 100644 --- a/vp10/decoder/decodeframe.c +++ b/vp10/decoder/decodeframe.c @@ -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, diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c index e530db761..a793a3b6a 100644 --- a/vp10/encoder/bitstream.c +++ b/vp10/encoder/bitstream.c @@ -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, |