Commit e11354bc authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH

parent c12340ae

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ 
#define NONBE_FIX_1212_TONAL_MDCT_CONCEALMENT           /* FhG: Fix issue 1212, zero IGF spec also in 1st concealed frame */





#define NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH             /* VA: issue 1199: fix bug in renderer flush in OMASA JBM bitrate switching */

#define NONBE_1200_ISM_JBM_BRATE_SW_FLUSH               /* VA: issue 1200: fix bug in renderer flush in ISM JBM bitrate switching */

lib_dec/ivas_init_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -573,9 +573,7 @@ ivas_error ivas_dec_setup( 
            }



            /* this should be non-zero if original input format was MASA_ISM_FORMAT */

#ifdef NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH

            st_ivas->ism_mode = ISM_MODE_NONE;

#endif

            st_ivas->nchan_ism = st_ivas->bit_stream[( ivas_total_brate / FRAMES_PER_SEC ) - 3] + 2 * st_ivas->bit_stream[( ivas_total_brate / FRAMES_PER_SEC ) - 2];



            if ( st_ivas->nchan_ism > 0 )
@@ -813,14 +811,12 @@ ivas_error ivas_dec_setup( 
            }

        }



#ifdef NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH

        if ( st_ivas->ini_frame > 0 && st_ivas->ivas_format == MASA_FORMAT )

        {

            st_ivas->nchan_ism = 0;

            st_ivas->ism_mode = ISM_MODE_NONE;

        }



#endif

        if ( st_ivas->ivas_format == ISM_FORMAT )

        {

            ISM_MODE last_ism_mode = st_ivas->ism_mode;

lib_dec/ivas_masa_dec.c

+0 −13
Original line number Diff line number Diff line
@@ -1468,19 +1468,6 @@ ivas_error ivas_masa_dec_reconfigure( 


    ivas_masa_set_elements( ivas_total_brate, st_ivas->mc_mode, st_ivas->nchan_transport, st_ivas->hQMetaData, &tmp, &tmp, &tmp, st_ivas->ivas_format, st_ivas->ism_mode, ism_total_brate );



#ifndef NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH

    if ( st_ivas->ivas_format == MASA_FORMAT )

    {

        if ( st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_EXTERNAL )

        {

            st_ivas->nchan_ism = 0; /* Initialization if it has not been already read from the end of the bitstream at the same time

                                    with reading of the format: nchan_ism is needed in MASA format because for the EXT output in

                                    MASA-only (pre-rendering mode of OMASA) the number of ISMs to output correct number of empty objects is needed */

        }

        st_ivas->ism_mode = ISM_MODE_NONE;

    }



#endif

    {

        int16_t tc_nchan_to_allocate;

        int16_t tc_nchan_transport;

lib_dec/lib_dec.c

+0 −7
Original line number Diff line number Diff line
@@ -1010,13 +1010,6 @@ ivas_error IVAS_DEC_ReadFormat( 
            st_ivas->nchan_transport = nchan_transport_old;

#else

            // st_ivas->nchan_transport = nchan_transport_old; // ToDo: temporarily deactivated to keep FIX_HRTF_LOAD bit-exact but this is likely a bug in the main -> see issue #1200

#endif

#ifndef NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH

            if ( st_ivas->ivas_format == MASA_FORMAT )

            {

                st_ivas->nchan_ism = 0; // ToDo: temporary hack to keep FIX_HRTF_LOAD bit-exact but this is likely a bug in the main -> see issue #1199

            }



#endif

            if ( tc_granularity_new < st_ivas->hTcBuffer->n_samples_granularity )

            {