Commit 8fc13981 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'basop-2371-unused-isar-functions' into 'main' 

Remove unused ISAR functions

See merge request !2502
parents 98330c5e b2caf075

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_2371_REMOVE_UNUSED_ISAR_FCNS                /* Dolby: basop issue 2371: remove unused ISAR-related functions */      



/* #################### End BE switches ################################## */

lib_isar/isar_PredDecoder.c

+2 −2
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ int16_t ReadPredictors( 
    return iBitsRead;

}





#ifndef FIX_2371_REMOVE_UNUSED_ISAR_FCNS

/*-------------------------------------------------------------------*

 * Function SetDecodingPassed()

 *
@@ -363,7 +363,7 @@ void SetDecodingPassed( 


    return;

}



#endif



/*-------------------------------------------------------------------*

 * Function AnyDecodingUnresolved()

lib_isar/isar_RMSEnvGrouping.c

+4 −4
Original line number Diff line number Diff line
@@ -622,8 +622,8 @@ static void LimitRMSEnvelope( 


        if ( iDelta > iRMSDeltaMax )

        {

#ifdef DEBUG_VERBOSE

            printf( "WARNING RMS envelope delta limited\n" );

#ifdef DEBUGGING

            printf( "Warning: RMS envelope delta limited!\n" );

#endif

            piRMSEnvelope[iBand] += ( iDelta - iRMSDeltaMax );

        }
@@ -641,8 +641,8 @@ static void LimitRMSEnvelope( 


        if ( iDelta < iRMSDeltaMin )

        {

#ifdef DEBUG_VERBOSE

            printf( "WARNING RMS envelope delta limited\n" );

#ifdef DEBUGGING

            printf( "Warning: RMS envelope delta limited!\n" );

#endif

            piRMSEnvelope[iBand] += ( iRMSDeltaMin - iDelta );

        }

lib_isar/isar_lcld_decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -1425,7 +1425,7 @@ static int32_t ReadMSInformation( 
    }

    else

    {

        printf( "ERROR UNSUPPORTED MS MODE\n" );

        printf( "Error in ReadMSInformation() - unsupported MS mode information!\n" );

    }



    return iBitsRead;

lib_isar/isar_lcld_encoder.c

+3 −4
Original line number Diff line number Diff line
@@ -1621,7 +1621,7 @@ static int32_t WriteAllocInformation( 


    if ( iAllocOffset < MIN_ALLOC_OFFSET || iAllocOffset > MAX_ALLOC_OFFSET )

    {

        printf( "Serious error\n" );

        printf( "Error in WriteAllocInformation() - iAllocOffset has incorrect value: %d!\n", iAllocOffset );

    }



    ISAR_SPLIT_REND_BITStream_write_int32( pBits, ( iAllocOffset - MIN_ALLOC_OFFSET ), ALLOC_OFFSET_BITS );
@@ -1849,10 +1849,9 @@ static int32_t ComputeAllocation( 


        if ( *piAllocOffset <= MIN_ALLOC_OFFSET && iBitsUsed > iAvailableBits )

        {

#ifdef DEBUG_VERBOSE

            printf( "Frame can not be coded with the number of bits available\n" );

#ifdef DEBUGGING

            printf( "Error in ComputeAllocation() - frame can not be coded with the number of bits available!\n" );

#endif

            /* iLastError = ENC_ERROR_STREAM_FAILURE;*/

            return -1;

        }

        else if ( *piAllocOffset >= MAX_ALLOC_OFFSET && iBitsUsed < iAvailableBits )