package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-24 01:23:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[h264d]: updated appropriate function name

Browse Source 
Change-Id: I84c93d414fdcfc350454b33ba9ce051d82dd60dc
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
This commit is contained in:
Ding Wei
2018-05-03 09:48:59 +08:00
parent d3e0413394
commit 3f9d60aa7c
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mpp/codec/dec/h264/h264d_api.c
View File

@@ -539,14 +539,14 @@ MPP_RET h264d_prepare(void *decoder, MppPacket pkt, HalDecTask *task)
RK_U8 *pdata = p_Inp->in_buf; RK_U8 *pdata = p_Inp->in_buf;
p_Inp->is_nalff = (p_Inp->in_length > 3) && (pdata[0] && pdata[1]); p_Inp->is_nalff = (p_Inp->in_length > 3) && (pdata[0] && pdata[1]);
if (p_Inp->is_nalff) { 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; goto __RETURN;
} }
} }
H264D_DBG(H264D_DBG_INPUT, "[pkt_in_timeUs] is_avcC=%d, in_pts=%lld, pkt_eos=%d, len=%d, pkt_no=%d", 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); 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) { 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 task->valid = p_Inp->task_valid; //!< prepare valid flag
} else { } else {
fwrite_stream_to_file(p_Inp, p_Inp->in_buf, (RK_U32)p_Inp->in_length); fwrite_stream_to_file(p_Inp, p_Inp->in_buf, (RK_U32)p_Inp->in_length);

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

@@ -681,10 +681,10 @@ __FAILED:
/*! /*!
*********************************************************************** ***********************************************************************
* \brief * \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; RK_S32 i = 0;
MPP_RET ret = MPP_ERR_UNKNOW; MPP_RET ret = MPP_ERR_UNKNOW;
@@ -746,10 +746,10 @@ __FAILED:
/*! /*!
*********************************************************************** ***********************************************************************
* \brief * \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; MPP_RET ret = MPP_ERR_UNKNOW;

4
mpp/codec/dec/h264/h264d_parse.h
View File

@@ -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_loop(H264_DecCtx_t *p_Dec);
MPP_RET parse_prepare(H264dInputCtx_t *p_Inp, H264dCurCtx_t *p_Cur); 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_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_avcC_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_data(H264dInputCtx_t *p_Inp, H264dCurCtx_t *p_Cur);
#ifdef __cplusplus #ifdef __cplusplus
} }