Commit f501a6a2 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch 'main' into 1224-float-split-rendering-command-line-issues

parents fe9de4a6 8c4042de

apps/renderer.c

+2 −7
Original line number Diff line number Diff line
@@ -87,11 +87,6 @@ static 
#define SEP_FOLDER '/'

#endif



#ifndef _WIN32

#define max( a, b ) ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )

#define min( a, b ) ( ( ( a ) < ( b ) ) ? ( a ) : ( b ) )

#endif





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

 * Local structures
@@ -695,8 +690,8 @@ static void setupWithSingleFormatInput( 


            /* It is allowed on CLI to have no metadata for an ISM input - skip opening if string contains "NULL" */

            char charBuf[FILENAME_MAX];

            strncpy( charBuf, args.inMetadataFilePaths[i], min( FILENAME_MAX, RENDERER_MAX_CLI_ARG_LENGTH ) - 1 );

            charBuf[min( FILENAME_MAX, RENDERER_MAX_CLI_ARG_LENGTH ) - 1] = '\0';

            strncpy( charBuf, args.inMetadataFilePaths[i], RENDERER_MAX_CLI_ARG_LENGTH - 1 );

            charBuf[RENDERER_MAX_CLI_ARG_LENGTH - 1] = '\0';

            to_upper( charBuf );

            if ( strncmp( charBuf, "NULL", 4 ) == 0 )

            {

lib_com/ari_hm_fx.c

+1 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
    EVS Codec 3GPP TS26.452 Nov 04, 2021. Version 16.4.0

  ====================================================================================*/





#include <stdint.h>

#include <assert.h>

#include "options.h"
@@ -11,7 +10,7 @@ 
#include "rom_com.h"

#include "prot_fx.h"



#define GET_ADJ2( T, L, F ) ( ( ( L ) << ( F ) ) - ( T ) )



void UnmapIndex(

    const Word16 PeriodicityIndex, /* Q0 */

    const Word16 Bandwidth,        /* Q0 */

lib_com/cnst.h

+3 −0
Original line number Diff line number Diff line
@@ -985,6 +985,9 @@ enum 
 * TCX constants

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



#define TCX_IMDCT_SCALE                     15

#define TCX_IMDCT_HEADROOM                  1



#define NBITS_TCX_GAIN                      7



#define NOISE_FILL_RANGES                   1

lib_com/ivas_cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ typedef enum 
#define STEREO_DFT_ITD_FS                       32000

#define STEREO_DFT_ITD_MAX                      160                         /*samples @ 32000*/

#define STEREO_DFT_ITD_MAX_ANA                  200

#define STEREO_DFT_ITD_MIN                      max( STEREO_DFT_ITD_MAX - 256 + 1, 1 ) /*STEREO_DFT_ITD_MAX-pow(2,STEREO_DFT_ITD_NBITS-1)+1*/

#define STEREO_DFT_ITD_MIN                      1                           /* == max( STEREO_DFT_ITD_MAX - pow(2,STEREO_DFT_ITD_NBITS-1) + 1, 1 )*/

#define STEREO_DFT_ITD_NBITS                    9                           /* 1 bit for sign, the rest for the absolute value*/

#define STEREO_DFT_ITD_MODE_NBITS               1

lib_com/ivas_prot_fx.h

+8 −2
Original line number Diff line number Diff line
@@ -1570,8 +1570,11 @@ void decoder_tcx_imdct_fx( 
void ivas_sba_dirac_stereo_dec_fx(

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

    Word32 *output[CPE_CHANNELS],                               /* i/o: output synthesis signal                 */

    const Word16 output_frame,                                  /* i  : output frame length per channel         */

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

#ifndef REMOVE_UNUSED_CODE_IVAS_DEC

    ,

    const Word16 mcmasa                                         /* i  : McMASA flag                             */

#endif

);



ivas_error ivas_osba_render_sf_fx(
@@ -4268,8 +4271,11 @@ void ivas_ism_coh_estim_dtx_enc_fx( 
void ivas_ism_dtx_limit_noise_energy_for_near_silence_fx(

    SCE_DEC_HANDLE hSCE[],                                      /* i/o: SCE decoder structures                      */

    const Word16 sce_id_dtx,                                    /* i  : SCE DTX ID                                  */

    const Word16 nchan_transport,                               /* i  : number of transport channels                */

    const Word16 nchan_transport                                /* i  : number of transport channels                */

#ifndef REMOVE_UNUSED_CODE_IVAS_DEC

    ,

    Word16 *Q_cngNoiseLevel 

#endif

);



ivas_error stereo_dft_enc_create_fx(