From 7f18ba5c10bcaa1e1dc4fe4a17dc9ab6a81d02e3 Mon Sep 17 00:00:00 2001 From: Chitresh Gupta Date: Wed, 29 Mar 2017 19:47:49 +0530 Subject: [PATCH] PASDK-183: minor code cleanup. --- pasdk/common/aspDecOpCircBuf_common.c | 2 +- pasdk/common/aspDecOpCircBuf_common.h | 4 ++-- pasdk/test_arm/framework/aspDecOpCircBuf_slave.c | 10 +++++++--- pasdk/test_dsp/framework/aspDecOpCircBuf_master.c | 4 ++-- pasdk/test_dsp/framework/audioStreamInpProc.c | 12 ++++++------ 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/pasdk/common/aspDecOpCircBuf_common.c b/pasdk/common/aspDecOpCircBuf_common.c index 3448b2f6..a135089f 100644 --- a/pasdk/common/aspDecOpCircBuf_common.c +++ b/pasdk/common/aspDecOpCircBuf_common.c @@ -112,7 +112,7 @@ Int cbReset( // clear PCM data for (i=0; imaxAFChanNum; i++) { - memset(pAfCb->data.sample[i], pCb->maxAFSampCount, 0); + memset(pAfCb->data.sample[i], 0, pCb->maxAFSampCount); } // clear metadata diff --git a/pasdk/common/aspDecOpCircBuf_common.h b/pasdk/common/aspDecOpCircBuf_common.h index a1b36444..207bbdbc 100644 --- a/pasdk/common/aspDecOpCircBuf_common.h +++ b/pasdk/common/aspDecOpCircBuf_common.h @@ -81,8 +81,8 @@ All rights reserved. // DTS - TODO: to update for DTS #define ASP_DECOP_CB_MAX_NUM_AF_DTS ( 10 ) -#define ASP_DECOP_CB_INIT_LAG_DTS ( 3 ) -#define ASP_DECOP_CB_INIT_WRTIDX_DTS ( 1 ) +#define ASP_DECOP_CB_INIT_LAG_DTS ( 2 ) +#define ASP_DECOP_CB_INIT_WRTIDX_DTS ( 3 ) #define ASP_DECOP_CB_INIT_RDIDX_DTS ( 0 ) #define ASP_DECODE_CB_GATE_NAME ( "AspDecOpCbGate" ) diff --git a/pasdk/test_arm/framework/aspDecOpCircBuf_slave.c b/pasdk/test_arm/framework/aspDecOpCircBuf_slave.c index a8261432..7c5d0e66 100644 --- a/pasdk/test_arm/framework/aspDecOpCircBuf_slave.c +++ b/pasdk/test_arm/framework/aspDecOpCircBuf_slave.c @@ -314,14 +314,18 @@ Int cbWriteAf( // prepare metadata buffer pointers according to the metadata and buffer sizes - for (i=1; i < pAfWrt->numPrivateMetadata; i++) + for (i=0; i < pAfWrt->numPrivateMetadata; i++) { - UInt8 *nextMdBuf = (pAfCb->pafPrivateMetadata[i-1].pMdBuf + pAfWrt->pafPrivateMetadata[i-1].size); + UInt8 *nextMdBuf; + if(i == 0) + nextMdBuf = (pAfCb->pafPrivateMetadata[0].pMdBuf + pAfWrt->pafPrivateMetadata[0].size); + else + nextMdBuf = (pAfCb->pafPrivateMetadata[i-1].pMdBuf + pAfWrt->pafPrivateMetadata[i-1].size); if(nextMdBuf >= pCb->metaBufEnd) // metadata buffer overflow { pAfCb->pafPrivateMetadata[i].pMdBuf = pCb->metaBuf; } - else + else if(i != 0) { pAfCb->pafPrivateMetadata[i].pMdBuf = nextMdBuf; } diff --git a/pasdk/test_dsp/framework/aspDecOpCircBuf_master.c b/pasdk/test_dsp/framework/aspDecOpCircBuf_master.c index 2382aa12..fe61bee7 100644 --- a/pasdk/test_dsp/framework/aspDecOpCircBuf_master.c +++ b/pasdk/test_dsp/framework/aspDecOpCircBuf_master.c @@ -156,7 +156,7 @@ Int cbInit( for (i=0; idata.sample[i] = pPcmBuf; - memset(pAfCb->data.sample[i], DEF_DEC_OP_FRAME_LEN, 0); + memset(pAfCb->data.sample[i], 0, DEF_DEC_OP_FRAME_LEN); pPcmBuf += DEF_DEC_OP_FRAME_LEN; pAfCb->data.samsiz[i] = 0; @@ -416,7 +416,7 @@ Int cbInitSourceSel( for (i=0; imaxAFChanNum; i++) { pAfCb->data.sample[i] = pPcmBuf; - memset(pAfCb->data.sample[i], pCb->maxAFSampCount, 0); + memset(pAfCb->data.sample[i], 0, pCb->maxAFSampCount); pPcmBuf += pCb->maxAFSampCount; pAfCb->data.samsiz[i] = 0; diff --git a/pasdk/test_dsp/framework/audioStreamInpProc.c b/pasdk/test_dsp/framework/audioStreamInpProc.c index 318a5feb..a00036d9 100644 --- a/pasdk/test_dsp/framework/audioStreamInpProc.c +++ b/pasdk/test_dsp/framework/audioStreamInpProc.c @@ -873,8 +873,8 @@ Void taskAsipFxn( } // FL: debug, reset IB capture buffer - //capIbReset(); - //Log_info0("capIbReset()"); + capIbReset(); + Log_info0("capIbReset()"); // FL: send source select message to slave pAspMsg = (ASP_Msg *)MessageQ_alloc(hAspMsgMaster->heapId, hAspMsgMaster->msgSize); /* allocate message */ @@ -1907,7 +1907,7 @@ PAF_ASIT_autoProcessing( if (nbytes == -DIBERR_SYNC) { TRACE_TERSE2("PAF_ASIT_autoProcessing: AS%d: SIO_reclaim returned 0x%x, ignoring", as+zMS, nbytes); - return 0; + return nbytes; } if (nbytes != sizeof(PAF_InpBufConfig)) { @@ -2196,7 +2196,7 @@ PAF_ASIT_decodeProcessing( if (((pAstCfg->xDec[zMD].decodeStatus.sourceDecode == PAF_SOURCE_THD) || (pAstCfg->xDec[zMD].decodeStatus.sourceDecode == PAF_SOURCE_DXP) || (pAstCfg->xDec[zMD].decodeStatus.sourceDecode == PAF_SOURCE_DTSHD)) && - (pAstCfg->xStr[zMS].pAudioFrame->sampleRate == PAF_SAMPLERATE_UNKNOWN)) + (pAstCfg->xDec[zMD].decodeStatus.sampleRate == PAF_SAMPLERATE_UNKNOWN)) #endif { Int z; @@ -2725,7 +2725,7 @@ PAF_ASIT_decodeInit( (sourceSelect == PAF_SOURCE_DTSALL) ) { - frameLength = 8192; // TODO: Chitresh FIX ME + frameLength = 512; // TODO: Chitresh FIX ME } else { @@ -3470,7 +3470,7 @@ PAF_ASIT_decodeDecode( (sourceSelect == PAF_SOURCE_DTSALL) ) { - frameLength = 8192; // TODO: Chitresh FIX ME + frameLength = 512; // TODO: Chitresh FIX ME } else { -- 2.39.2