Commit 12081938 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into... 

Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into 195-rendering-fix-align-multichannel-rendering-between-internal-and-external-renderer
parents 9036f393 30322ca2

lib_enc/bw_detect.c

+6 −6
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ int16_t set_bw_mct( 
    const int16_t nCPE                   /* i  : number of CPEs              */

)

{

    Encoder_State *sts[MCT_MAX_CHANNELS];

    Encoder_State *st;

    int16_t ch, cpe_id;

    int16_t mct_bwidth, last_mct_bwidth, bw_changed;
@@ -671,13 +671,13 @@ int16_t set_bw_mct( 
    {

        for ( ch = 0; ch < CPE_CHANNELS; ch++ )

        {

            sts[ch] = hCPE[cpe_id]->hCoreCoder[ch];

            if ( sts[ch]->mct_chan_mode == MCT_CHAN_MODE_LFE || sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )

            st = hCPE[cpe_id]->hCoreCoder[ch];

            if ( st->mct_chan_mode == MCT_CHAN_MODE_LFE || st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )

            {

                continue;

            }



            mct_bwidth = max( mct_bwidth, sts[ch]->input_bwidth );

            mct_bwidth = max( mct_bwidth, st->input_bwidth );

        }

    }
@@ -690,8 +690,8 @@ int16_t set_bw_mct( 
        {

            for ( ch = 0; ch < CPE_CHANNELS; ch++ )

            {

                sts[ch] = hCPE[cpe_id]->hCoreCoder[ch];

                sts[ch]->bwidth = mct_bwidth;

                st = hCPE[cpe_id]->hCoreCoder[ch];

                st->bwidth = mct_bwidth;

            }

        }

    }

scripts/config/self_test.prm

+2 −2
Original line number Diff line number Diff line
@@ -333,8 +333,8 @@ 
../IVAS_dec BINAURAL 48 bit testv/stv2ISM48s.pcm_16400_48-48_binaural.tst



// 3 ISm with metadata at 24.4 kbps, 48 kHz in, 48 kHz out, BINAURAL out

../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 24400 48 testv/stv2ISM48s.pcm bit

../IVAS_dec BINAURAL 48 bit testv/stv2ISM48s.pcm_24400_48-48_binaural.tst

../IVAS_cod -ism 3 testv/stvISM1.csv testv/stvISM2.csv testv/stvISM3.csv 24400 48 testv/stv3ISM48s.pcm bit

../IVAS_dec BINAURAL 48 bit testv/stv3ISM48s.pcm_24400_48-48_binaural.tst



// 2 ISm with metadata at 48 kbps, 48 kHz in, 48 kHz out, BINAURAL out, random FEC at 5%

../IVAS_cod -ism 2 testv/stvISM3.csv testv/stvISM4.csv 48000 48 testv/stv2ISM48s.pcm bit