Commit 098855b2 authored by fotopoulou's avatar fotopoulou
Browse files

Merge branch 'main' into add-plc-conditions-for-OSBA-in-self-test

parents 9d217a46 569c63df

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ endif() 
if(INCLUDE_SPLIT)

  file(GLOB libLC3plusSrcs "lib_lc3plus/*.c")

  file(GLOB libLC3plusHeaders "lib_lc3plus/*.h")

  add_library(lc3plus ${libLC3plusSrcs} ${libLC3plusHeaders})

  add_library(lib_lc3plus ${libLC3plusSrcs} ${libLC3plusHeaders})

  target_include_directories(lib_lc3plus PUBLIC lib_lc3plus)

  target_link_libraries(lib_lc3plus lib_com) # For including options.h, which is needed for instrumentation to work correctly

  if(WMOPS)

apps/decoder.c

+5 −0
Original line number Diff line number Diff line
@@ -1576,7 +1576,12 @@ static bool parseCmdlIVAS_dec( 
        return false;

    }



#ifdef FIX_807_VARIABLE_SPEED_DECODING

    if ( ( !arg->enableHeadRotation ) && ( !arg->enableExternalOrientation ) && ( !arg->tsmEnabled ) )

#else

    if ( ( !arg->enableHeadRotation ) && ( !arg->enableExternalOrientation ) )

#endif



    {

        arg->enable5ms = false;

    }

lib_com/ivas_cnst.h

+5 −0
Original line number Diff line number Diff line
@@ -185,7 +185,12 @@ typedef enum 
#define MAX_JBM_L_FRAME48k                      1920

#define MAX_JBM_L_FRAME_NS                      40000000L

#define MAX_SPAR_INTERNAL_CHANNELS              IVAS_SPAR_MAX_CH

#ifdef JBM_FOR_OSBA

#define MAX_CLDFB_DIGEST_CHANNELS               (FOA_CHANNELS + MAX_NUM_OBJECTS)

#else

#define MAX_CLDFB_DIGEST_CHANNELS               4

#endif



#define MASA_JBM_RINGBUFFER_FRAMES              3



typedef enum

lib_com/ivas_prot.h

+22 −0
Original line number Diff line number Diff line
@@ -3480,6 +3480,16 @@ void ivas_sba_set_cna_cng_flag( 


ivas_error ivas_sba_dec_reconfigure(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */

#ifdef JBM_FOR_OSBA

    ,

    uint16_t *nSamplesFlushed,            /* o  : number of samples flushed */

#if defined SPLIT_REND_WITH_HEAD_ROT

    const PCM_RESOLUTION pcm_resolution, /* i  : type for the decoded PCM resolution */

    void *data                           /* o  : output synthesis signal     */

#else

    int16_t *data /* o  : output synthesis signal                 */

#endif

#endif

);



ivas_error ivas_sba_digest_tc(
@@ -5719,6 +5729,18 @@ ivas_error ivas_sba_ism_separate_object_renderer_open( 
    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure      */

);

#endif



#ifdef JBM_FOR_OSBA

ivas_error ivas_osba_dirac_td_binaural_jbm(

    Decoder_Struct *st_ivas,      /* i/o: IVAS decoder structure          */

    const uint16_t nSamplesAsked, /* i  : number of CLDFB slots requested           */

    uint16_t *nSamplesRendered,   /* o  : number of CLDFB slots rendered            */

    uint16_t *nSamplesAvailable,  /* o  : number of CLDFB slots still to render     */

    float *output_f[]             /* o  : rendered time signal                      */

);

#endif





ivas_error ivas_osba_dirac_td_binaural(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */

    float *output[],                                            /* o  : output synthesis signal                 */

lib_com/options.h

+14 −1
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ 
#endif



#define FIX_705_REND_CONF_FALSE_WARNING                 /* Eri: Bug in MSVC ftell() for UNIX-style line endings trigger false warning messages in renderer configuration. */



#define IGF_MEMORY_ALLOC_OPT                            /* FhG: Issue 157: allocate IGF encoder structure only when needed */

#define FIX_732_PLANAR_SBA_OSBA                         /* Dlb : issue 732: fix for crash in planar mode in OSBA format*/

#define FIX_708_DPID_COMMAND_LINE                       /* issue 708: sanity checks for '-dpid' command-line */
@@ -180,6 +181,9 @@ 
#define FIX_796_MCT_MODE_DIFF_JBM                       /* FhG: Issue 796: fix differences between JBM and non-JBM fOR MC */

#define LIB_REND_FIX_HRTFPARAMBIN_MEMLEAK               /* fix 755 */

#define FIX_803_SCE_MD_HANDLE                           /* VA: issue 803: Resolve "MD handle needed only for one SCE" */

#define FIX_812_DOUBLE_PREC_MCT                         /* FhG: Issue 812: Avoid double precision in MCT */

#define FIX_807_VARIABLE_SPEED_DECODING                 /* FhG: Issue 807: Resolve "Variable Speed Decoding broken" */

#define FIX_818_DOUBLE_PREC_KERNEN_SW                   /* FhG: Issue 818: Avoid double precision in kernel switching */





/* #################### End BE switches ################################## */
@@ -189,6 +193,7 @@ 
/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_751_MASA_TD_BITRATE_CHECK                   /* Nokia: issue 751: prevents secondary channel to take reserved bitrate if not DTX mode */



#define NONBE_FIX_736_FOA_BR_SWITCH                           /* FhG/Dlb : Issue 736: FOA bitrate switching decoding crashes in in ivas_spar_to_dirac */

#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.*/

#define NONBE_FIX_723_SBA_BR_SWITCH_MSAN                      /* Dlb: issue 723: Uninitialised value used after BR switching*/
@@ -208,11 +213,19 @@ 
#define NONBE_FIX_738_SBA_BR_SW_ASAN                          /* FhG: issue 738: fixes bug when switching to an MCT bitrate and previous frame was ACELP */

#define NONBE_CR_FIX_735_SBA_HP20_BRATE_SWITCHING             /* VA: Issue 735: Resolve "HP20 filtering bug in SBA/OSBA bitrate switching" */

#define NONBE_FIX_588_UPDATE_FASTCONV_SD                      /* FhG: issue 588: update FastConv SD HRTFs in CLDFB domain with new conversion method */

#define NONBE_FIX_774_OSBA_MONO_DEC_CRASH                     /* FhG: issue 774: decoder crash for OSBA to mono */

#define NONBE_FIX_802_PARAMUPMIX_HIGHPASS                     /* Dlb: issue 802: Move HighPass filter operation for ParamUpmix */

#define NONBE_FIX_778_TNS_UNFIED_STEREO_MSAN                  /* FhG: Issue 778: MSAN error due to uninitialized TNS configuration */

#define NONBE_FIX_797_OMASA_INACTIVE_SEP_OBJ                 /* VA: issue 797:  fix of crash when the separated object is inactive and the MASA metadata is using very few bits */

#define NONBE_FIX_798_OSBA_MC_DEC_CRASH

#define NONBE_FIX_806_OMASA_ONE_SEP_TRANSPORT_MIX             /* Nokia: issue 806: fix one separated object mode transport mix of the separated object */

#define NONBE_FIX_809_EXTERNAL_TARGET_INTERPOLATION           /* FhG: issue 809: unify external target interpolation inter and intra frame behaviour */



#define JBM_FOR_OSBA                                          /* FhG: implement OSBA format in the JBM path */



#ifdef JBM_FOR_OSBA

#define OSBA_ROOM_IR

#endif



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