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

[hal_h264e_rkv]: fix bugs in hal test

Browse Source 
1. do not fix input_image_format while validate syntax,
   now yuv420sp and yuv420p are both supported in test case.
2. change the hw_buf type from MppBuffer* to MppBuffer when dump stream.

Change-Id: Icf6b408e0ccaf07812c5cb2077101ede39d60c5a
Signed-off-by: Lin Kesheng <lks@rock-chips.com>
This commit is contained in:
Lin Kesheng
2016-09-08 10:24:51 +08:00
parent e5dd9eddb0
commit ad303826da
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@
#include "hal_h264e.h" #include "hal_h264e.h"
#include "hal_h264e_rkv.h" #include "hal_h264e_rkv.h"
#define RKVENC_DUMP_INFO 0 #define RKVENC_DUMP_INFO 0
#define RKVENC_FRAME_TYPE_AUTO 0x0000 /* Let x264 choose the right type */ #define RKVENC_FRAME_TYPE_AUTO 0x0000 /* Let x264 choose the right type */
#define RKVENC_FRAME_TYPE_IDR 0x0001 #define RKVENC_FRAME_TYPE_IDR 0x0001
@@ -808,7 +808,7 @@ static void hal_h264e_rkv_dump_mpp_strm_out_header(h264e_hal_context *ctx, MppPa
} }
void hal_h264e_rkv_dump_mpp_strm_out(h264e_hal_context *ctx, MppBuffer *hw_buf) void hal_h264e_rkv_dump_mpp_strm_out(h264e_hal_context *ctx, MppBuffer hw_buf)
{ {
#if RKVENC_DUMP_INFO #if RKVENC_DUMP_INFO
h264e_hal_rkv_dump_files *dump_files = (h264e_hal_rkv_dump_files *)ctx->dump_files; h264e_hal_rkv_dump_files *dump_files = (h264e_hal_rkv_dump_files *)ctx->dump_files;
@@ -822,13 +822,13 @@ void hal_h264e_rkv_dump_mpp_strm_out(h264e_hal_context *ctx, MppBuffer *hw_buf)
h264e_rkv_ioctl_output_elem *out_elem = ioctl_output->elem; h264e_rkv_ioctl_output_elem *out_elem = ioctl_output->elem;
RK_U32 frame_num = ioctl_output->frame_num; RK_U32 frame_num = ioctl_output->frame_num;
h264e_hal_log_file("dump %d frames strm out below", frame_num); h264e_hal_log_file("dump %d frames strm out below", frame_num);
for (k = 0; k < frame_num; k++) { for (k = 0; k < frame_num; k++) {
strm_size = (RK_U32)out_elem[k].swreg69.bs_lgth; strm_size = (RK_U32)out_elem[k].swreg69.bs_lgth;
hw_buf_vir_addr = (RK_U8 *)mpp_buffer_get_ptr(hw_buf[k]); hw_buf_vir_addr = (RK_U8 *)mpp_buffer_get_ptr(hw_buf);
sw_buf = mpp_malloc(RK_U8, strm_size); sw_buf = mpp_malloc(RK_U8, strm_size);
h264e_hal_log_file("dump frame %d, fd %d, strm_size: %d", k, mpp_buffer_get_fd(hw_buf[k]), strm_size); h264e_hal_log_file("dump frame %d, fd %d, strm_size: %d", k, mpp_buffer_get_fd(hw_buf), strm_size);
memcpy(sw_buf, hw_buf_vir_addr, strm_size); memcpy(sw_buf, hw_buf_vir_addr, strm_size);
@@ -838,9 +838,6 @@ void hal_h264e_rkv_dump_mpp_strm_out(h264e_hal_context *ctx, MppBuffer *hw_buf)
mpp_free(sw_buf); mpp_free(sw_buf);
} }
fflush(fp); fflush(fp);
(void)hw_buf;
} else { } else {
h264e_hal_log_file("try to dump data to mpp_strm_out.txt, but file is not opened"); h264e_hal_log_file("try to dump data to mpp_strm_out.txt, but file is not opened");
} }
@@ -2638,7 +2635,6 @@ MPP_RET hal_h264e_rkv_set_ioctl_extra_info(h264e_rkv_ioctl_extra_info *extra_inf
info = &extra_info->elem[1]; info = &extra_info->elem[1];
info->reg_idx = 72; info->reg_idx = 72;
info->offset = frame_size * 5 / 4; //TODO: relevant with YUV format info->offset = frame_size * 5 / 4; //TODO: relevant with YUV format
return MPP_OK; return MPP_OK;
} }
@@ -2653,7 +2649,6 @@ static MPP_RET hal_h264e_rkv_validate_syntax(h264e_syntax *syn, h264e_hal_rkv_cs
/* adjust */ /* adjust */
*src_fmt = hal_h264e_rkv_convert_csp(input_image_format); *src_fmt = hal_h264e_rkv_convert_csp(input_image_format);
syn->input_image_format = src_fmt->fmt; syn->input_image_format = src_fmt->fmt;
syn->input_image_format = H264E_RKV_CSP_YUV420SP; //TODO: removed later
syn->input_cb_addr = syn->input_luma_addr; syn->input_cb_addr = syn->input_luma_addr;
syn->input_cr_addr = syn->input_luma_addr; syn->input_cr_addr = syn->input_luma_addr;
@@ -2715,8 +2710,8 @@ MPP_RET hal_h264e_rkv_set_rc_regs(h264e_rkv_reg_set *regs, h264e_syntax *syn,
regs->swreg54.rc_fact1 = 8; //sw_quality_factor_1; regs->swreg54.rc_fact1 = 8; //sw_quality_factor_1;
regs->swreg54.Reserved = 0x0; regs->swreg54.Reserved = 0x0;
regs->swreg54.rc_qp_range = 4; //sw_rc_clip_qp_range; regs->swreg54.rc_qp_range = 4; //sw_rc_clip_qp_range;
regs->swreg54.rc_max_qp = 40; regs->swreg54.rc_max_qp = 40;
regs->swreg54.rc_min_qp = 20; regs->swreg54.rc_min_qp = 20;
regs->swreg55.ctu_ebits = mb_target_size; //sw_ctu_target_bits; regs->swreg55.ctu_ebits = mb_target_size; //sw_ctu_target_bits;
} else { } else {
@@ -2982,7 +2977,6 @@ MPP_RET hal_h264e_rkv_set_pp_regs(h264e_rkv_reg_set *regs, h264e_syntax *syn, Mp
regs->swreg23.src_ystrid = stridey; //syn->swreg23.src_ystrid; regs->swreg23.src_ystrid = stridey; //syn->swreg23.src_ystrid;
regs->swreg23.src_cstrid = stridec; //syn->swreg23.src_cstrid; ////YUV420 planar; regs->swreg23.src_cstrid = stridec; //syn->swreg23.src_cstrid; ////YUV420 planar;
(void)test; (void)test;
} }
@@ -3119,8 +3113,7 @@ MPP_RET hal_h264e_rkv_gen_regs(void *hal, HalTaskInfo *task)
regs->swreg24_adr_srcy = syn->input_luma_addr; //syn->addr_cfg.adr_srcy; regs->swreg24_adr_srcy = syn->input_luma_addr; //syn->addr_cfg.adr_srcy;
regs->swreg25_adr_srcu = syn->input_cb_addr; //syn->addr_cfg.adr_srcu; regs->swreg25_adr_srcu = syn->input_cb_addr; //syn->addr_cfg.adr_srcu;
regs->swreg26_adr_srcv = syn->input_cr_addr; //syn->addr_cfg.adr_srcv; regs->swreg26_adr_srcv = syn->input_cr_addr; //syn->addr_cfg.adr_srcv;
hal_h264e_rkv_set_roi_regs(regs, syn, bufs->hw_roi_buf[mul_buf_idx], ctx->frame_cnt, test_cfg); hal_h264e_rkv_set_roi_regs(regs, syn, bufs->hw_roi_buf[mul_buf_idx], ctx->frame_cnt, test_cfg);
regs->swreg30_rfpw_addr = mpp_buffer_get_fd(dpb_ctx->fdec->hw_buf);//syn->addr_cfg.rfpw_addr; //TODO: extend recon luma buf regs->swreg30_rfpw_addr = mpp_buffer_get_fd(dpb_ctx->fdec->hw_buf);//syn->addr_cfg.rfpw_addr; //TODO: extend recon luma buf