Commit 56485339 authored by vaclav's avatar vaclav
Browse files

port MR

parent 6835cac6

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ 
#define NONBE_FIX_1337_MISSING_DIRECTIVITY_DISTATT_EXTREND /* Eri: issue 1337: Missing directivity setting and distance attenuation in external renderer IVAS_rend */

#define NONBE_1214_PLC_LSF_MEMORY                       /* VA: issue 1224: reset ACELP PLC FEC memory in case of switching from MDCT stereo to TD/DFT stereo */

#define NONBE_1293_SR_HRTF                              /* VA: issue 1293: add support of external HRTFs in split rendering */

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

#define NONBE_1220_OMASA_JBM_BRATE_SW_FLUSH             /* VA: issue 1220: fix bug in renderer flush in OMASA 1ISM JBM bitrate switching */



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_init_dec_fx.c

+16 −0
Original line number Diff line number Diff line
@@ -684,8 +684,13 @@ ivas_error ivas_dec_setup( 
                st_ivas->nchan_transport = 1;

                move16();

            }



#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT

            /* 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;

            move16();

#endif

            st_ivas->nchan_ism = add( st_ivas->bit_stream[L_sub( res_dec, 3 )], shl( st_ivas->bit_stream[L_sub( res_dec, 2 )], 1 ) );



            IF( GT_16( st_ivas->nchan_ism, 0 ) )
@@ -1018,6 +1023,17 @@ ivas_error ivas_dec_setup( 
            }

        }



#ifdef NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH

        test();

        IF( GT_16( st_ivas->ini_frame, 0 ) && EQ_32( st_ivas->ivas_format, MASA_FORMAT ) )

        {

            st_ivas->nchan_ism = 0;

            move16();

            st_ivas->ism_mode = ISM_MODE_NONE;

            move16();

        }



#endif

        IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) )

        {

            ISM_MODE last_ism_mode = st_ivas->ism_mode;

lib_dec/ivas_masa_dec_fx.c

+3 −1
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ ivas_error ivas_masa_decode_fx( 
                /* re-read the number of objects, needed in case of bad frame  */

                st_ivas->nchan_ism = sub( 5, add( st_ivas->bit_stream[bits_per_frame - 3], shl( st_ivas->bit_stream[bits_per_frame - 2], 1 ) ) );

            }



            test();

            IF( EQ_32( ivas_format, MASA_FORMAT ) && NE_16( st_ivas->nchan_ism, 5 ) )

            {
@@ -1983,6 +1984,7 @@ ivas_error ivas_masa_dec_reconfigure_fx( 


    ivas_masa_set_elements_fx( 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( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) )

    {

#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT
@@ -2000,7 +2002,7 @@ ivas_error ivas_masa_dec_reconfigure_fx( 
        st_ivas->ism_mode = ISM_MODE_NONE;

        move16();

    }



#endif

    {

        Word16 tc_nchan_to_allocate;

        Word16 tc_nchan_transport;