Commit bf9cac38 authored by vaclav's avatar vaclav
Browse files

Merge branch '1851-basop-PortFloatMr1586' into 'main' 

Port MR1586 from float to BASOP

Closes #1851

See merge request !1979
parents 1b6b9730 4846fe0e

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ 
#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */

#define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */

#define NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING       /* VA: issue 1110: fix encoder crash in the stereo DTX bitrate switching condition */

#define FIX_1099_JBM_MD_HANDLE_ALLOC                    /* VA: issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA only */

#define NONBE_1894_OSBA_SCALING                          /* FhG: do not scale OSBA inputs by 0.5 any more */

#define NONBE_FIX_1141_OSBA_ROOM_RENDERING               /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect  */

#define NONBE_1360_LFE_DELAY                           /* Dlb: LFE delay alignment when rendering in CLDFB domain*/

lib_dec/ivas_init_dec_fx.c

+6 −1
Original line number Diff line number Diff line
@@ -2698,7 +2698,6 @@ ivas_error ivas_init_decoder_fx( 
     *-----------------------------------------------------------------*/



    IF( st_ivas->hTcBuffer == NULL )



    {

        /* no module has yet open the TC buffer, open a default one */

        n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );
@@ -2717,8 +2716,14 @@ ivas_error ivas_init_decoder_fx( 
            return error;

        }

    }



    test();

#ifdef FIX_1099_JBM_MD_HANDLE_ALLOC

    test();

    IF( ( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) || EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) ) && st_ivas->hDecoderConfig->Opt_tsm )

#else

    IF( st_ivas->hJbmMetadata == NULL && st_ivas->hDecoderConfig->Opt_tsm )

#endif

    {

        IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )

        {