Commit a8f80323 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 991-binary-file-hrtf-coefficients-not-used-in-parambin
parents 6a6070c3 651db71d

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -46,7 +46,10 @@ binary/ 
tests/**/[c|d]ut

tests/**/ref

tests/*/testv

tests/hrtf_binary_loading/bitstream/*

tests/hrtf_binary_loading/dec_out_*/*

scripts/testv/*_cut*.pcm

scripts/testv/*_cut*.wav

scripts/testv/stvOMASA_*.met

scripts/testv/stvOMASA_*.csv

scripts/testv/stvOMASA_2ISM_1MASA1TC48c.wav

apps/decoder.c

+4 −1
Original line number Diff line number Diff line
@@ -2334,7 +2334,11 @@ static ivas_error decodeG192( 
                {

                    if ( ( error = TsmScaleFileReader_readScale( tsmScaleFileReader, &scale ) ) != IVAS_ERR_OK )

                    {

#ifdef FIX_699_FILE_READER_JBM_TSM

                        fprintf( stderr, "\nError (%s) when reading TSM data from %s \n\n", arg.inputBitstreamFilename, TsmScaleFileReader_getFilePath( tsmScaleFileReader ) );

#else

                        fprintf( stderr, "\nError: input bitstream file couldn't be read: %s \n\n", arg.inputBitstreamFilename );

#endif

                        goto cleanup;

                    }

                    int16_t maxScaling;
@@ -2426,7 +2430,6 @@ static ivas_error decodeG192( 
#endif

                }

            }



        } while ( nSamplesRendered < nOutSamples && error == IVAS_ERR_OK );



        if ( error == IVAS_ERR_END_OF_FILE )

apps/encoder.c

+4 −0
Original line number Diff line number Diff line
@@ -686,7 +686,11 @@ int main( 
        {

            if ( ( error = JbmFileReader_readCAconfig( jbmReader, &caConfig ) ) != IVAS_ERR_OK )

            {

#ifdef FIX_699_FILE_READER_JBM_TSM

                fprintf( stderr, "\nError (%s) while reading Channel-Aware Config. from: %s\n\n", IVAS_ENC_GetErrorMessage( error ), JbmFileReader_getFilePath( jbmReader ) );

#else

                fprintf( stderr, "JbmFileReader_readCAconfig() failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );

#endif

                goto cleanup;

            }

lib_com/ari_hm.c

+9 −1
Original line number Diff line number Diff line
@@ -205,7 +205,11 @@ int16_t CountIndexBits( 
 *-------------------------------------------------------------------*/



int16_t tcx_hm_render(

#ifdef FIX_1001_ARI_HM_OVERFLOW

    const int32_t lag, /* i  : pitch lag                             */

#else

    const int16_t lag, /* i  : pitch lag                             */

#endif

    const int16_t fract_res, /* i  : fractional resolution of the lag      */

    Word16 p[]               /* o  : harmonic model (Q13)                  */

)
@@ -265,7 +269,11 @@ int16_t tcx_hm_render( 


void tcx_hm_modify_envelope(

    const Word16 gain, /* i  : HM gain (Q11)                         */

#ifdef FIX_1001_ARI_HM_OVERFLOW

    const int32_t lag,

#else

    const int16_t lag,

#endif

    const int16_t fract_res,

    const Word16 p[],     /* i  : harmonic model (Q13)                  */

    Word32 env[],         /* i/o: envelope (Q16)                        */

lib_com/ivas_cnst.h

+8 −0
Original line number Diff line number Diff line
@@ -1392,9 +1392,17 @@ typedef enum 
#define PARAM_MC_ICC_ERROR_BIAS_FAC              (1.15f)                    /* factor for favouring past ICC maps in the adaptive ICC map decision */

#define PARAM_MC_TRANSIENT_BAND_STEP             2                          /* Number of parameter bands combined in case of a transient frame*/

#define PARAM_MC_MAX_DECORR_CLDFB_BANDS         20                          /* Maximum number of CLDFB bands with decorrelation */

#ifdef FIX_901_PARAMMC_DEAD_CODE

#define PARAM_MC_MAX_TRANSPORT_CHANS             3                          /* Number of down mix channels */

#else

#define PARAM_MC_MAX_TRANSPORT_CHANS             4                          /* Number of down mix channels */

#endif

#define PARAM_MC_MAX_ILD_REF_CHANNELS            2                          /* Maximum number of reference channels for a coded ILD */

#ifdef FIX_901_PARAMMC_DEAD_CODE

#define PARAM_MC_NUM_CONFIGS                    14                          /* Number of available Parametric MC configurations */

#else

#define PARAM_MC_NUM_CONFIGS                    15                          /* Number of available Parametric MC configurations */

#endif

#define PARAM_MC_MAX_BAND_LFE                    1                          /* Number of parameter bands for LFE coding */

#define PARAM_MC_SZ_ICC_MAP                     11                          /* Maximum number of transmitted ICCs per parameter band */

#define PARAM_MC_SZ_ILD_MAP                     12                          /* Maximum number of transmitted channel energies per band*/