Commit 90b15a07 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge branch 'main' into b_20230817_jbm-for-osba

parents cf27c4cc 5200a4fa

lib_com/ivas_prot.h

+8 −0
Original line number Diff line number Diff line
@@ -762,6 +762,14 @@ void dtx_read_padding_bits( 
    const int16_t num_bits 

);



#ifdef FIX_764_HARM_CODE

void ivas_apply_non_diegetic_panning( 

    float *output_f[],                                          /* i/o: core-coder transport mono channel/stereo output             */

    const float non_diegetic_pan_gain,                          /* i  : non-diegetic panning gain                                   */

    const int16_t output_frame                                  /* i  : output frame length per channel                             */

);

#endif





/*----------------------------------------------------------------------------------*

 * JBM prototypes

lib_com/options.h

+1 −3
Original line number Diff line number Diff line
@@ -161,8 +161,6 @@ 
#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. */



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



#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 */
@@ -173,6 +171,7 @@ 
#define FIX_759_CODE_COVERAGE_OSBA                      /* VA: issue 759: remove obsolete code in the OSBA encoder */

#define FIX_708_AEID_COMMAND_LINE                       /* VA: issue 708: improve AEID command-line robustness */

#define FIX_518_ISM_BRIR_EXTREND                        /* FhG: fix issue #518, cleanup ISM to BINAURAL_ROOM_IR rendering in the external renderer */

#define FIX_764_HARM_CODE                               /* VA: issue 764: introduce new function for the same code block at four different places */



/* #################### End BE switches ################################## */
@@ -180,7 +179,6 @@ 
/* any switch which is non-be wrt selection floating point code */

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

lib_dec/ivas_dec.c

+125 −148

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_jbm_dec.c

+148 −154

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_mono_dmx_renderer.c

+25 −0
Original line number Diff line number Diff line
@@ -186,3 +186,28 @@ void ivas_mono_stereo_downmix_mcmasa( 


    return;

}



#ifdef FIX_764_HARM_CODE

/*-------------------------------------------------------------------------

 * ivas_apply_non_diegetic_panning()

 *

 * Apply non-diegetic panning

 *------------------------------------------------------------------------*/



void ivas_apply_non_diegetic_panning(

    float *output_f[],                 /* i/o: core-coder transport mono channel/stereo output  */

    const float non_diegetic_pan_gain, /* i  : non-diegetic panning gain                        */

    const int16_t output_frame         /* i  : output frame length per channel                  */

)

{

    float pan_left, pan_right;



    pan_left = ( non_diegetic_pan_gain + 1.f ) * 0.5f;

    pan_right = 1.f - pan_left;



    v_multc( output_f[0], pan_right, output_f[1], output_frame );

    v_multc( output_f[0], pan_left, output_f[0], output_frame );



    return;

}

#endif