Commit 6698f7fe authored by sagnowski's avatar sagnowski
Browse files

Merge branch 'main' into 245-crash-in-range-coder-for-mc-bitstreams-in-voip-mode

parents 8c6bbc61 09d42f9c

lib_com/ivas_prot.h

+2 −1
Original line number Diff line number Diff line
@@ -4608,11 +4608,12 @@ void ivas_binRenderer_close( 
    BINAURAL_RENDERER_HANDLE *hBinRenderer                      /* i/o: decoder binaural renderer handle                */

);



#ifdef DEBUGGING

void ivas_binaural_cldfb(

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

    float output_f[][L_FRAME48k]                                /* i/o: synthesized core-coder transport channels/DirAC output  */

);



#endif

void ivas_binRenderer(

    BINAURAL_RENDERER_HANDLE hBinRenderer,                      /* i/o: fastconv binaural renderer handle                       */

    HEAD_TRACK_DATA_HANDLE hHeadTrackData,                      /* i/o: head track handle                                       */

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ 
#define FIX_265_MC_BRATE_SWITCHING                      /* Issue 265: fix use-of-uninitialized-value in MC bitrate switching */

#define FIX_ANGLE_WRAPPING								/* Issue 244: Problems with angle wrapping*/

#define FIX_245_RANGE_CODER_VOIP_MSAN                   /* Issue 245: fix use-of-uninitialized-value in range coder in VoIP mode */

#define FIX_272_COV                                     /* Issue 272: Cleanup for code coverage related to calls to ivas_binaural_cldfb() */



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

/* clang-format on */

lib_dec/ivas_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -210,10 +210,12 @@ ivas_error ivas_dec( 
                ivas_crend_process( st_ivas, output );

                ivas_binaural_add_LFE( st_ivas, output_frame, output );

            }

#ifdef DEBUGGING

            else if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

            {

                ivas_binaural_cldfb( st_ivas, output );

            }

#endif

        }

    }

    else if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT )
@@ -394,11 +396,13 @@ ivas_error ivas_dec( 
                ivas_crend_process( st_ivas, output );

                ivas_binaural_add_LFE( st_ivas, output_frame, output );

            }

#ifndef FIX_272_COV

            else if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )

            {

                ivas_binaural_cldfb( st_ivas, output );

                ivas_binaural_add_LFE( st_ivas, output_frame, output );

            }

#endif

            else if ( st_ivas->renderer_type == RENDERER_MC )

            {

                ivas_ls_setup_conversion( st_ivas, output_frame, output );

lib_rend/ivas_binauralRenderer.c

+3 −1
Original line number Diff line number Diff line
@@ -807,8 +807,9 @@ void ivas_binaural_add_LFE( 
}





#ifdef DEBUGGING

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

 * ivas_binRenderer_cldfb()

 * ivas_binaural_cldfb()

 *

 * Perform CLDFB analysis, fastconv binaural rendering and CLDFB synthesis

 *-------------------------------------------------------------------------*/
@@ -880,6 +881,7 @@ void ivas_binaural_cldfb( 


    return;

}

#endif





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