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

[h264e_rkv]: Implement OSD function

Browse Source 
1. add description for OSD cmd in rk_mpi_cmd.h
2. judge if input MppBuffer for OSD is NULL

Change-Id: I6d674c81790d9cf57acdfa23f20c929b56f263e9
Signed-off-by: Lin Kesheng <lks@rock-chips.com>
This commit is contained in:
Lin Kesheng
2016-10-08 14:39:11 +08:00
parent 089660baa8
commit f04d6604f7
2 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
inc/rk_mpi_cmd.h
View File

@@ -77,8 +77,8 @@ typedef enum {
MPP_ENC_GET_RC_CFG,
MPP_ENC_SET_PREP_CFG,
MPP_ENC_GET_PREP_CFG,
MPP_ENC_SET_OSD_PLT_CFG,
MPP_ENC_SET_OSD_DATA_CFG,
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_CFG,
MPP_ENC_GET_CFG,

74
mpp/hal/rkenc/h264e/hal_h264e_rkv.c
View File

@@ -2882,47 +2882,55 @@ MPP_RET hal_h264e_rkv_set_roi_regs(h264e_rkv_reg_set *regs, h264e_syntax *syn, M
MPP_RET hal_h264e_rkv_set_osd_regs(h264e_hal_context *ctx, h264e_rkv_reg_set *regs)
{
#define H264E_DEFAULT_OSD_INV_THR 15 //TODO: open interface later
RK_U32 k = 0;
MppEncOSDData *osd_data = &ctx->osd_data;
RK_U32 num = osd_data->num_region;
MppEncOSDRegion *region = osd_data->region;
RK_U32 buf_fd = mpp_buffer_get_fd(osd_data->buf);
regs->swreg65.osd_clk_sel = 1;
regs->swreg65.osd_plt_type = ctx->osd_plt_type;
if (osd_data->buf) {
for (k = 0; k < num; k++) {
regs->swreg65.osd_en |= region[k].enable << k;
regs->swreg65.osd_inv |= region[k].inverse << k;
RK_S32 buf_fd = mpp_buffer_get_fd(osd_data->buf);
if (region[k].enable) {
regs->swreg67_osd_pos[k].lt_pos_x = region[k].start_mb_x;
regs->swreg67_osd_pos[k].lt_pos_y = region[k].start_mb_y;
regs->swreg67_osd_pos[k].rd_pos_x = region[k].start_mb_x + region[k].num_mb_x - 1;
regs->swreg67_osd_pos[k].rd_pos_y = region[k].start_mb_y + region[k].num_mb_y - 1;
if (buf_fd >= 0) {
regs->swreg68_indx_addr_i[k] = buf_fd | (region[k].buf_offset << 10);
RK_U32 k = 0;
RK_U32 num = osd_data->num_region;
MppEncOSDRegion *region = osd_data->region;
regs->swreg65.osd_clk_sel = 1;
regs->swreg65.osd_plt_type = ctx->osd_plt_type;
for (k = 0; k < num; k++) {
regs->swreg65.osd_en |= region[k].enable << k;
regs->swreg65.osd_inv |= region[k].inverse << k;
if (region[k].enable) {
regs->swreg67_osd_pos[k].lt_pos_x = region[k].start_mb_x;
regs->swreg67_osd_pos[k].lt_pos_y = region[k].start_mb_y;
regs->swreg67_osd_pos[k].rd_pos_x = region[k].start_mb_x + region[k].num_mb_x - 1;
regs->swreg67_osd_pos[k].rd_pos_y = region[k].start_mb_y + region[k].num_mb_y - 1;
regs->swreg68_indx_addr_i[k] = buf_fd | (region[k].buf_offset << 10);
}
}
if (region[0].inverse)
regs->swreg66.osd_inv_r0 = H264E_DEFAULT_OSD_INV_THR;
if (region[1].inverse)
regs->swreg66.osd_inv_r1 = H264E_DEFAULT_OSD_INV_THR;
if (region[2].inverse)
regs->swreg66.osd_inv_r2 = H264E_DEFAULT_OSD_INV_THR;
if (region[3].inverse)
regs->swreg66.osd_inv_r3 = H264E_DEFAULT_OSD_INV_THR;
if (region[4].inverse)
regs->swreg66.osd_inv_r4 = H264E_DEFAULT_OSD_INV_THR;
if (region[5].inverse)
regs->swreg66.osd_inv_r5 = H264E_DEFAULT_OSD_INV_THR;
if (region[6].inverse)
regs->swreg66.osd_inv_r6 = H264E_DEFAULT_OSD_INV_THR;
if (region[7].inverse)
regs->swreg66.osd_inv_r7 = H264E_DEFAULT_OSD_INV_THR;
}
}
if (region[0].inverse)
regs->swreg66.osd_inv_r0 = H264E_DEFAULT_OSD_INV_THR;
if (region[1].inverse)
regs->swreg66.osd_inv_r1 = H264E_DEFAULT_OSD_INV_THR;
if (region[2].inverse)
regs->swreg66.osd_inv_r2 = H264E_DEFAULT_OSD_INV_THR;
if (region[3].inverse)
regs->swreg66.osd_inv_r3 = H264E_DEFAULT_OSD_INV_THR;
if (region[4].inverse)
regs->swreg66.osd_inv_r4 = H264E_DEFAULT_OSD_INV_THR;
if (region[5].inverse)
regs->swreg66.osd_inv_r5 = H264E_DEFAULT_OSD_INV_THR;
if (region[6].inverse)
regs->swreg66.osd_inv_r6 = H264E_DEFAULT_OSD_INV_THR;
if (region[7].inverse)
regs->swreg66.osd_inv_r7 = H264E_DEFAULT_OSD_INV_THR;
return MPP_OK;
}