generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VP9_FRAME_MARKER -> VPX_FRAME_MARKER

Browse Source 
Change-Id: I402faf4e8df60f02d82ad79dc725722b4e1f8f9c
This commit is contained in:
Yaowu Xu
2016-01-20 15:44:37 -08:00
parent 4273a52cec
commit 03568c313b
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vp10/common/common.h
View File

@@ -65,7 +65,7 @@ static INLINE int get_unsigned_bits(unsigned int num_values) {
#define VP10_SYNC_CODE_1 0x83 #define VP10_SYNC_CODE_1 0x83
#define VP10_SYNC_CODE_2 0x43 #define VP10_SYNC_CODE_2 0x43
#define VP9_FRAME_MARKER 0x2 #define VPX_FRAME_MARKER 0x2
#ifdef __cplusplus #ifdef __cplusplus

2
vp10/decoder/decodeframe.c
View File

@@ -1868,7 +1868,7 @@ static size_t read_uncompressed_header(VP10Decoder *pbi,
cm->last_frame_type = cm->frame_type; cm->last_frame_type = cm->frame_type;
cm->last_intra_only = cm->intra_only; cm->last_intra_only = cm->intra_only;
if (vpx_rb_read_literal(rb, 2) != VP9_FRAME_MARKER) if (vpx_rb_read_literal(rb, 2) != VPX_FRAME_MARKER)
vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM, vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM,
"Invalid frame marker"); "Invalid frame marker");

2
vp10/encoder/bitstream.c
View File

@@ -1271,7 +1271,7 @@ static void write_uncompressed_header(VP10_COMP *cpi,
VP10_COMMON *const cm = &cpi->common; VP10_COMMON *const cm = &cpi->common;
MACROBLOCKD *const xd = &cpi->td.mb.e_mbd; MACROBLOCKD *const xd = &cpi->td.mb.e_mbd;
vpx_wb_write_literal(wb, VP9_FRAME_MARKER, 2); vpx_wb_write_literal(wb, VPX_FRAME_MARKER, 2);
write_profile(cm->profile, wb); write_profile(cm->profile, wb);

2
vp10/vp10_dx_iface.c
View File

@@ -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 int frame_marker = vpx_rb_read_literal(&rb, 2);
const BITSTREAM_PROFILE profile = vp10_read_profile(&rb); const BITSTREAM_PROFILE profile = vp10_read_profile(&rb);
if (frame_marker != VP9_FRAME_MARKER) if (frame_marker != VPX_FRAME_MARKER)
return VPX_CODEC_UNSUP_BITSTREAM; return VPX_CODEC_UNSUP_BITSTREAM;
if (profile >= MAX_PROFILES) if (profile >= MAX_PROFILES)