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

[h264d] H264D_DBG_WRITE_TS_EN rename H264D_DBG_WRITE_ES_EN;

Browse Source 
[avsd]  remove warning

git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@741 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
DingWei
2016-05-12 08:31:31 +00:00
parent 25f0206a4c
commit 8a4bff917a
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mpp/codec/dec/avs/avsd_api.c
View File

@@ -296,6 +296,7 @@ MPP_RET avsd_reset(void *decoder)
AVSD_PARSE_TRACE("In."); AVSD_PARSE_TRACE("In.");
AVSD_PARSE_TRACE("Out."); AVSD_PARSE_TRACE("Out.");
(void)p_dec;
(void)decoder; (void)decoder;
return ret = MPP_OK; return ret = MPP_OK;
} }
@@ -314,6 +315,7 @@ MPP_RET avsd_flush(void *decoder)
AVSD_PARSE_TRACE("Out."); AVSD_PARSE_TRACE("Out.");
(void)p_dec;
(void)decoder; (void)decoder;
return ret = MPP_OK; return ret = MPP_OK;
} }
@@ -418,7 +420,8 @@ MPP_RET avsd_parse(void *decoder, HalDecTask *task)
p_s = mpp_time(); p_s = mpp_time();
task->valid = 0; task->valid = 0;
memset(task->refer, -1, sizeof(task->refer)); memset(task->refer, -1, sizeof(task->refer));
lib_avsd_decode_one_frame(p_dec->libdec, &task->valid);
lib_avsd_decode_one_frame(p_dec->libdec, (RK_S32 *)&task->valid);
mpp_log("[out_frame] task->valid=%d", task->valid); mpp_log("[out_frame] task->valid=%d", task->valid);
if (task->flags.eos) { if (task->flags.eos) {
avsd_flush(decoder); avsd_flush(decoder);

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

@@ -155,7 +155,7 @@ static MPP_RET init_input_ctx(H264dInputCtx_t *p_Inp, ParserCfg *init)
p_Inp->init = *init; p_Inp->init = *init;
mpp_env_get_u32("rkv_h264d_mvc_disable", &p_Inp->mvc_disable, 1); mpp_env_get_u32("rkv_h264d_mvc_disable", &p_Inp->mvc_disable, 1);
open_stream_file(p_Inp, "/sdcard"); open_stream_file(p_Inp, "/sdcard");
if (rkv_h264d_parse_debug & H264D_DBG_WRITE_TS_EN) { if (rkv_h264d_parse_debug & H264D_DBG_WRITE_ES_EN) {
p_Inp->spspps_size = HEAD_BUF_MAX_SIZE; p_Inp->spspps_size = HEAD_BUF_MAX_SIZE;
p_Inp->spspps_buf = mpp_malloc_size(RK_U8, p_Inp->spspps_size); p_Inp->spspps_buf = mpp_malloc_size(RK_U8, p_Inp->spspps_size);
MEM_CHECK(ret, p_Inp->spspps_buf); MEM_CHECK(ret, p_Inp->spspps_buf);
@@ -399,8 +399,6 @@ MPP_RET h264d_init(void *decoder, ParserCfg *init)
// init logctx // init logctx
FUN_CHECK(ret = logctx_init(&p_Dec->logctx, p_Dec->logctxbuf)); FUN_CHECK(ret = logctx_init(&p_Dec->logctx, p_Dec->logctxbuf));
mpp_env_get_u32("rkv_h264d_debug", &rkv_h264d_parse_debug, H264D_DBG_ERROR); mpp_env_get_u32("rkv_h264d_debug", &rkv_h264d_parse_debug, H264D_DBG_ERROR);
FunctionIn(p_Dec->logctx.parr[RUN_PARSE]); FunctionIn(p_Dec->logctx.parr[RUN_PARSE]);
//!< get init frame_slots and packet_slots //!< get init frame_slots and packet_slots
p_Dec->frame_slots = init->frame_slots; p_Dec->frame_slots = init->frame_slots;
@@ -721,6 +719,7 @@ MPP_RET h264d_parse(void *decoder, HalDecTask *in_task)
in_task->syntax.data = (void *)p_Dec->dxva_ctx->syn.buf; in_task->syntax.data = (void *)p_Dec->dxva_ctx->syn.buf;
in_task->flags.dpb_error = p_err->dpb_err_flag; in_task->flags.dpb_error = p_err->dpb_err_flag;
in_task->flags.used_for_ref = p_err->used_ref_flag; in_task->flags.used_for_ref = p_err->used_ref_flag;
} }
__RETURN: __RETURN:
FunctionOut(p_Dec->logctx.parr[RUN_PARSE]); FunctionOut(p_Dec->logctx.parr[RUN_PARSE]);

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

@@ -367,7 +367,7 @@ static MPP_RET store_cur_nalu(H264dCurCtx_t *p_Cur, H264dCurStream_t *p_strm, H2
memcpy(p_des + sizeof(g_start_precode), p_strm->nalu_buf, p_strm->nalu_len); memcpy(p_des + sizeof(g_start_precode), p_strm->nalu_buf, p_strm->nalu_len);
dxva_ctx->strm_offset += add_size; dxva_ctx->strm_offset += add_size;
} }
if (rkv_h264d_parse_debug & H264D_DBG_WRITE_TS_EN) { if (rkv_h264d_parse_debug & H264D_DBG_WRITE_ES_EN) {
H264dInputCtx_t *p_Inp = p_Cur->p_Inp; H264dInputCtx_t *p_Inp = p_Cur->p_Inp;
if ((p_strm->nalu_type == NALU_TYPE_SPS) if ((p_strm->nalu_type == NALU_TYPE_SPS)
|| (p_strm->nalu_type == NALU_TYPE_PPS)) { || (p_strm->nalu_type == NALU_TYPE_PPS)) {
@@ -462,7 +462,7 @@ static RK_U64 global_flie_size = 0;
*/ */
MPP_RET open_stream_file(H264dInputCtx_t *p_Inp, char *path) MPP_RET open_stream_file(H264dInputCtx_t *p_Inp, char *path)
{ {
if (rkv_h264d_parse_debug & H264D_DBG_WRITE_TS_EN) { if (rkv_h264d_parse_debug & H264D_DBG_WRITE_ES_EN) {
sprintf(p_Inp->fname[0], "%s/rkv_h264d_file_00.h264", path); sprintf(p_Inp->fname[0], "%s/rkv_h264d_file_00.h264", path);
sprintf(p_Inp->fname[1], "%s/rkv_h264d_file_01.h264", path); sprintf(p_Inp->fname[1], "%s/rkv_h264d_file_01.h264", path);
@@ -484,7 +484,7 @@ MPP_RET open_stream_file(H264dInputCtx_t *p_Inp, char *path)
*/ */
MPP_RET fwrite_stream_to_file(H264dInputCtx_t *p_Inp, RK_U8 *pdata, RK_U32 len) MPP_RET fwrite_stream_to_file(H264dInputCtx_t *p_Inp, RK_U8 *pdata, RK_U32 len)
{ {
if (p_Inp->fp && (rkv_h264d_parse_debug & H264D_DBG_WRITE_TS_EN)) { if (p_Inp->fp && (rkv_h264d_parse_debug & H264D_DBG_WRITE_ES_EN)) {
if (p_Inp->fp) { if (p_Inp->fp) {
fwrite(pdata, sizeof(RK_U8), len, p_Inp->fp); fwrite(pdata, sizeof(RK_U8), len, p_Inp->fp);
fflush(p_Inp->fp); fflush(p_Inp->fp);
@@ -515,7 +515,7 @@ MPP_RET fwrite_stream_to_file(H264dInputCtx_t *p_Inp, RK_U8 *pdata, RK_U32 len)
*/ */
MPP_RET close_stream_file(H264dInputCtx_t *p_Inp) MPP_RET close_stream_file(H264dInputCtx_t *p_Inp)
{ {
if (rkv_h264d_parse_debug & H264D_DBG_WRITE_TS_EN) { if (rkv_h264d_parse_debug & H264D_DBG_WRITE_ES_EN) {
if (p_Inp->fp) { if (p_Inp->fp) {
fflush(p_Inp->fp); fflush(p_Inp->fp);
FCLOSE(p_Inp->fp); FCLOSE(p_Inp->fp);

2
mpp/common/h264d_log.h
View File

@@ -46,7 +46,7 @@
#define H264D_DBG_SEI (0x00004000) #define H264D_DBG_SEI (0x00004000)
#define H264D_DBG_CALLBACK (0x00008000) #define H264D_DBG_CALLBACK (0x00008000)
#define H264D_DBG_WRITE_TS_EN (0x00010000) //!< write input ts stream #define H264D_DBG_WRITE_ES_EN (0x00010000) //!< write input ts stream
#define H264D_DBG_FIELD_PAIRED (0x00020000) #define H264D_DBG_FIELD_PAIRED (0x00020000)
#define H264D_DBG_DISCONTINUOUS (0x00040000) #define H264D_DBG_DISCONTINUOUS (0x00040000)
#define H264D_DBG_ERR_DUMP (0x00080000) #define H264D_DBG_ERR_DUMP (0x00080000)