Commit 939c36c8 authored by norvell's avatar norvell
Browse files

Merge branch... 

Merge branch '746-using-non-diegetic-panning-flag-in-ism-input-metadata-file-causes-crash-in-decoder' into 'main'

[Non BE] Add fix for non-diegetic panning flag encoding when extended metadata is not enabled

See merge request !1034
parents e6a32f2b cc1158da

lib_com/options.h

+8 −7
Original line number Diff line number Diff line
@@ -145,8 +145,8 @@ 
#define BASOP_NOGLOB                                    /* Disable global symbols in BASOPs, Overflow/Carry in BASOPs disabled, additional BASOPs in case of Overflow */





/* ################# Start BE DEVELOPMENT switches ######################## */

/* only BE switches wrt operation points tested in selection */

/* ################### Start BE switches ################################# */

/* only BE switches wrt selection floating point code */



/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */
@@ -158,16 +158,17 @@ 
#define OSBA_SPLIT_RENDERING

#endif



/* #################### End BE switches ################################## */





/* ################## End BE DEVELOPMENT switches ######################### */

/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



/* #################### Start NON-BE CR switches ########################## */

/* any switch which is non-be wrt operation points tested in selection */

/* all switches in this category should start with "CR_" */

#define NONBE_FIX_746_NONDIEGETIC_MD                          /* Eri: Issue 746: The non-diegetic panning flag affects the encoder bitstream even if extended metadata is not enabled. Crashes the decoder.*/





/* ##################### End NON-BE CR switches ########################### */

/* ##################### End NON-BE switches ############################# */



/* ################## End DEVELOPMENT switches ######################### */

lib_enc/ivas_ism_metadata_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -415,7 +415,11 @@ ivas_error ivas_ism_metadata_enc( 
                    push_indice( hBstr, IND_ISM_NDP_FLAG, hIsmMeta[ch]->non_diegetic_flag, ISM_METADATA_IS_NDP_BITS );

                }



#ifdef NONBE_FIX_746_NONDIEGETIC_MD

                if ( hIsmMeta[ch]->non_diegetic_flag && ism_extended_metadata_flag )

#else

                if ( hIsmMeta[ch]->non_diegetic_flag )

#endif

                {

                    /* Map azimuth to panning range [-90:90] */

                    if ( hIsmMetaData->azimuth > 90.0f )