Commit 402227e7 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_FIX_979_OSBA_STEREO_5MS

parent cd9e03e1

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ 
#endif 





#define NONBE_FIX_979_OSBA_STEREO_5MS                   /* FhG : issue #979 : 5ms and 20ms output different for OSBA and stereo */

#define FIX_966_VAR_OVERFLOW_IN_HARM_MODEL_ARI          /* FhG: fix and undef behaviour bug in the harmonic TCX model arithmetic coder */

#define NONBE_FIX_982_OMASA_DELAY_COMP_5MS              /* FhG : issue #982 : 5ms and 20ms output different for OMASA */

#define NONBE_FIX_975_JBM_USAN                          /* FhG: Fix issue #975, USAN in JBM decoding ad 13.2kbps */

lib_dec/ivas_jbm_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -1001,11 +1001,7 @@ ivas_error ivas_jbm_dec_render( 
        for ( n = 0; n < st_ivas->hTcBuffer->nchan_buffer_full; n++ )

        {



#ifdef NONBE_FIX_979_OSBA_STEREO_5MS

            p_tc[n] = &p_output[n][st_ivas->hTcBuffer->n_samples_rendered];

#else

            p_tc[n] = p_output[n];

#endif

        }



        for ( n = 0; n < MAX_TRANSPORT_CHANNELS + MAX_NUM_OBJECTS; n++ )

lib_dec/ivas_osba_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -271,24 +271,16 @@ ivas_error ivas_osba_render_sf( 
        p_output_ism[n] = &output_ism[n][0];

    }



#ifdef NONBE_FIX_979_OSBA_STEREO_5MS

    if ( !st_ivas->hDecoderConfig->Opt_tsm )

    {

        int16_t tc_offset;

        tc_offset = st_ivas->hTcBuffer->n_samples_rendered;

#endif

        for ( n = 0; n < st_ivas->nchan_ism; n++ )

        {



#ifdef NONBE_FIX_979_OSBA_STEREO_5MS

            mvr2r( &p_output[n][tc_offset], &output_ism[n][tc_offset], nSamplesAsked );

#else

        mvr2r( p_output[n], output_ism[n], nSamplesAsked );

#endif

        }

#ifdef NONBE_FIX_979_OSBA_STEREO_5MS

    }

#endif





    if ( ( error = ivas_sba_dec_render( st_ivas, nSamplesAsked, nSamplesRendered, nSamplesAvailableNext, p_output ) ) != IVAS_ERR_OK )

lib_rend/ivas_output_init.c

+0 −2
Original line number Diff line number Diff line
@@ -293,12 +293,10 @@ int16_t ivas_get_nchan_buffers_dec( 
        {

            nchan_out_buff = max( nchan_out_buff, st_ivas->hOutSetup.nchan_out_woLFE + st_ivas->hOutSetup.num_lfe );

        }

#ifdef NONBE_FIX_979_OSBA_STEREO_5MS

        else if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC )

        {

            nchan_out_buff = max( nchan_out_buff, 2 * BINAURAL_CHANNELS + 2 );

        }

#endif

        else if ( output_config != IVAS_AUDIO_CONFIG_EXTERNAL )

        {

            nchan_out_buff = max( audioCfg2channels( st_ivas->transport_config ), audioCfg2channels( st_ivas->intern_config ) );