Commit 4a0fe9c6 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into FhG/external-renderer

parents 5912615a 529db2bb

apps/encoder.c

+19 −0
Original line number Diff line number Diff line
@@ -120,7 +120,11 @@ typedef struct 
    const char *ca_config_file;

    bool mimeOutput;



#ifdef AGC_ENABLE_FOR_LBR

    IVAS_ENC_AGC agc;

#else

    bool agc;

#endif

    bool pca;

#ifdef DEBUG_FOA_AGC

    FILE *agcBitstream; /* temporary */
@@ -876,7 +880,11 @@ static void initArgStruct( EncArguments *arg ) 
    arg->ca_config_file = NULL;

    arg->mimeOutput = false;



#ifdef AGC_ENABLE_FOR_LBR

    arg->agc = IVAS_ENC_AGC_UNDEFINED;

#else

    arg->agc = IVAS_DEFAULT_AGC;

#endif

    arg->pca = false;

#ifdef DEBUG_FOA_AGC

    arg->agcBitstream = NULL;
@@ -1387,7 +1395,11 @@ static bool parseCmdlIVAS_enc( 
            i++;

            if ( i < argc - 4 )

            {

#ifdef AGC_ENABLE_FOR_LBR

                arg->agc = ( atoi( argv[i] ) ) ? IVAS_ENC_AGC_ENABLED : IVAS_ENC_AGC_DISABLED;

#else

                arg->agc = (int16_t) atoi( argv[i] );

#endif

                if ( argv[i] == NULL || atoi( argv[i] ) < 0 || atoi( argv[i] ) > 1 )

                {

                    fprintf( stderr, "Error: wrong adaptive gain control option specified (%d), expected 0 or 1\n\n", (int32_t) atoi( argv[i] ) );
@@ -1642,7 +1654,14 @@ static void usage_enc( void ) 
#ifdef DEBUG_SBA

    fprintf( stdout, "-tag                : Tag name for intermediate debug files\n" );

#endif

#ifdef AGC_ENABLE_FOR_LBR

    fprintf( stdout, "-agc op             : SBA Adaptive gain control, op = (0, 1).  \n" );

    fprintf( stdout, "                      By default op is 1 (activated) for bitrates between 24400 and 32000,\n" );

    fprintf( stdout, "                      otherwise it is 0 (deactivated) for all other bitrates\n" );

#else

    fprintf( stdout, "-agc op             : SBA Adaptive gain control, op = (0, 1), by default op is 0 or deactivated\n" );

#endif



    fprintf( stdout, "-bypass mode        : SBA PCA by-pass, mode = (1, 2), 1 = PCA off, 2 = signal adaptive, default is 1\n" );

#ifdef DEBUGGING

    fprintf( stdout, "-force T            : Force specific mode, T = (speech, music, ACELP, GSC, TCX, HQ),\n" );

lib_com/ivas_agc_com.c

+29 −0
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ 
#endif

#include <math.h>

#include "wmops.h"

#ifdef AGC_TUNING_IMPROVEMENT

#include "prot.h"

#endif



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

 * Local constants
@@ -47,6 +50,11 @@ 


#define SQRKMAX     ( 1.5f )

#define NBITS_DIFFG ( 2 )

#ifdef AGC_TUNING_IMPROVEMENT

#define DBSTEP       ( -6.f ) /* desired dB step value in dB*/

#define ABS_EMIN_MAX ( 3 )

#define MAXATTEXP    ( 1 ) /* the desired maximum attenuation exponent range per frame*/

#endif



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

 * Function ivas_agc_initWindowFunc()
@@ -60,12 +68,22 @@ void ivas_agc_initWindowFunc( 
{

    int16_t i;

    float N;

#ifdef AGC_TUNING_IMPROVEMENT

    float a;

#endif



    N = (float) ( length - 1 );

#ifdef AGC_TUNING_IMPROVEMENT

    a = 0.5f * ( 1.f - powf( 10.f, DBSTEP / 20.f ) );

#endif



    for ( i = 0; i < length; i++ )

    {

#ifdef AGC_TUNING_IMPROVEMENT

        pWinFunc[i] = 1.f + a * ( cosf( EVS_PI * i / N ) - 1.f );

#else

        pWinFunc[i] = 0.75f + 0.25f * cosf( EVS_PI * i / N );

#endif

    }



    return;
@@ -89,7 +107,11 @@ void ivas_agc_calcGainParams( 


    nbits = NBITS_DIFFG;



#ifdef AGC_TUNING_IMPROVEMENT

    *absEmin = max( ABS_EMIN_MAX, (uint16_t) ceilf( logf( ceilf( SQRKMAX * numCoeffs ) ) * INV_LOG_2 ) );

#else

    *absEmin = (uint16_t) ceilf( logf( ceilf( SQRKMAX * numCoeffs ) ) * INV_LOG_2 );

#endif



    totExp = *absEmin + AGC_EMAX + 1;

    *betaE = (uint16_t) ceilf( logf( totExp ) * INV_LOG_2 );
@@ -98,10 +120,17 @@ void ivas_agc_calcGainParams( 


    if ( nbits > 0 )

    {

#ifdef AGC_TUNING_IMPROVEMENT

        Bm = min( AGC_BITS_PER_CH - 1, NBITS_DIFFG );

#else

        Bm = NBITS_DIFFG;

#endif

    }



    *maxAttExp = ( (uint16_t) powf( 2, Bm ) ) - 2;

#ifdef AGC_TUNING_IMPROVEMENT

    *maxAttExp = min( MAXATTEXP, *maxAttExp );

#endif



    return;

}

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -1325,7 +1325,11 @@ typedef enum 
#define PANNING_ELE_RESOLUTION                  5



#define EFAP_MAX_CHAN_NUM                       5                           /* Maximum number of channels that constitute a polygon, 4 or 5 */

#ifdef ALLRAD_OPTIM

#define EFAP_MAX_POLY_SET                       50                          /* Upper bound on number of polygons; with a Speaker setup of 16.0, we obtain 44 polygons/triangles in the matlab implementation. */

#else

#define EFAP_MAX_POLY_SET                       70                          /* Upper bound on number of polygons; with a Speaker setup of 26.0, we obtain 54 polygons/triangles in the matlab implementation. */

#endif



#define EFAP_MODE_EFAP                          0                           /* EFAP Panning */

#define EFAP_MODE_EFIP                          1                           /* EFIP Panning */

lib_com/ivas_prot.h

+10 −1
Original line number Diff line number Diff line
@@ -44,7 +44,9 @@ 
#include "ivas_stat_dec.h"

#include "ivas_stat_com.h"

#include "ivas_error_utils.h"



#ifdef AGC_ENABLE_FOR_LBR

#include "lib_enc.h"

#endif



/* clang-format off */
@@ -3780,6 +3782,13 @@ void ivas_sba_prototype_renderer( 
);



/* AGC */

#ifdef AGC_ENABLE_FOR_LBR

int16_t ivas_agc_enc_get_enablement_flag(

    IVAS_ENC_AGC agc_configuration,                             /* i  : configuration used when encoder was initialised from cmd line */

    int16_t nchan_transport                                     /* i  : number of transport channels                                  */

);

#endif



ivas_error ivas_spar_agc_enc_open( 

    ivas_agc_enc_state_t **hAgcEnc,                             /* i/o: AGC decoder handle                      */

    const int32_t input_Fs,                                     /* i  : input sampling rate                     */

lib_com/options.h

+6 −0
Original line number Diff line number Diff line
@@ -152,11 +152,17 @@ 
#define FIX_155_HP20_ISSUE                              /* Issue 155: apply hp20 on all input channels instead of just 2 channels */

#define EFAP_FIX_POLY                                   /* Issue 167: fix bug in EFAP polygon selection */

#define SBA_HOA_HBR_IMPROV                              /* issue 91: Improvements to SBA high bitrate HOA3 coding */

#define ALLRAD_OPTIM                                    /* Issue 159: Optimize memory allocation for ALLRAD */

#define FIX_I178_HQ_BUFFER_OVERRUN                      /* issue 178: Buffer overrun in HQ core decoder -- spectral filling buffer did not account for extended transition frame in IVAS */

#define PRINT_SBA_ORDER                                 /* Issue 179: print-out also the SBA order of IVAS SBA format to stdout */



#define EXT_RENDERER                                    /* FhG: external renderer library and standalone application */

#define FIX_EFAP_MATH                                   /* fix for EFAP: remove angle quantization and a bug in polygon lookup causing incorrect gains. minor tweak for ALLRAD. non-BE for modes using EFAP */

#define AGC_TUNING_IMPROVEMENT                          /* Issue 168: Enable AGC for low bit rate (1 TC) */

#ifdef AGC_TUNING_IMPROVEMENT

#define AGC_ENABLE_FOR_LBR                              /* Issue 168: Enable AGC for low bit rate (1 TC) */

#endif



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

/* clang-format on */

#endif