Commit cb3deb8f authored by vaclav's avatar vaclav
Browse files

issue 1199: fix bug in renderer flush in OMASA JBM bitrate switching; under... 

issue 1199: fix bug in renderer flush in OMASA JBM bitrate switching; under NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH
parent f18c648b

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ 
#define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR       /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */



#define FIX_1139_REV_COLORATION_SHORT_T60               /* Nokia,FhG: Fix issue 1139, prevent sound coloration artefacts at very low reverberation times */

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



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_init_dec.c

+12 −1
Original line number Diff line number Diff line
@@ -221,6 +221,10 @@ ivas_error ivas_dec_setup( 
                element_mode_flag = 1;

            }



#ifdef NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH

            st_ivas->ism_mode = ISM_MODE_NONE;



#endif

            if ( st_ivas->ini_frame > 0 )

            {

                /* reconfigure in case a change of operation mode is detected */
@@ -234,7 +238,6 @@ ivas_error ivas_dec_setup( 
                        }

                        else

                        {



                            if ( ( error = ivas_masa_dec_reconfigure( st_ivas, nSamplesRendered, pcm_resolution, data ) ) != IVAS_ERR_OK )

                            {

                                return error;
@@ -435,6 +438,14 @@ 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

+2 −0
Original line number Diff line number Diff line
@@ -1470,6 +1470,7 @@ 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 )
@@ -1481,6 +1482,7 @@ ivas_error ivas_masa_dec_reconfigure( 
        st_ivas->ism_mode = ISM_MODE_NONE;

    }



#endif

    {

        int16_t tc_nchan_to_allocate;

        int16_t tc_nchan_transport;