Commit 8e06e682 authored by Adam Mills's avatar Adam Mills
Browse files

Merge branch '512-remove-deactivated-code' into 'main' 

Remove some deactivated #if 0 code in split rendering and SBA

See merge request !1005
parents 997f4bd1 52d6154c

lib_debug/sba_debug.c

+1 −11
Original line number Diff line number Diff line
@@ -202,16 +202,6 @@ void ivas_spar_dump_signal_wav( 
    {

        for ( i = 0; i < no_channel; i++, k++ )

        {

#if 0

            if ( ppPcm )

            {

                tmp_value = roundf( ppPcm[i][j] * PCM16_TO_FLT_FAC );

            }

            else

            {

                tmp_value = roundf( pcm_array[i][j] * PCM16_TO_FLT_FAC );

            }

#else

            if ( ppPcm )

            {

                tmp_value = roundf( ppPcm[i][j] );
@@ -220,7 +210,7 @@ void ivas_spar_dump_signal_wav( 
            {

                tmp_value = roundf( pcm_array[i][j] );

            }

#endif



            if ( tmp_value > MAX16B_FLT )

            {

                largest_value = (float) fabs( tmp_value ) > largest_value ? (float) fabs( tmp_value ) : largest_value;

lib_rend/ivas_PredEncoder.c

+1 −26
Original line number Diff line number Diff line
@@ -338,31 +338,7 @@ int32_t ComputePredictors( 
            psPredictionEncoder->ppiA1Mag[c][b] = iA1Mag;

            psPredictionEncoder->ppiA1Phase[c][b] = iA1Phase;

        }

#if 0

        // Estimate if the savings outway the signaling cost

        if(fChanPredictionGainBits > 1e20){//}(float)(psPredictionEncoder->piNumPredBands[c] + 6)){

            psPredictionEncoder->piPredChanEnable[c] = 1;

            //printf("Prediction Enabled\n");

            iPredictionBits += 1;

            iPredictionBits += 6;

            for(b = 0; b < psPredictionEncoder->piNumPredBands[c]; b ++){

                iPredictionBits += 1;

                if(psPredictionEncoder->ppiPredBandEnable[c][b] == 1){

                    iPredictionBits += (PRED_QUANT_FILTER_BITS * 2);

                    printf("%f, ",(psPredictionEncoder->ppfEstPredGain[c][b]));

                }

            }

            printf("\n");

        }

        else{

            psPredictionEncoder->piPredChanEnable[c] = 0;

            for(b = 0; b < psPredictionEncoder->piNumPredBands[c]; b ++){

                psPredictionEncoder->ppiPredBandEnable[c][b] = 0;

            }

            //printf("Prediction Disabled\n");

            iPredictionBits += 1;

        }

#else



        {

            /*int32_t iDone;

            int32_t iPredBands;
@@ -446,7 +422,6 @@ int32_t ComputePredictors( 
                psPredictionEncoder->piNumPredBands[c] = 0;

            }

        }

#endif

    }



    return iPredictionBits;

lib_rend/ivas_splitRend_lcld_enc.c

+0 −7
Original line number Diff line number Diff line
@@ -185,17 +185,10 @@ void ivas_splitBinLCLDEncProcess( 
        {

            for ( int16_t n = 0; n < hSplitBinLCLDEnc->iChannels; n++ )

            {

#if 0

                readByte = fread(&hSplitBinLCLDEnc->pppfLCLDReal[n][k][b], sizeof(float), 1, hSplitBinLCLDEnc->cldfbIn);

				if ( readByte != 1 )

					break;

                readByte = fread(&hSplitBinLCLDEnc->pppfLCLDImag[n][k][b], sizeof(float), 1, hSplitBinLCLDEnc->cldfbIn);

#else

                readByte = fread( &Cldfb_In_Real[n][k][b], sizeof( float ), 1, hSplitBinLCLDEnc->cldfbIn );

                if ( readByte != 1 )

                    break;

                readByte = fread( &Cldfb_In_Imag[n][k][b], sizeof( float ), 1, hSplitBinLCLDEnc->cldfbIn );

#endif

            }

        }

    }

lib_rend/ivas_splitRenderer_utils.c

+0 −7
Original line number Diff line number Diff line
@@ -399,15 +399,8 @@ int32_t ivas_split_rend_bitstream_read_int32( 
    val = 0;

    for ( k = bits - 1; k >= 0; k-- )

    {

#if 0

        if ( pBits->bits_buf[pBits->bits_read >> 3] & ( 1 << ( pBits->bits_read & 7 ) ) )

        {

            val |= 1 << k;

        }

#else

        bit_val = ( pBits->bits_buf[pBits->bits_read >> 3] & ( 1 << ( pBits->bits_read & 7 ) ) ) != 0;

        val |= bit_val << k;

#endif

        pBits->bits_read++;

    }