Commit 3024581c authored by vaclav's avatar vaclav
Browse files

Merge branch '229-wrong-ism-decoder-print-out' into 'main' 

Resolve "Wrong ISM decoder print-out"

See merge request !302
parents b75baf17 cf04451b

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

+2 −2
Original line number Diff line number Diff line
@@ -173,9 +173,9 @@ 
#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                              /* NTT Contribution 10: Complexity reduction of phase spectrum in stereo downmix*/

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



/* NTT switches */

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



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

/* clang-format on */