From 0547a740feea71bc21d4260b41ee4bc10e6d4f63 Mon Sep 17 00:00:00 2001 From: Herman Chen Date: Wed, 27 Nov 2019 15:57:42 +0800 Subject: [PATCH] [mpi]: Add better sync call to get encoder header Change-Id: Ibbd9b4ee178b0994f3c86738cd623eaffd2bca0f Signed-off-by: Herman Chen --- inc/rk_mpi_cmd.h | 4 ++-- mpp/hal/rkenc/h264e/hal_h264e_rkv.c | 2 +- mpp/hal/vpu/h264e/hal_h264e_vepu1.c | 2 +- mpp/hal/vpu/h264e/hal_h264e_vepu2.c | 2 +- mpp/hal/vpu/h265e/hal_h265e_vepu22.c | 4 ++-- mpp/hal/vpu/jpege/hal_jpege_vepu1.c | 2 +- mpp/hal/vpu/jpege/hal_jpege_vepu2.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/inc/rk_mpi_cmd.h b/inc/rk_mpi_cmd.h index 53f0e3ad..4472be14 100644 --- a/inc/rk_mpi_cmd.h +++ b/inc/rk_mpi_cmd.h @@ -109,8 +109,8 @@ typedef enum { MPP_ENC_SET_OSD_PLT_CFG, /* set OSD palette, parameter should be pointer to MppEncOSDPlt */ MPP_ENC_SET_OSD_DATA_CFG, /* set OSD data with at most 8 regions, parameter should be pointer to MppEncOSDData */ MPP_ENC_GET_OSD_CFG, - MPP_ENC_SET_EXTRA_INFO, - MPP_ENC_GET_EXTRA_INFO, /* get vps / sps / pps from hal */ + MPP_ENC_GET_HDR_SYNC, /* get vps / sps / pps which has better sync behavior parameter is MppPacket */ + MPP_ENC_GET_EXTRA_INFO, /* deprecated */ MPP_ENC_SET_SEI_CFG, /* SEI: Supplement Enhancemant Information, parameter is MppSeiMode */ MPP_ENC_GET_SEI_DATA, /* SEI: Supplement Enhancemant Information, parameter is MppPacket */ MPP_ENC_PRE_ALLOC_BUFF, /* allocate buffers before encoding */ diff --git a/mpp/hal/rkenc/h264e/hal_h264e_rkv.c b/mpp/hal/rkenc/h264e/hal_h264e_rkv.c index 321fe87d..97b058de 100644 --- a/mpp/hal/rkenc/h264e/hal_h264e_rkv.c +++ b/mpp/hal/rkenc/h264e/hal_h264e_rkv.c @@ -1828,7 +1828,7 @@ MPP_RET hal_h264e_rkv_control(void *hal, MpiCmd cmd_type, void *param) h264e_hal_dbg(H264E_DBG_DETAIL, "h264e_rkv_control cmd 0x%x, info %p", cmd_type, param); switch (cmd_type) { - case MPP_ENC_SET_EXTRA_INFO: { + case MPP_ENC_GET_HDR_SYNC: { break; } case MPP_ENC_GET_EXTRA_INFO: { diff --git a/mpp/hal/vpu/h264e/hal_h264e_vepu1.c b/mpp/hal/vpu/h264e/hal_h264e_vepu1.c index 41306c0e..4c16a46e 100644 --- a/mpp/hal/vpu/h264e/hal_h264e_vepu1.c +++ b/mpp/hal/vpu/h264e/hal_h264e_vepu1.c @@ -630,7 +630,7 @@ MPP_RET hal_h264e_vepu1_control(void *hal, MpiCmd cmd_type, void *param) h264e_hal_dbg(H264E_DBG_DETAIL, "hal_h264e_vpu_control cmd 0x%x, info %p", cmd_type, param); switch (cmd_type) { - case MPP_ENC_SET_EXTRA_INFO: { + case MPP_ENC_GET_HDR_SYNC: { } break; case MPP_ENC_GET_EXTRA_INFO: { size_t offset = 0; diff --git a/mpp/hal/vpu/h264e/hal_h264e_vepu2.c b/mpp/hal/vpu/h264e/hal_h264e_vepu2.c index 95ac7218..b65a10c2 100644 --- a/mpp/hal/vpu/h264e/hal_h264e_vepu2.c +++ b/mpp/hal/vpu/h264e/hal_h264e_vepu2.c @@ -656,7 +656,7 @@ MPP_RET hal_h264e_vepu2_control(void *hal, MpiCmd cmd_type, void *param) h264e_hal_dbg(H264E_DBG_DETAIL, "h264e_vpu_control cmd 0x%x, info %p", cmd_type, param); switch (cmd_type) { - case MPP_ENC_SET_EXTRA_INFO: { + case MPP_ENC_GET_HDR_SYNC: { } break; case MPP_ENC_GET_EXTRA_INFO: { MppPacket pkt = ctx->packeted_param; diff --git a/mpp/hal/vpu/h265e/hal_h265e_vepu22.c b/mpp/hal/vpu/h265e/hal_h265e_vepu22.c index 0e51a425..97666da2 100644 --- a/mpp/hal/vpu/h265e/hal_h265e_vepu22.c +++ b/mpp/hal/vpu/h265e/hal_h265e_vepu22.c @@ -2122,8 +2122,8 @@ MPP_RET hal_h265e_vepu22_control(void *hal, MpiCmd cmd_type, void *param) hal_h265e_dbg_func("enter hal %p,cmd = %d\n", hal, cmd_type); switch (cmd_type) { - case MPP_ENC_SET_EXTRA_INFO: { - hal_h265e_dbg_input("MPP_ENC_SET_EXTRA_INFO\n"); + case MPP_ENC_GET_HDR_SYNC: { + hal_h265e_dbg_input("MPP_ENC_GET_HDR_SYNC\n"); break; } diff --git a/mpp/hal/vpu/jpege/hal_jpege_vepu1.c b/mpp/hal/vpu/jpege/hal_jpege_vepu1.c index d1a50b8d..f0e0e58a 100644 --- a/mpp/hal/vpu/jpege/hal_jpege_vepu1.c +++ b/mpp/hal/vpu/jpege/hal_jpege_vepu1.c @@ -566,7 +566,7 @@ MPP_RET hal_jpege_vepu1_control(void *hal, MpiCmd cmd, void *param) case MPP_ENC_SET_OSD_PLT_CFG: case MPP_ENC_SET_OSD_DATA_CFG: case MPP_ENC_GET_OSD_CFG: - case MPP_ENC_SET_EXTRA_INFO: + case MPP_ENC_GET_HDR_SYNC: case MPP_ENC_GET_EXTRA_INFO: case MPP_ENC_GET_SEI_DATA: case MPP_ENC_SET_SEI_CFG: diff --git a/mpp/hal/vpu/jpege/hal_jpege_vepu2.c b/mpp/hal/vpu/jpege/hal_jpege_vepu2.c index 2a49b385..2d6e1eb1 100644 --- a/mpp/hal/vpu/jpege/hal_jpege_vepu2.c +++ b/mpp/hal/vpu/jpege/hal_jpege_vepu2.c @@ -546,7 +546,7 @@ MPP_RET hal_jpege_vepu2_control(void *hal, MpiCmd cmd, void *param) case MPP_ENC_SET_OSD_PLT_CFG: case MPP_ENC_SET_OSD_DATA_CFG: case MPP_ENC_GET_OSD_CFG: - case MPP_ENC_SET_EXTRA_INFO: + case MPP_ENC_GET_HDR_SYNC: case MPP_ENC_GET_EXTRA_INFO: case MPP_ENC_GET_SEI_DATA: case MPP_ENC_SET_SEI_CFG: