mirror of
https://github.com/nyanmisaka/mpp.git
synced 2025-10-15 13:40:39 +08:00
fix[av1d_cbs]: fix read 32bit data err
Change-Id: Iea21959289ea1f8ce9e5047cb30b72c41ec57903 Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
This commit is contained in:
@@ -181,7 +181,7 @@ RK_S32 mpp_av1_read_unsigned(BitReadCtx_t *gbc,
|
|||||||
return MPP_NOK;
|
return MPP_NOK;
|
||||||
}
|
}
|
||||||
|
|
||||||
READ_BITS(gbc, width, &value);
|
READ_BITS_LONG(gbc, width, &value);
|
||||||
|
|
||||||
if (value < range_min || value > range_max) {
|
if (value < range_min || value > range_max) {
|
||||||
mpp_err_f("%s out of range: "
|
mpp_err_f("%s out of range: "
|
||||||
@@ -220,7 +220,7 @@ RK_S32 mpp_av1_read_signed(BitReadCtx_t *gbc,
|
|||||||
return MPP_NOK;
|
return MPP_NOK;
|
||||||
}
|
}
|
||||||
|
|
||||||
READ_BITS(gbc, width, &value);
|
READ_BITS_LONG(gbc, width, &value);
|
||||||
value = sign_extend(value, width);
|
value = sign_extend(value, width);
|
||||||
if (value < range_min || value > range_max) {
|
if (value < range_min || value > range_max) {
|
||||||
mpp_err_f("%s out of range: "
|
mpp_err_f("%s out of range: "
|
||||||
@@ -2522,7 +2522,7 @@ static RK_S32 mpp_av1_metadata_obu(AV1Context *ctx, BitReadCtx_t *gb,
|
|||||||
RK_S32 err;
|
RK_S32 err;
|
||||||
|
|
||||||
leb128(metadata_type);
|
leb128(metadata_type);
|
||||||
av1d_dbg(AV1D_DBG_STRMIN, "%s meta type %d\n", __func__, current->metadata_type);
|
av1d_dbg(AV1D_DBG_STRMIN, "%s meta type %lld\n", __func__, current->metadata_type);
|
||||||
switch (current->metadata_type) {
|
switch (current->metadata_type) {
|
||||||
case AV1_METADATA_TYPE_HDR_CLL:
|
case AV1_METADATA_TYPE_HDR_CLL:
|
||||||
CHECK(mpp_av1_metadata_hdr_cll(ctx, gb, ¤t->metadata.hdr_cll));
|
CHECK(mpp_av1_metadata_hdr_cll(ctx, gb, ¤t->metadata.hdr_cll));
|
||||||
@@ -2540,8 +2540,8 @@ static RK_S32 mpp_av1_metadata_obu(AV1Context *ctx, BitReadCtx_t *gb,
|
|||||||
CHECK(mpp_av1_metadata_timecode(ctx, gb, ¤t->metadata.timecode));
|
CHECK(mpp_av1_metadata_timecode(ctx, gb, ¤t->metadata.timecode));
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
// Unknown metadata type.
|
mpp_err_f("unknown metadata type %lld\n", current->metadata_type);
|
||||||
return MPP_OK;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
Reference in New Issue
Block a user