Unverified Commit e940e7fc authored by norvell's avatar norvell
Browse files

Merge with main

parents da612548 ac900052

apps/decoder.c

+7 −3
Original line number Diff line number Diff line
@@ -1713,9 +1713,13 @@ static ivas_error initOnFirstGoodFrame( 
        if ( arg.rtpOutSR && srRtp != NULL )

        {

            FILE *fParamsSR = NULL;

            char srParamsFile[FILENAME_MAX], *ext = ".sr.txt";

            strncpy( srParamsFile, arg.outputWavFilename, FILENAME_MAX - sizeof( ext ) );

            strncat( srParamsFile, ext, sizeof( ext ) + 1 );

            char srParamsFile[FILENAME_MAX];

            const char *ext = ".sr.txt";



            strncpy( srParamsFile, arg.outputWavFilename, FILENAME_MAX - strlen( ext ) - 1 );

            srParamsFile[FILENAME_MAX - strlen( ext ) - 1] = '\0';

            strncat( srParamsFile, ext, strlen( ext ) );

            srParamsFile[FILENAME_MAX - 1] = '\0';



            /* Write the Split Rendering Params passed from SDP to srParamsFile */

            fParamsSR = fopen( srParamsFile, "w" );

lib_com/ACcontextMapping_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ Word16 get_next_coeff_unmapped( 
    return *idx;

}



Word16 update_mixed_context(

Word16 update_mixed_context_fx(

    Word16 ctx, /* Q0 */

    Word16 a    /* Q0 */

)
@@ -78,7 +78,7 @@ Word16 update_mixed_context( 
    return add( shl( s_and( ctx, 0xf ), 4 ), add( t, 13 ) );

}



Word32 update_mixed_context_ivas_fx(

Word32 update_mixed_context_fx_32(

    Word32 ctx, /* Q0 */

    Word16 a    /* Q0 */

)

lib_com/cldfb_evs_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -996,10 +996,8 @@ ivas_error openCldfb( 
        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for CLDFB" );

    }



#ifdef FIX_2319_CLDFB_INIT_FLAGS

    hs->flags = 0;

    move16();

#endif



    hs->type = type;

    move16();

lib_com/cng_exc_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -306,7 +306,11 @@ IF( NE_16( Opt_AMR_WB, 1 ) ) 


    IF( EQ_16( L_frame, L_FRAME16k ) )

    {

#ifndef FIX_2410_HARM_MODIF_FS

        modify_Fs_fx( fft_io, L_FRAME16k, 16000, fft_io, 12800, exc_mem1, 0 );

#else

        modify_Fs_fx( fft_io, L_FRAME16k, 16000, fft_io, 12800, exc_mem1, 0, NULL, NULL );

#endif

    }



    /* fft_rel(fft_io, L_FFT, LOG2_L_FFT); */
@@ -419,7 +423,11 @@ IF( NE_16( Opt_AMR_WB, 1 ) ) 


    IF( EQ_16( L_frame, L_FRAME16k ) )

    {

#ifndef FIX_2410_HARM_MODIF_FS

        modify_Fs_fx( fft_io, L_FFT, 12800, fft_io, 16000, exc_mem, 0 );

#else

        modify_Fs_fx( fft_io, L_FFT, 12800, fft_io, 16000, exc_mem, 0, NULL, NULL );

#endif

    }



    /* enr1 = dotp( fft_io, fft_io, L_frame ) / L_frame; */

lib_com/core_com_config_fx.c

+2 −3
Original line number Diff line number Diff line
@@ -997,8 +997,7 @@ void init_tcx_cfg_ivas_fx( 


    IF( hTcxCfg->fIsTNSAllowed )

    {

        InitTnsConfigs_ivas_fx( bwidth, hTcxCfg->tcx_coded_lines, hTcxCfg->tnsConfig, infoIGFStopFreq, total_brate, element_mode, MCT_flag );



        InitTnsConfigs_fx( bwidth, hTcxCfg->tcx_coded_lines, hTcxCfg->tnsConfig, infoIGFStopFreq, total_brate, element_mode, MCT_flag );

        SetAllowTnsOnWhite( hTcxCfg->tnsConfig, (Word8) EQ_16( element_mode, IVAS_CPE_MDCT ) );

    }
@@ -1253,7 +1252,7 @@ void init_tcx_cfg_fx( 


    IF( hTcxCfg->fIsTNSAllowed )

    {

        InitTnsConfigs( bwidth, hTcxCfg->tcx_coded_lines, hTcxCfg->tnsConfig, infoIGFStopFreq, total_brate, element_mode, MCT_flag );

        InitTnsConfigs_fx( bwidth, hTcxCfg->tcx_coded_lines, hTcxCfg->tnsConfig, infoIGFStopFreq, total_brate, element_mode, MCT_flag );



        SetAllowTnsOnWhite( hTcxCfg->tnsConfig, (Word8) EQ_16( element_mode, IVAS_CPE_MDCT ) );

    }