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

[mpp_bitread]: fix bug when using mpp_read_longbits

Browse Source 
tips: when bits less than 16, it will be wrong.

Change-Id: I8e371f77dfdd6dcb37eb75d66ca039a37d16d9cf
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
This commit is contained in:
Ding Wei
2018-11-16 11:25:06 +08:00
committed by Herman Chen
parent e2b49ac9d4
commit 455832480f
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mpp/base/mpp_bitread.c
View File

@@ -89,14 +89,18 @@ MPP_RET mpp_read_bits(BitReadCtx_t *bitctx, RK_S32 num_bits, RK_S32 *out)
MPP_RET mpp_read_longbits(BitReadCtx_t *bitctx, RK_S32 num_bits, RK_U32 *out) MPP_RET mpp_read_longbits(BitReadCtx_t *bitctx, RK_S32 num_bits, RK_U32 *out)
{ {
RK_S32 val = 0, val1 = 0; RK_S32 val = 0, val1 = 0;
if (num_bits < 32)
return mpp_read_bits(bitctx, num_bits, (RK_S32 *)out);
if (mpp_read_bits(bitctx, 16, &val)) { if (mpp_read_bits(bitctx, 16, &val)) {
return MPP_ERR_READ_BIT; return MPP_ERR_READ_BIT;
} }
if (mpp_read_bits(bitctx, (num_bits - 16), &val1)) { if (mpp_read_bits(bitctx, (num_bits - 16), &val1)) {
return MPP_ERR_READ_BIT; return MPP_ERR_READ_BIT;
} }
val = val << 16;
*out = (RK_U32)(val | val1); *out = (RK_U32)((val << 16) | val1);
return MPP_OK; return MPP_OK;
} }
@@ -148,11 +152,11 @@ MPP_RET mpp_show_bits(BitReadCtx_t *bitctx, RK_S32 num_bits, RK_S32 *out)
{ {
MPP_RET ret = MPP_ERR_UNKNOW; MPP_RET ret = MPP_ERR_UNKNOW;
BitReadCtx_t tmp_ctx = *bitctx; BitReadCtx_t tmp_ctx = *bitctx;
if (num_bits <= 31)
ret = mpp_read_bits(bitctx, num_bits, out); if (num_bits < 32)
ret = mpp_read_bits(&tmp_ctx, num_bits, out);
else else
ret = mpp_read_longbits(bitctx, num_bits, (RK_U32*)out); ret = mpp_read_longbits(&tmp_ctx, num_bits, (RK_U32 *)out);
memcpy(bitctx, &tmp_ctx, sizeof(BitReadCtx_t));
return ret; return ret;
} }
@@ -167,8 +171,7 @@ MPP_RET mpp_show_longbits(BitReadCtx_t *bitctx, RK_S32 num_bits, RK_U32 *out)
MPP_RET ret = MPP_ERR_UNKNOW; MPP_RET ret = MPP_ERR_UNKNOW;
BitReadCtx_t tmp_ctx = *bitctx; BitReadCtx_t tmp_ctx = *bitctx;
ret = mpp_read_longbits(bitctx, num_bits, out); ret = mpp_read_longbits(&tmp_ctx, num_bits, out);
memcpy(bitctx, &tmp_ctx, sizeof(BitReadCtx_t));
return ret; return ret;
} }