From a91e70bd23b0000d3939cbf7cc8b3d9fa4e9049c Mon Sep 17 00:00:00 2001 From: Herman Chen Date: Mon, 11 Aug 2025 09:58:48 +0800 Subject: [PATCH] chore: Rename Dolby for sdk release requirement Signed-off-by: Herman Chen Change-Id: Ia5293f7963937ce57c123590abc32d208d181602 --- inc/rk_hdr_meta_com.h | 4 ++-- inc/vpu_api.h | 2 +- mpp/codec/dec/av1/av1d_cbs.c | 2 +- mpp/codec/dec/h264/h264d_parse.c | 8 ++++---- mpp/codec/dec/h265/h265d_parser.c | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/inc/rk_hdr_meta_com.h b/inc/rk_hdr_meta_com.h index 02ed8fff..e492b463 100644 --- a/inc/rk_hdr_meta_com.h +++ b/inc/rk_hdr_meta_com.h @@ -39,7 +39,7 @@ typedef enum HdrFormat_e { HDR10PLUS = 8, // RESERVED9 = 9, //reserved for hdr10+ // RESERVED10 = 10,//reserved for hdr10+ - DOLBY = 11, + DLBY = 11, // RESERVED12 = 12, //reserved for other dynamic hdr format // RESERVED13 = 13, //reserved for other dynamic hdr format HDR_FORMAT_MAX, @@ -102,7 +102,7 @@ typedef struct RkMetaHdrHeader_t { /* For payload identification */ RK_U16 version; /* payload structure version */ - RK_U16 hdr_format; /* HDR protocol: HDR10, HLG, Dolby, HDRVivid ... */ + RK_U16 hdr_format; /* HDR protocol: HDR10, HLG, Dlby, HDRVivid ... */ RK_U16 hdr_payload_type; /* HDR data type: static data, dynamic data ... */ RK_U16 video_format; /* video format: H.264, H.265, AVS2 ... */ diff --git a/inc/vpu_api.h b/inc/vpu_api.h index 6d130983..b925a70f 100644 --- a/inc/vpu_api.h +++ b/inc/vpu_api.h @@ -53,7 +53,7 @@ #define VPU_OUTPUT_FORMAT_DYNCRANGE_SDR (0x00000000) #define VPU_OUTPUT_FORMAT_DYNCRANGE_HDR10 (0x01000000) #define VPU_OUTPUT_FORMAT_DYNCRANGE_HDR_HLG (0x02000000) -#define VPU_OUTPUT_FORMAT_DYNCRANGE_HDR_DOLBY (0x03000000) +#define VPU_OUTPUT_FORMAT_DYNCRANGE_HDR_DLBY (0x03000000) /** * @brief input picture type diff --git a/mpp/codec/dec/av1/av1d_cbs.c b/mpp/codec/dec/av1/av1d_cbs.c index df8231e3..0d241de2 100644 --- a/mpp/codec/dec/av1/av1d_cbs.c +++ b/mpp/codec/dec/av1/av1d_cbs.c @@ -2418,7 +2418,7 @@ static RK_S32 mpp_av1_get_dlby_rpu(AV1Context *ctx, BitReadCtx_t *gb) } hdr_dynamic_meta->size = mpp_writer_bytes(&bit_ctx); - hdr_dynamic_meta->hdr_fmt = DOLBY; + hdr_dynamic_meta->hdr_fmt = DLBY; av1d_dbg(AV1D_DBG_STRMIN, "dlby rpu size %d -> %d\n", emdf_payload_size, hdr_dynamic_meta->size); diff --git a/mpp/codec/dec/h264/h264d_parse.c b/mpp/codec/dec/h264/h264d_parse.c index a992accf..d3253727 100644 --- a/mpp/codec/dec/h264/h264d_parse.c +++ b/mpp/codec/dec/h264/h264d_parse.c @@ -342,7 +342,7 @@ void mpp_h264d_fill_dynamic_meta(H264dCurCtx_t *p_Cur, const RK_U8 *data, RK_U32 { MppFrameHdrDynamicMeta *hdr_dynamic_meta = p_Cur->hdr_dynamic_meta; - if (hdr_fmt == DOLBY) + if (hdr_fmt == DLBY) size += 4; if (hdr_dynamic_meta && (hdr_dynamic_meta->size < size)) { @@ -359,7 +359,7 @@ void mpp_h264d_fill_dynamic_meta(H264dCurCtx_t *p_Cur, const RK_U8 *data, RK_U32 } } if (size && data) { - if (hdr_fmt == DOLBY) { + if (hdr_fmt == DLBY) { RK_U8 start_code[4] = {0, 0, 0, 1}; memcpy((RK_U8*)hdr_dynamic_meta->data, start_code, 4); @@ -443,9 +443,9 @@ static MPP_RET store_cur_nalu(H264dCurCtx_t *p_Cur, H264dCurStream_t *p_strm, H2 dxva_ctx->strm_offset += add_size; } - /* Dolby Vision RPUs masquerade as unregistered NALs of type 28. */ + /* Dlby Vision RPUs masquerade as unregistered NALs of type 28. */ if (p_Cur->p_Dec->cfg->base.enable_hdr_meta && p_strm->nalu_type == H264_NALU_TYPE_UNSPECIFIED28) - mpp_h264d_fill_dynamic_meta(p_Cur, p_strm->nalu_buf + 2, p_strm->nalu_len - 2, DOLBY); + mpp_h264d_fill_dynamic_meta(p_Cur, p_strm->nalu_buf + 2, p_strm->nalu_len - 2, DLBY); if (h264d_debug & H264D_DBG_WRITE_ES_EN) { H264dInputCtx_t *p_Inp = p_Cur->p_Inp; diff --git a/mpp/codec/dec/h265/h265d_parser.c b/mpp/codec/dec/h265/h265d_parser.c index b1599432..0e4c2e1a 100644 --- a/mpp/codec/dec/h265/h265d_parser.c +++ b/mpp/codec/dec/h265/h265d_parser.c @@ -1752,7 +1752,7 @@ void mpp_hevc_fill_dynamic_meta(HEVCContext *s, const RK_U8 *data, RK_U32 size, } if (size && data) { switch (hdr_fmt) { - case DOLBY: { + case DLBY: { RK_U8 start_code[4] = {0, 0, 0, 1}; memcpy((RK_U8*)hdr_dynamic_meta->data, start_code, 4); @@ -1797,13 +1797,13 @@ static RK_S32 check_rpus(HEVCContext *s) /* * Check for RPU delimiter. * - * Dolby Vision RPUs masquerade as unregistered NALs of type 62. + * Dlby Vision RPUs masquerade as unregistered NALs of type 62. * * We have to do this check here an create the rpu buffer, since RPUs are appended * to the end of an AU; they are the last non-EOB/EOS NAL in the AU. */ if (nal_unit_type == NAL_UNSPEC62) - mpp_hevc_fill_dynamic_meta(s, nal->data + 2, gb.bytes_left_ + 4, DOLBY); + mpp_hevc_fill_dynamic_meta(s, nal->data + 2, gb.bytes_left_ + 4, DLBY); } return 0; __BITREAD_ERR: