Commit fd4fe726 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

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

Remove unused ISAR functions

Closes #2371

See merge request !2761
parents e678e508 96982056

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ 
#define FIX_2319_CLDFB_INIT_FLAGS                       /* FhG: basop issue 2319: init hs->flags during openCldfb(), to avoid reading of uninitialized memory */

#define FIX_BASOP_2357_OBJECT_EDIT_MSAN                 /* Nokia: basop issue 2357: initialize missing exponents in object edit */

#define FIX_BASOP_2354_MSAN_DIFF_Q_VALUE                /* Nokia: Initialize Q value of diffuseness in rendering to Q30 */

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



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

lib_isar/isar_PerceptualModel.c

+12 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ static inline Word16 LogAdd_fx( 
    return iRetVal;

}



#ifndef FIX_2371_REMOVE_UNUSED_ISAR_FCNS



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

 * Function LogAdd()
@@ -112,6 +113,7 @@ static inline Word32 LogAdd( 
    return iRetVal;

}



#endif



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

 * Function PerceptualModel()
@@ -175,6 +177,9 @@ void PerceptualModel_fx( 


    return;

}



#ifndef FIX_2371_REMOVE_UNUSED_ISAR_FCNS



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

 * Function PerceptualModel()

 *
@@ -232,6 +237,8 @@ void PerceptualModel( 
    return;

}



#endif





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

 * Function PerceptualModelStereo()
@@ -239,6 +246,8 @@ void PerceptualModel( 
 *

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



#ifndef FIX_2371_REMOVE_UNUSED_ISAR_FCNS



void PerceptualModelStereo(

    const Word32 iMaxQuantBands,

    const Word32 *piMSFlags,
@@ -348,6 +357,9 @@ void PerceptualModelStereo( 


    return;

}



#endif



void PerceptualModelStereo_fx(

    const Word32 iMaxQuantBands,

    const Word32 *piMSFlags,

lib_isar/isar_PredDecoder.c

+2 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ Word16 ReadPredictors_fx( 
    return iBitsRead;

}





#ifndef FIX_2371_REMOVE_UNUSED_ISAR_FCNS

/* PLC_IMPROVEMENT */

void SetDecodingPassed(

    PredictionDecoder *psPredictionDecoder )
@@ -376,6 +376,7 @@ void SetDecodingPassed( 


    return;

}

#endif





Word32 AnyDecodingUnresolved(

lib_isar/isar_RMSEnvGrouping.c

+5 −5
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
 *

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



Word32 Inv_grp_length[17] = {

static const Word32 Inv_grp_length[17] = {

    // Q31

    0,

    2147483647,
@@ -867,8 +867,8 @@ static void LimitRMSEnvelope( 


        IF( GT_32( iDelta, iRMSDeltaMax ) )

        {

#ifdef DEBUG_VERBOSE

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

#ifdef DEBUGGING

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

#endif

            piRMSEnvelope[iBand] = L_add( L_sub( iDelta, iRMSDeltaMax ), piRMSEnvelope[iBand] );

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


        IF( LT_32( iDelta, iRMSDeltaMin ) )

        {

#ifdef DEBUG_VERBOSE

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

#ifdef DEBUGGING

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

#endif

            piRMSEnvelope[iBand] = L_add( piRMSEnvelope[iBand], L_sub( iRMSDeltaMin, iDelta ) );

        }

lib_isar/isar_lcld_decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -1563,7 +1563,7 @@ static Word32 ReadMSInformation( 
    }

    ELSE

    {

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

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

    }



    return iBitsRead;