package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-21 16:19:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[mpp_bitread]: fix error,which read signed value

Browse Source 
Change-Id: I50b203048649c06ded6351274087ab0e38699342
Signed-off-by: leo.ding <leo.ding@rock-chips.com>
This commit is contained in:
leo.ding
2017-01-05 09:49:14 +08:00
parent 49188052ec
commit 6b8fdecf69
1 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
mpp/base/inc/mpp_bitread.h
View File

@@ -26,40 +26,49 @@
#define __BITREAD_ERR __bitread_error
#define READ_ONEBIT(bitctx, out)\
do {\
bitctx->ret = mpp_read_bits(bitctx, 1, (RK_S32 *)out); \
if (bitctx->ret) { goto __BITREAD_ERR; }\
RK_S32 _out; \
bitctx->ret = mpp_read_bits(bitctx, 1, &_out); \
if (!bitctx->ret) { *out = _out; }\
else { goto __BITREAD_ERR; }\
} while (0)
#define READ_BITS(bitctx, num_bits, out)\
do {\
bitctx->ret = mpp_read_bits(bitctx, num_bits, (RK_S32 *)out);\
if (bitctx->ret) { goto __BITREAD_ERR;}\
RK_S32 _out; \
bitctx->ret = mpp_read_bits(bitctx, num_bits, &_out); \
if (!bitctx->ret) { *out = _out; }\
else { goto __BITREAD_ERR; }\
} while (0)
#define READ_BITS_LONG(bitctx, num_bits, out)\
do {\
bitctx->ret = mpp_read_longbits(bitctx, num_bits, (RK_U32 *)out); \
if (bitctx->ret) { goto __BITREAD_ERR; }\
RK_U32 _out; \
bitctx->ret = mpp_read_longbits(bitctx, num_bits, &_out); \
if (!bitctx->ret) { *out = _out; }\
else { goto __BITREAD_ERR; }\
} while (0)
#define SHOW_BITS(bitctx, num_bits, out)\
do {\
bitctx->ret = mpp_show_bits(bitctx, num_bits, (RK_S32 *)out); \
if (bitctx->ret) { goto __BITREAD_ERR; }\
RK_S32 _out; \
bitctx->ret = mpp_show_bits(bitctx, num_bits, &_out); \
if (!bitctx->ret) { *out = _out; }\
else { goto __BITREAD_ERR; }\
} while (0)
#define SHOW_BITS_LONG(bitctx, num_bits, out)\
do {\
bitctx->ret = mpp_show_longbits(bitctx, num_bits, (RK_U32 *)out); \
if (bitctx->ret) { goto __BITREAD_ERR; }\
RK_U32 _out; \
bitctx->ret = mpp_show_longbits(bitctx, num_bits, &_out); \
if (!bitctx->ret) { *out = _out; }\
else { goto __BITREAD_ERR; }\
} while (0)
#define SKIP_BITS(bitctx, num_bits)\
do {\
bitctx->ret = mpp_skip_bits(bitctx, num_bits);\
bitctx->ret = mpp_skip_bits(bitctx, num_bits); \
if (bitctx->ret) { goto __BITREAD_ERR; }\
} while (0)
@@ -71,17 +80,20 @@
#define READ_UE(bitctx, out)\
do {\
bitctx->ret = mpp_read_ue(bitctx, (RK_U32 *)out);\
if (bitctx->ret) { goto __BITREAD_ERR;}\
RK_U32 _out; \
bitctx->ret = mpp_read_ue(bitctx, &_out); \
if (!bitctx->ret) { *out = _out; }\
else { goto __BITREAD_ERR; }\
} while (0)
#define READ_SE(bitctx, out)\
do {\
bitctx->ret = mpp_read_se(bitctx, (RK_S32 *)out);\
if (bitctx->ret) { goto __BITREAD_ERR;}\
RK_S32 _out; \
bitctx->ret = mpp_read_se(bitctx, &_out); \
if (!bitctx->ret) { *out = _out; }\
else { goto __BITREAD_ERR; }\
} while (0)
typedef struct bitread_ctx_t {
// Pointer to the next unread (not in curr_byte_) byte in the stream.
RK_U8 *data_;