Commit 4e2cf8b8 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into basop-2510-seemingly-debug-assert-0-in-initdiffuseresponses_fx
parents f1f69ea9 efc1fc02

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -1251,7 +1251,7 @@ int main( 
    /* Set reverb room size if specified */

    if ( args.reverbRoomSize != IVAS_ROOM_SIZE_AUTO )

    {

        if ( ( IVAS_REND_SetReverbRoomSize( hIvasRend, args.reverbRoomSize ) ) != IVAS_ERR_OK )

        if ( ( error = IVAS_REND_SetReverbRoomSize( hIvasRend, args.reverbRoomSize ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError setting reverb room size\n" );

            goto cleanup;

lib_com/basop_util.c

+0 −2
Original line number Diff line number Diff line
@@ -714,7 +714,6 @@ Word16 getScaleFactor16( /* o: measured headroom in range [ 
    return i;

}



#ifdef OPTIMIZE_FFT_STACK

/* o: measured headroom in range [0..31], 0 if all x[i] == 0 */

Word16 getScaleFactor32_cmplx(

    cmplx *x,          /* i: array containing 32-bit data */
@@ -772,7 +771,6 @@ Word16 getScaleFactor32_cmplx( 


    return s_min( i_re, i_im );

}

#endif





/********************************************************************/

lib_com/basop_util.h

+0 −2
Original line number Diff line number Diff line
@@ -221,13 +221,11 @@ Word16 getScaleFactor16( 
    const Word16 *x,      /* i: array containing 16-bit data */

    const Word16 len_x ); /* i: length of the array to scan  */



#ifdef OPTIMIZE_FFT_STACK

/* o: measured headroom in range [0..31], 0 if all x[i] == 0 */

Word16 getScaleFactor32_cmplx(

    cmplx *x,          /* i: array containing 32-bit data */

    const Word16 len_x /* i: length of the array to scan  */

);

#endif



/********************************************************************/

/*!

lib_com/edct_fx.c

+15 −366

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/fd_cng_com_fx.c

+0 −1208

File changed.

Preview size limit exceeded, changes collapsed.