Commit de03b5cb authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into ci/print-reference-commit-explicitly

parents 8a7d388a 4ed68180

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ 
#define NONBE_FIX_977_OSBA_GAIN_MISMATCH                      /* Dlb : issue 977 : Output gain mismatch for different bit rates in OSBA */

#define NONBE_FIX_973_HODIRAC_BAND_GROUPING                   /* FhG: issue 973: empty parameter band in DirAC */

#define NONBE_FIX_951_MCMASA_5MS_RENDERING                    /* Nokia: issue #951: Differences for 5ms and 20ms rendering for McMASA at 13.2 kbps to BINAURAL */



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

#define BE_FIX_567_DOUBLE_STEREO_DMX                          /* NTT: Fix formal issues */   

#define NONBE_FIX_567_DOUBLE_STEREO_DMX                       /* Orange: Double-precision replaced by single-precision */   

#define NONBE_FIX_947_STEREO_DMX_EVS_POC                      /* Orange: Fix clicks on POC */

lib_dec/ivas_jbm_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -984,7 +984,11 @@ 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

+14 −1
Original line number Diff line number Diff line
@@ -267,10 +267,23 @@ 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

+6 −0
Original line number Diff line number Diff line
@@ -345,6 +345,12 @@ 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( nchan_out_buff, audioCfg2channels( st_ivas->intern_config ) );