Commit c1aa9197 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_ISM_DECODER_PRINTOUT

parent a7ca565b

lib_com/bitstream.c

+0 −12
Original line number Diff line number Diff line
@@ -1950,24 +1950,12 @@ 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 );

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

                {

                    st_ivas->nchan_transport++;

                    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

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ 
#define SBA_BR_SWITCHING_2                              /* Issue 114: Changes for sba bit rate switching with reconfigurations*/

#define SBA_BR_SWITCHING                                /* Issue 114: Changes for sba bit rate switching*/

#define BRATE_SWITCHING_RENDERING                       /* Bitrate switching changes related to the renderers */

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

#define FIX_150                                         /* Issue 150: Crash in EVS mono, HQ_HARMONIC mode, related to BASOP_NOGLOB */

#define FIX_REND_ISM_XFADE                              /* Issue 193: Crossfade inconsistencies in ISM between decoder and external renderer */

#define FIX_REND_ISM_POS_ROUNDING                       /* Issue 193: (Temporary solution until fix for #215) Align rounding of ISM position data in external renderer */