Commit 8dbc6dcb authored by vaclav's avatar vaclav
Browse files

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

parents 32bd4077 ae0c7a44

lib_com/bitstream.c

+9 −1
Original line number Diff line number Diff line
@@ -1950,6 +1950,14 @@ ivas_error preview_indices( 
            /* read number of objects from the bitstream */

            st_ivas->nchan_transport = 1;



#ifdef FIX_ISM_DECODER_PRINTOUT

            k = (int16_t) ( ( total_brate / FRAMES_PER_SEC ) - 1 );

            while ( bit_stream[k] == 1 && st_ivas->nchan_transport < MAX_NUM_OBJECTS )

            {

                st_ivas->nchan_transport++;

                k--;

            }

#else

            if ( total_brate != SID_2k40 && total_brate != FRAME_NO_DATA )

            {

                k = (int16_t) ( ( total_brate / FRAMES_PER_SEC ) - 1 );
@@ -1959,7 +1967,7 @@ ivas_error preview_indices( 
                    k--;

                }

            }



#endif

            st_ivas->transport_config = AUDIO_CONFIG_EXTERNAL + st_ivas->nchan_transport;



            st_ivas->ism_mode = ivas_ism_mode_select( st_ivas->nchan_transport, total_brate );

lib_com/options.h

+3 −1
Original line number Diff line number Diff line
@@ -173,10 +173,12 @@ 
#define FIX_DTX_RANGE                                   /* Issue 118: fix the DTX usage: default DTX up to 64 kbps, otherwise only in silence */

#define FIX_ISM_METADATA_READER                         /* Issue 211: make ISM metadata file reader robust against invalid files */

#define FIX_GET_DELAY_RETURN                            /* Issue 223: change return data type in function get_delay() */

#define NTT_REDUC_COMP_POC                              /* Contribution  : Complexity reduction of phase spectrum in stereo downmix*/

#define NTT_REDUC_COMP_POC                              /* NTT Contribution 10: Complexity reduction of phase spectrum in stereo downmix*/

#define FIX_ISM_DECODER_PRINTOUT                        /* Issue 229: fix ISM decoder printout */



#define FIX_ISM_INACTIVE_BITS                           /* fix bitbudget distribution in inactive frames in ISM format */





/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

#endif

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