Commit 80a7ee13 authored by vaclav's avatar vaclav
Browse files

port NONBE_1200_ISM_JBM_BRATE_SW_FLUSH

parent bf46ca38

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ 
#define FIX_1999_TEMPORARY_DISABLE_DIST_ATT_CHECK       /* Eri: Issue 1999: Range check on float values of distance attenuation, while the float values are not propagated to this function. The test is not correct, but configurable distance attenuation is not used in Characterization.*/

#define ADJUST_MCT_CHANNELS_MAX                         /* FhG: set correct max mct channels constant*/

#define FIX_1053_REVERB_RECONFIGURATION

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



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

lib_dec/ivas_ism_dec_fx.c

+13 −0
Original line number Diff line number Diff line
@@ -149,7 +149,9 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx( 
        ivas_output_init( &( st_ivas->hIntSetup ), st_ivas->hDecoderConfig->output_config );

    }



#ifndef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH

    {

#endif

        test();

        test();

        /* transfer subframe info from DirAC or ParamMC to central tc buffer */
@@ -189,7 +191,9 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx( 
                return error;

            }

        }

#ifndef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH

    }

#endif



    IF( NE_16( st_ivas->ism_mode, last_ism_mode ) )

    {
@@ -333,19 +337,26 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx( 
     * floating-point output audio buffers

     *-----------------------------------------------------------------*/



#ifndef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH

    {

#endif

        nchan_out_buff = ivas_get_nchan_buffers_dec_fx( st_ivas, -1, -1 );



        IF( NE_32( ( error = ivas_output_buff_dec_fx( st_ivas->p_output_fx, nchan_out_buff_old, nchan_out_buff ) ), IVAS_ERR_OK ) )

        {

            return error;

        }

#ifndef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH

    }

#endif



    /*-----------------------------------------------------------------*

     * JBM TC buffers

     *-----------------------------------------------------------------*/



#ifndef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH

    {

#endif

        Word16 tc_nchan_full_new;

        DECODER_TC_BUFFER_HANDLE hTcBuffer;
@@ -394,7 +405,9 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx( 


            Copy( st_ivas->hTcBuffer->subframe_nbslots, st_ivas->hSpatParamRendCom->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );

        }

#ifndef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH

    }

#endif



#ifdef FIX_HRTF_LOAD

    return IVAS_ERR_OK;

lib_dec/lib_dec_fx.c

+6 −2
Original line number Diff line number Diff line
@@ -3580,8 +3580,12 @@ ivas_error IVAS_DEC_ReadFormat( 
            render what still fits in the new granularity */

            Word16 tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, st_ivas->ivas_format, st_ivas->mc_mode, st_ivas->hDecoderConfig->output_Fs );



#ifdef NONBE_1200_ISM_JBM_BRATE_SW_FLUSH

            st_ivas->nchan_transport = nchan_transport_old;

            move16();

#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

            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