diff --git a/mpp/codec/dec/h264/h264d_api.c b/mpp/codec/dec/h264/h264d_api.c index 9b7a477e..50d445dd 100644 --- a/mpp/codec/dec/h264/h264d_api.c +++ b/mpp/codec/dec/h264/h264d_api.c @@ -539,14 +539,14 @@ MPP_RET h264d_prepare(void *decoder, MppPacket pkt, HalDecTask *task) RK_U8 *pdata = p_Inp->in_buf; p_Inp->is_nalff = (p_Inp->in_length > 3) && (pdata[0] && pdata[1]); if (p_Inp->is_nalff) { - (ret = parse_prepare_extra_header(p_Inp, p_Dec->p_Cur)); + (ret = parse_prepare_avcC_header(p_Inp, p_Dec->p_Cur)); goto __RETURN; } } H264D_DBG(H264D_DBG_INPUT, "[pkt_in_timeUs] is_avcC=%d, in_pts=%lld, pkt_eos=%d, len=%d, pkt_no=%d", p_Inp->is_nalff, p_Inp->in_pts, p_Inp->pkt_eos, p_Inp->in_length, p_Dec->p_Vid->g_framecnt); if (p_Inp->is_nalff) { - (ret = parse_prepare_extra_data(p_Inp, p_Dec->p_Cur)); + (ret = parse_prepare_avcC_data(p_Inp, p_Dec->p_Cur)); task->valid = p_Inp->task_valid; //!< prepare valid flag } else { fwrite_stream_to_file(p_Inp, p_Inp->in_buf, (RK_U32)p_Inp->in_length); diff --git a/mpp/codec/dec/h264/h264d_parse.c b/mpp/codec/dec/h264/h264d_parse.c index 2328722f..f0ce5663 100644 --- a/mpp/codec/dec/h264/h264d_parse.c +++ b/mpp/codec/dec/h264/h264d_parse.c @@ -681,10 +681,10 @@ __FAILED: /*! *********************************************************************** * \brief -* main function for parser extra header +* main function for parser avcC header *********************************************************************** */ -MPP_RET parse_prepare_extra_header(H264dInputCtx_t *p_Inp, H264dCurCtx_t *p_Cur) +MPP_RET parse_prepare_avcC_header(H264dInputCtx_t *p_Inp, H264dCurCtx_t *p_Cur) { RK_S32 i = 0; MPP_RET ret = MPP_ERR_UNKNOW; @@ -746,10 +746,10 @@ __FAILED: /*! *********************************************************************** * \brief -* main function for parser extra data +* main function for parser avcC data *********************************************************************** */ -MPP_RET parse_prepare_extra_data(H264dInputCtx_t *p_Inp, H264dCurCtx_t *p_Cur) +MPP_RET parse_prepare_avcC_data(H264dInputCtx_t *p_Inp, H264dCurCtx_t *p_Cur) { MPP_RET ret = MPP_ERR_UNKNOW; diff --git a/mpp/codec/dec/h264/h264d_parse.h b/mpp/codec/dec/h264/h264d_parse.h index fa77cb3e..4705a22f 100644 --- a/mpp/codec/dec/h264/h264d_parse.h +++ b/mpp/codec/dec/h264/h264d_parse.h @@ -34,8 +34,8 @@ MPP_RET close_stream_file(H264dInputCtx_t *p_Inp); MPP_RET parse_loop(H264_DecCtx_t *p_Dec); MPP_RET parse_prepare(H264dInputCtx_t *p_Inp, H264dCurCtx_t *p_Cur); MPP_RET parse_prepare_fast(H264dInputCtx_t *p_Inp, H264dCurCtx_t *p_Cur); -MPP_RET parse_prepare_extra_header(H264dInputCtx_t *p_Inp, H264dCurCtx_t *p_Cur); -MPP_RET parse_prepare_extra_data(H264dInputCtx_t *p_Inp, H264dCurCtx_t *p_Cur); +MPP_RET parse_prepare_avcC_header(H264dInputCtx_t *p_Inp, H264dCurCtx_t *p_Cur); +MPP_RET parse_prepare_avcC_data(H264dInputCtx_t *p_Inp, H264dCurCtx_t *p_Cur); #ifdef __cplusplus }