Commit f97d5226 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch '917-split-rendering-lcld-codec-unused-symbols' into 'main' 

Fix for issue #917 and #918, warning fixes in LCLD codec

See merge request !1256
parents 28f99e63 79735c1a

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ 
#define FIX_881_REMOVE_LFE_ADDITION_IN_ISM              /* VA: issue 881: remove LFE addition in ISM format */

#define FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO              /* VA: Fix the definition of buffers/arrays in DFT and MDCT stereo to satisfy gcc v 11.4.0 */

#define FIX_891_PARAMUPMIX_CLEANUP                      /* Dlb: issue 891: remove unneeded code from ParamUpmix */

#define FIX_917_LCLD_WARNINGS                           /* Dlb: issue 917 and 918: fix LCLD codec warnings*/



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

lib_rend/ivas_NoiseGen.c

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include "ivas_prot_rend.h"

#include "wmc_auto.h"





#ifndef FIX_917_LCLD_WARNINGS

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

 * Function CreateNoiseGen()

 *
@@ -80,7 +80,7 @@ NoiseGen *CreateNoiseGen( void ) 


    return psNoiseGen;

}



#endif



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

 * Function DeleteNoiseGen()

lib_rend/ivas_RMSEnvGrouping.c

+8 −7
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static void ComputeBandEnergy( 
    return;

}





#ifndef FIX_917_LCLD_WARNINGS

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

 * Function TryMerge()

 *
@@ -375,7 +375,7 @@ static float TryMerge( 


    return fMeanCost;

}



#endif



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

 * Function ComputeMergeRMS()
@@ -588,7 +588,7 @@ static float TryMerge2( 
    return fMergedCost;

}





#ifndef FIX_917_LCLD_WARNINGS

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

 * Function ComputeGreedyGroups()

 *
@@ -650,8 +650,9 @@ static void ComputeGreedyGroups( 


    return;

}

#endif





#ifndef FIX_917_LCLD_WARNINGS

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

 * Function ComputeGreedyGroups2()

 *
@@ -702,7 +703,7 @@ static void ComputeGreedyGroups2( 


    return;

}



#endif



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

 * Function ComputeGreedyGroups3()
@@ -917,9 +918,9 @@ void ComputeEnvelopeGrouping( 
    }



    /* Perform grouping via Greedy Merge */



#ifndef FIX_917_LCLD_WARNINGS

    /* ComputeGreedyGroups2( psRMSEnvelopeGrouping, iChannels, iNumBands, piBandwidths );*/



#endif

    /* Allows control over max groups can call using 16 if want same as previous call */

    ComputeGreedyGroups3( psRMSEnvelopeGrouping, iChannels, iNumBands, piBandwidths, LCLD_BLOCKS_PER_FRAME );

lib_rend/ivas_lcld_encoder.c

+4 −2
Original line number Diff line number Diff line
@@ -483,7 +483,9 @@ static int32_t CountLCLDBits( const int32_t iNumGroups, const int32_t *piGroupLe 


static int32_t WriteHeaderInformation( const int32_t iNumBands, IVAS_SPLIT_REND_BITS_HANDLE pBits );



#ifdef ENABLE_PMOD_ADJUST

static int32_t WritePmodInformation( const int32_t **ppiHiSMRFlags, IVAS_SPLIT_REND_BITS_HANDLE pBits, int32_t iChannels, int32_t iNumBands );

#endif



static int32_t WriteMSInformation( const int32_t iNumBands, const int32_t iMSMode, const int32_t *piMSFlags, const int32_t *piLRPhaseDiffs, const int32_t *piMSPredCoefs, int32_t iNumMSPredBands, IVAS_SPLIT_REND_BITS_HANDLE pBits );
@@ -1198,7 +1200,7 @@ static void QuantizeSpectrumDPCM_Opt( 
    return;

}





#ifndef FIX_917_LCLD_WARNINGS

static void QuantizeSpectrumDPCM(

    const int32_t iNumGroups,

    const int32_t *piGroupLengths,
@@ -1334,7 +1336,7 @@ static void QuantizeSpectrumDPCM( 


    return;

}



#endif



static int32_t CountLCLDBits(

    const int32_t iNumGroups,

lib_rend/ivas_lcld_prot.h

+2 −0
Original line number Diff line number Diff line
@@ -195,9 +195,11 @@ typedef struct NOISE_GEN 
    float *pfNoiseBuffer;

} NoiseGen;



#ifndef FIX_917_LCLD_WARNINGS

NoiseGen *CreateNoiseGen( 

    void 

);

#endif



void DeleteNoiseGen( 

    NoiseGen *psNoiseGen