diff --git a/apps/decoder.c b/apps/decoder.c index 6e3e23bb4764b32f8f0bf2ea2b74251a014aa58e..74aa3d73765d78cac931e48c8379941f2e447fea 100644 --- a/apps/decoder.c +++ b/apps/decoder.c @@ -2352,7 +2352,6 @@ static ivas_error decodeVoIP( uint32_t nextPacketRcvTime_ms = 0; uint32_t systemTime_ms = 0; uint32_t systemTimeInc_ms = (uint32_t) JBM_FRONTEND_FETCH_FRAMESIZE_MS; - int32_t nFramesWritten = 0; int32_t nFramesFed = 0; @@ -2710,7 +2709,6 @@ static ivas_error decodeVoIP( frame++; systemTime_ms += systemTimeInc_ms; - nFramesWritten++; #ifdef WMOPS update_mem(); diff --git a/apps/renderer.c b/apps/renderer.c index 239e7921620818786392f43bd5a7bee4ca0bea28..c2b952755f2f4661a59cdc82067a8259244ba867 100644 --- a/apps/renderer.c +++ b/apps/renderer.c @@ -3485,7 +3485,7 @@ static void parseSceneDescriptionFile( return; } -static void printSupportedAudioConfigs() +static void printSupportedAudioConfigs( void ) { uint16_t i; const char *supportedFormats[] = { diff --git a/lib_debug/debug.c b/lib_debug/debug.c index 65497dda0a5982508a081feefa11028195765701..736f35d43d3b41ca29428063ff654f396e18e3e1 100644 --- a/lib_debug/debug.c +++ b/lib_debug/debug.c @@ -387,7 +387,7 @@ int16_t dbgread( * Closes opened files and frees allocated memory *--------------------------------------------------------------------*/ -void dbgclose() +void dbgclose( void ) { int16_t i; diff --git a/lib_debug/snr.c b/lib_debug/snr.c index f6e6fa9d5219bbb0d41e3394571bd770794bc97a..5efefe8737a460bebef59eda15c35fd648f3739e 100644 --- a/lib_debug/snr.c +++ b/lib_debug/snr.c @@ -423,7 +423,7 @@ void snr_celp( * Finalizes and presents accumulated SNR data *--------------------------------------------------------------------*/ -void print_snr() +void print_snr( void ) { int16_t i; double snr, segsnr, wsegsnr; diff --git a/lib_rend/ivas_CQMFDecoder.c b/lib_rend/ivas_CQMFDecoder.c index 8b04ec753d1829cd4a726eee208f5afdc01d0cc6..cea424d3d715e8c21db4a01fd05a586fe78fd82c 100644 --- a/lib_rend/ivas_CQMFDecoder.c +++ b/lib_rend/ivas_CQMFDecoder.c @@ -731,44 +731,39 @@ int32_t DecodeFrame( CQMFDecoder *psCQMFDecoder, float ***pppfCQMFImag ) { int32_t n; - int32_t iBitsRead; - - iBitsRead = 0; - iBitsRead += - ReadHeaderInformation( &psCQMFDecoder->iNumBands, pBits ); + ReadHeaderInformation( &psCQMFDecoder->iNumBands, pBits ); if ( psCQMFDecoder->iChannels == 2 ) { - iBitsRead += ReadMSInformation( + ReadMSInformation( psCQMFDecoder->iNumBands, &psCQMFDecoder->iMSMode, psCQMFDecoder->piMSFlags, psCQMFDecoder->piLRPhaseDiffs, psCQMFDecoder->piMSPredCoefs, pBits ); } - iBitsRead += ReadPredictors( psCQMFDecoder->psPredictionDecoder, - pBits ); + ReadPredictors( psCQMFDecoder->psPredictionDecoder, + pBits ); - iBitsRead += ReadGroupInformation( + ReadGroupInformation( psCQMFDecoder->iChannels, psCQMFDecoder->iNumBlocks, &psCQMFDecoder->iCommonGrouping, psCQMFDecoder->piNumGroups, psCQMFDecoder->ppiGroupLengths, pBits ); - iBitsRead += ReadRMSEnvelope( + ReadRMSEnvelope( psCQMFDecoder->iChannels, (const int32_t *) psCQMFDecoder->piNumGroups, psCQMFDecoder->iNumBands, psCQMFDecoder->pppiRMSEnvelope, pBits ); #ifdef ENABLE_PMOD_ADJUST - iBitsRead += - ReadPmodInformation( psCQMFDecoder->ppiHiSMRFlags, psCQMFDecoder->psBSRead, - psCQMFDecoder->iChannels, psCQMFDecoder->iNumBands ); + ReadPmodInformation( psCQMFDecoder->ppiHiSMRFlags, psCQMFDecoder->psBSRead, + psCQMFDecoder->iChannels, psCQMFDecoder->iNumBands ); #endif - iBitsRead += ReadAllocInformation( &psCQMFDecoder->iAllocOffset, - pBits ); + ReadAllocInformation( &psCQMFDecoder->iAllocOffset, + pBits ); if ( psCQMFDecoder->iChannels == 2 && psCQMFDecoder->iCommonGrouping == 1 ) @@ -807,7 +802,7 @@ int32_t DecodeFrame( CQMFDecoder *psCQMFDecoder, for ( n = 0; n < psCQMFDecoder->iChannels; n++ ) { - iBitsRead += ReadCQMFData( + ReadCQMFData( psCQMFDecoder->piNumGroups[n], (const int32_t *) psCQMFDecoder->ppiGroupLengths[n], psCQMFDecoder->iNumBands, psCQMFDecoder->piBandwidths, diff --git a/lib_rend/ivas_PredEncoder.c b/lib_rend/ivas_PredEncoder.c index e04d9f6359e718d0994c265218ff3ae812b0812b..6381588ddac52e0462dfed9e70996fb9594e71a0 100644 --- a/lib_rend/ivas_PredEncoder.c +++ b/lib_rend/ivas_PredEncoder.c @@ -145,9 +145,7 @@ int32_t ComputePredictors( PredictionEncoder *psPredictionEncoder, for ( c = 0; c < psPredictionEncoder->iChannels; c++ ) { int32_t b; - float fChanPredictionGainBits; psPredictionEncoder->piNumPredBands[c] = 50; - fChanPredictionGainBits = 0.0; for ( b = 0; b < psPredictionEncoder->piNumPredBands[c]; b++ ) { int32_t n; @@ -267,11 +265,6 @@ int32_t ComputePredictors( PredictionEncoder *psPredictionEncoder, psPredictionEncoder->ppfA1Imag[c][b] = fA1Imag; psPredictionEncoder->ppiA1Mag[c][b] = iA1Mag; psPredictionEncoder->ppiA1Phase[c][b] = iA1Phase; - - if ( psPredictionEncoder->ppiPredBandEnable[c][b] == 1 ) - { - fChanPredictionGainBits += fBitGain; // change this calculation - } } #if 0 // Estimate if the savings outway the signaling cost diff --git a/lib_rend/ivas_efap.c b/lib_rend/ivas_efap.c index 4301d75dec749b89b32404dbcad9c59de9dd329e..42ef8beaa3249d8ee4cb25a09cf62cc049fea268 100644 --- a/lib_rend/ivas_efap.c +++ b/lib_rend/ivas_efap.c @@ -719,7 +719,7 @@ static void add_ghost_speakers( int16_t numVertex; int16_t lengthVertGhst; /* Nb of vertical ghost added */ int16_t lengthHorGhst; /* Nb of Horizontal Ghost */ - int16_t i, j, k, n, a; /* Integer for loops */ + int16_t i, j, k, a; /* Integer for loops */ int16_t num_new; /* Number of new vertices to add */ float maxAngle; /* Max azimuth tolerance for extend the LS setup horizontaly */ float newDiff; /* Angle differences that will help us set the extended LS setup */ @@ -842,12 +842,8 @@ static void add_ghost_speakers( } /* Adding new virtual speakers */ - n = 0; - for ( i = 0; i < k; ++i ) { - ++n; - if ( sectors[i] > 1 ) { newDiff = tmpAngleDiff[i] / sectors[i]; @@ -858,7 +854,6 @@ static void add_ghost_speakers( newAzi = tmpAzi[i] + ( j + 1 ) * newDiff; add_vertex( vertexArray, newAzi, 0, numVertex + a, EFAP_DMX_INTENSITY ); - ++n; ++a; if ( j > 0 ) @@ -1016,7 +1011,6 @@ static void visible_edges( int16_t maxVertex; int16_t i, j, k; int16_t a, b; - int16_t nbOfEdges; int16_t tmpSurface[4]; int16_t counter[EFAP_MAX_SIZE_TMP_BUFF][EFAP_MAX_SIZE_TMP_BUFF]; int16_t counterTranspose[EFAP_MAX_SIZE_TMP_BUFF][EFAP_MAX_SIZE_TMP_BUFF]; @@ -1059,16 +1053,11 @@ static void visible_edges( } } - nbOfEdges = 0; for ( i = 0; i < maxVertex + 1; ++i ) { for ( j = 0; j < maxVertex + 1; ++j ) { counter[i][j] = counterTranspose[i][j] + counterTranspose[j][i]; - if ( counter[i][j] == 1 ) - { - ++nbOfEdges; - } } }