Commit d46ae80d authored by vaclav's avatar vaclav
Browse files

Merge branch '1851-ref-PortFloatMr1586' into 'ivas-float-update' 

Port MR1586 from float to FLP-ref

See merge request !1980
parents 61f507fe 0d736025

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ 
#define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */

#define FIX_1113_CLDFB_REND_IN_ISAR                     /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */

#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: port OSBA scaling MRs (298,355,360) jointly */

#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.c

+4 −1
Original line number Diff line number Diff line
@@ -2239,8 +2239,11 @@ ivas_error ivas_init_decoder( 
        }

    }





#ifdef FIX_1099_JBM_MD_HANDLE_ALLOC

    if ( ( st_ivas->ivas_format == MASA_FORMAT || 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 ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

        {