commit d692f26dd552644ea44c93ca22a1a9c5393ca4c7
author Yaowu Xu <yaowu@google.com> Fri Aug 14 13:06:56 2015 -0700
committer Yaowu Xu <yaowu@google.com> Fri Aug 14 13:06:56 2015 -0700
tree d5e700f9f027e118ec562c3bfb4f5401a6e44b8c
parent 3d1bb97b1b8018c6ba3524473fa4f99032f35397

change vp10 to use a different sync code than vp9

Change-Id: If5b5beb38c938bd7a6016dedc9bd0c8e06153d73

vp10/common/common.h

diff --git a/vp10/common/common.h b/vp10/common/common.h
index e578972..4abcbf6 100644
--- a/vp10/common/common.h
+++ b/vp10/common/common.h
@@ -60,10 +60,10 @@
                        "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
 

vp10/decoder/decodeframe.c

diff --git a/vp10/decoder/decodeframe.c b/vp10/decoder/decodeframe.c
index f502077..e7da1c6 100644
--- a/vp10/decoder/decodeframe.c
+++ b/vp10/decoder/decodeframe.c
@@ -2117,9 +2117,9 @@
 //------------------------------------------------------------------------------
 
 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,

vp10/encoder/bitstream.c

diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c
index e530db7..a793a3b 100644
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -1026,9 +1026,9 @@
 }
 
 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,