package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-09-29 22:42:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: Rename Dolby for sdk release requirement

Browse Source 
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: Ia5293f7963937ce57c123590abc32d208d181602
This commit is contained in:
Herman Chen
2025-08-11 09:58:48 +08:00
parent 45246e9c89
commit a91e70bd23
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
inc/rk_hdr_meta_com.h
View File

@@ -39,7 +39,7 @@ typedef enum HdrFormat_e {
HDR10PLUS = 8, HDR10PLUS = 8,
// RESERVED9 = 9, //reserved for hdr10+ // RESERVED9 = 9, //reserved for hdr10+
// RESERVED10 = 10,//reserved for hdr10+ // RESERVED10 = 10,//reserved for hdr10+
DOLBY = 11, DLBY = 11,
// RESERVED12 = 12, //reserved for other dynamic hdr format // RESERVED12 = 12, //reserved for other dynamic hdr format
// RESERVED13 = 13, //reserved for other dynamic hdr format // RESERVED13 = 13, //reserved for other dynamic hdr format
HDR_FORMAT_MAX, HDR_FORMAT_MAX,
@@ -102,7 +102,7 @@ typedef struct RkMetaHdrHeader_t {
/* For payload identification */ /* For payload identification */
RK_U16 version; /* payload structure version */ 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 hdr_payload_type; /* HDR data type: static data, dynamic data ... */
RK_U16 video_format; /* video format: H.264, H.265, AVS2 ... */ RK_U16 video_format; /* video format: H.264, H.265, AVS2 ... */

2
inc/vpu_api.h
View File

@@ -53,7 +53,7 @@
#define VPU_OUTPUT_FORMAT_DYNCRANGE_SDR (0x00000000) #define VPU_OUTPUT_FORMAT_DYNCRANGE_SDR (0x00000000)
#define VPU_OUTPUT_FORMAT_DYNCRANGE_HDR10 (0x01000000) #define VPU_OUTPUT_FORMAT_DYNCRANGE_HDR10 (0x01000000)
#define VPU_OUTPUT_FORMAT_DYNCRANGE_HDR_HLG (0x02000000) #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 * @brief input picture type

2
mpp/codec/dec/av1/av1d_cbs.c
View File

@@ -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->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", av1d_dbg(AV1D_DBG_STRMIN, "dlby rpu size %d -> %d\n",
emdf_payload_size, hdr_dynamic_meta->size); emdf_payload_size, hdr_dynamic_meta->size);

8
mpp/codec/dec/h264/h264d_parse.c
View File

@@ -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; MppFrameHdrDynamicMeta *hdr_dynamic_meta = p_Cur->hdr_dynamic_meta;
if (hdr_fmt == DOLBY) if (hdr_fmt == DLBY)
size += 4; size += 4;
if (hdr_dynamic_meta && (hdr_dynamic_meta->size < size)) { 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 (size && data) {
if (hdr_fmt == DOLBY) { if (hdr_fmt == DLBY) {
RK_U8 start_code[4] = {0, 0, 0, 1}; RK_U8 start_code[4] = {0, 0, 0, 1};
memcpy((RK_U8*)hdr_dynamic_meta->data, start_code, 4); 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; 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) 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) { if (h264d_debug & H264D_DBG_WRITE_ES_EN) {
H264dInputCtx_t *p_Inp = p_Cur->p_Inp; H264dInputCtx_t *p_Inp = p_Cur->p_Inp;

6
mpp/codec/dec/h265/h265d_parser.c
View File

@@ -1752,7 +1752,7 @@ void mpp_hevc_fill_dynamic_meta(HEVCContext *s, const RK_U8 *data, RK_U32 size,
} }
if (size && data) { if (size && data) {
switch (hdr_fmt) { switch (hdr_fmt) {
case DOLBY: { case DLBY: {
RK_U8 start_code[4] = {0, 0, 0, 1}; RK_U8 start_code[4] = {0, 0, 0, 1};
memcpy((RK_U8*)hdr_dynamic_meta->data, start_code, 4); 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. * 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 * 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. * to the end of an AU; they are the last non-EOB/EOS NAL in the AU.
*/ */
if (nal_unit_type == NAL_UNSPEC62) 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; return 0;
__BITREAD_ERR: __BITREAD_ERR: