Commit 173041d2 authored by vaclav's avatar vaclav
Browse files

Merge branch 'main' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec

parents 23d83be2 f0adfdc9

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -1763,7 +1763,7 @@ ltv-msan: 
    - .sanitizer-selftest-ltv

  rules:

    - if: $SANITIZER_SCHEDULE_E

  timeout: 4 hour

  timeout: 4 hours

  tags:

    - ivas-linux-fast

  before_script:
@@ -1783,7 +1783,7 @@ ltv-asan: 
      start_in: 4 hours

  tags:

    - ivas-linux-fast

  timeout: 3 hour

  timeout: 4 hours

  before_script:

    - CLANG_NUM=2

    - SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_LTV_SANITIZERS
@@ -1801,7 +1801,7 @@ ltv-usan: 
      start_in: 7 hours

  tags:

    - ivas-linux-fast

  timeout: 3 hour

  timeout: 4 hours

  before_script:

    - CLANG_NUM=3

    - SELFTEST_SANITY_TIMEOUT=$TESTCASE_TIMEOUT_LTV_SANITIZERS

apps/decoder.c

+25 −33
Original line number Diff line number Diff line
@@ -69,22 +69,10 @@ static 
#endif

    int32_t frame = 0; /* Counter of frames */



#ifdef DEBUGGING

#define MIN_NUM_BITS_ACTIVE_FRAME 56

#define NUM_BITS_SID_IVAS_5K2     104

#define MAX_OUTPUT_PCM_BUFFER_SIZE ( ( IVAS_MAX_OUTPUT_CHANNELS + IVAS_MAX_NUM_OBJECTS ) * IVAS_MAX_FRAME_SIZE )



#define ORIENT_TRK_NONE        ( 0 )

#define ORIENT_TRK_REF         ( 1 )

#define ORIENT_TRK_AVG         ( 2 )

#define ORIENT_TRK_REF_VEC     ( 3 )

#define ORIENT_TRK_REF_VEC_LEV ( 4 )



#ifdef VARIABLE_SPEED_DECODING

#define VARIABLE_SPEED_FETCH_FRAMESIZE_MS 20

#endif

#define JBM_FRONTEND_FETCH_FRAMESIZE_MS 20

#define HEADROTATION_FETCH_FRAMESIZE_MS 5

#define DEFAULT_FETCH_FRAMESIZE_MS      20





/*------------------------------------------------------------------------------------------*
@@ -129,7 +117,7 @@ typedef struct 
    IVAS_DEC_INPUT_FORMAT inputFormat;

    bool customLsOutputEnabled;

    char *customLsSetupFilename;

    int16_t orientation_tracking;

    IVAS_HEAD_ORIENT_TRK_T orientation_tracking;

    bool non_diegetic_pan_enabled;

    float non_diegetic_pan_gain;

    bool renderConfigEnabled;
@@ -183,7 +171,7 @@ typedef struct 
static bool parseCmdlIVAS_dec( int16_t argc, char **argv, DecArguments *arg );

static void usage_dec( void );

static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, IVAS_DEC_HANDLE hIvasDec );

static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

static ivas_error load_hrtf_from_file( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const IVAS_AUDIO_CONFIG OutputConfig, const int32_t output_Fs );

#ifdef DEBUGGING

static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );
@@ -359,7 +347,7 @@ int main( 
        }



        /* sanity check */

        if ( arg.orientation_tracking != ORIENT_TRK_REF )

        if ( arg.orientation_tracking != IVAS_HEAD_ORIENT_TRK_REF )

        {

            fprintf( stderr, "\nError: Reference rotation file can be used in '-otr ref' mode only.\n\n" );

            goto cleanup;
@@ -386,7 +374,7 @@ int main( 
        }



        /* sanity check */

        if ( arg.orientation_tracking != ORIENT_TRK_REF_VEC && arg.orientation_tracking != ORIENT_TRK_REF_VEC_LEV )

        if ( arg.orientation_tracking != IVAS_HEAD_ORIENT_TRK_REF_VEC && arg.orientation_tracking != IVAS_HEAD_ORIENT_TRK_REF_VEC_LEV )

        {

            fprintf( stderr, "\nError: Reference trajectory file can be used in '-otr ref_vec' or '-otr ref_vec_lev' mode only.\n\n" );

            goto cleanup;
@@ -770,7 +758,7 @@ int main( 


    if ( arg.voipMode )

    {

        error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, hIvasDec );

        error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, hIvasDec, pcmBuf );

    }

    else

    {
@@ -968,6 +956,10 @@ static bool parseCmdlIVAS_dec( 
    int16_t i;

    char argv_to_upper[FILENAME_MAX];



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

     * Set default values

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



#ifdef DEBUGGING

    float ftmp;
@@ -976,7 +968,7 @@ static bool parseCmdlIVAS_dec( 
    arg->agcBitstream = NULL;

#endif

#endif

    arg->output_Fs = 48000;

    arg->output_Fs = IVAS_MAX_SAMPLING_RATE;

    arg->outputConfig = IVAS_AUDIO_CONFIG_MONO;

    arg->decMode = IVAS_DEC_MODE_IVAS;

    arg->quietModeEnabled = false;
@@ -986,7 +978,7 @@ static bool parseCmdlIVAS_dec( 


    arg->enableHeadRotation = false;

    arg->headrotTrajFileName = NULL;

    arg->orientation_tracking = ORIENT_TRK_NONE;

    arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_NONE;

    arg->enableReferenceRotation = false;

    arg->headrotTrajFileName = NULL;

    arg->enableReferenceVectorTracking = false;
@@ -1198,9 +1190,9 @@ static bool parseCmdlIVAS_dec( 
                }

                arg->tsmScale = (uint16_t) tmp;



                if ( arg->tsmScale < 50 || arg->tsmScale > 150 )

                if ( arg->tsmScale < IVAS_TIME_SCALE_MIN || arg->tsmScale > IVAS_TIME_SCALE_MAX )

                {

                    fprintf( stderr, "Error: Scaling factor value must be 50 <= fac <= 150!\n\n" );

                    fprintf( stderr, "Error: Scaling factor value must be IVAS_TIME_SCALE_MIN <= fac <= IVAS_TIME_SCALE_MAX!\n\n" );

                    usage_dec();

                    return false;

                }
@@ -1275,23 +1267,23 @@ static bool parseCmdlIVAS_dec( 


            if ( strcmp( argv_to_upper, "NONE" ) == 0 )

            {

                arg->orientation_tracking = ORIENT_TRK_NONE;

                arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_NONE;

            }

            else if ( strcmp( argv_to_upper, "REF" ) == 0 )

            {

                arg->orientation_tracking = ORIENT_TRK_REF;

                arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_REF;

            }

            else if ( strcmp( argv_to_upper, "AVG" ) == 0 )

            {

                arg->orientation_tracking = ORIENT_TRK_AVG;

                arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_AVG;

            }

            else if ( strcmp( argv_to_upper, "REF_VEC" ) == 0 )

            {

                arg->orientation_tracking = ORIENT_TRK_REF_VEC;

                arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_REF_VEC;

            }

            else if ( strcmp( argv_to_upper, "REF_VEC_LEV" ) == 0 )

            {

                arg->orientation_tracking = ORIENT_TRK_REF_VEC_LEV;

                arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_REF_VEC_LEV;

            }

            else

            {
@@ -1686,7 +1678,7 @@ static void usage_dec( void ) 
#ifdef DEBUGGING

#ifdef VARIABLE_SPEED_DECODING

    fprintf( stdout, "-VS fac             : Variable Speed mode: change speed of playout fac as integer in percent.\n" );

    fprintf( stdout, "                      50 <= fac <= 150; fac<100 faster, fac>100 slower\n" );

    fprintf( stdout, "                      IVAS_TIME_SCALE_MIN <= fac <= IVAS_TIME_SCALE_MAX; fac<100 faster, fac>100 slower\n" );

#endif

#endif

    fprintf( stdout, "-fr L               : render frame size in ms L=(5,10,20), default is 20)\n" );
@@ -3023,14 +3015,15 @@ static ivas_error decodeVoIP( 
    RotFileReader *refRotReader,

    Vector3PairFileReader *referenceVectorReader,

    ObjectEditFileReader *objectEditFileReader,

    IVAS_DEC_HANDLE hIvasDec )

    IVAS_DEC_HANDLE hIvasDec,

    int16_t *pcmBuf )

{

    bool decodingFailed = true; /* Assume failure until cleanup is reached without errors */

    ivas_error error = IVAS_ERR_OK;



    uint32_t nextPacketRcvTime_ms = 0;

    uint32_t systemTime_ms = 0;

    uint32_t systemTimeInc_ms = (uint32_t) JBM_FRONTEND_FETCH_FRAMESIZE_MS;

    uint32_t systemTimeInc_ms = (uint32_t) ( 1000 / IVAS_NUM_FRAMES_PER_SEC );

    int32_t nFramesFed = 0;



    uint8_t au[( IVAS_MAX_BITS_PER_FRAME + 7 ) >> 3];
@@ -3044,7 +3037,6 @@ static ivas_error decodeVoIP( 
    MasaFileWriter *masaWriter = NULL;

    uint16_t numObj = 0;



    int16_t pcmBuf[MAX_OUTPUT_PCM_BUFFER_SIZE];

    AudioFileWriter *afWriter = NULL;

#ifdef SUPPORT_JBM_TRACEFILE

    JbmTraceFileWriter *jbmTraceWriter = NULL;

apps/encoder.c

+22 −26
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ typedef struct 
 * Local functions prototypes

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



static void initArgStruct( EncArguments *arg );

static bool parseCmdlIVAS_enc( int16_t argc, char *argv[], EncArguments *arg );

static void usage_enc( void );

static bool readBandwidth( FILE *file, IVAS_ENC_BANDWIDTH *bandwidth, int32_t *bandwidthFrameCounter );
@@ -208,8 +207,6 @@ int main( 
    reset_mem( USE_BYTES );

#endif



    initArgStruct( &arg );



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

     * Parse command-line arguments

     *------------------------------------------------------------------------------------------*/
@@ -879,14 +876,29 @@ cleanup: 
 * Local functions

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



#define IVAS_DEFAULT_AGC ( 0 )

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

 * parseCmdlIVAS_enc()

 *

 * Encoder command-line parsing

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



static void initArgStruct( EncArguments *arg )

static bool parseCmdlIVAS_enc(

    int16_t argc,

    char *argv[],

    EncArguments *arg )

{

    /* Set default values here */

    int16_t i, j;

    char argv_to_upper[FILENAME_MAX];

    char stmp[FILENAME_MAX];

    int32_t tmp;



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

     * Set default values

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



    arg->inputWavFilename = NULL;

    arg->outputBitstreamFilename = NULL;

    arg->inputFs = 0;

    arg->inputFs = IVAS_MAX_SAMPLING_RATE;

    arg->inputFormat = IVAS_ENC_INPUT_MONO;

    arg->is_binaural = false;

    arg->inputFormatConfig.stereoToMonoDownmix = false;
@@ -920,25 +932,9 @@ static void initArgStruct( EncArguments *arg ) 
#endif

    arg->pca = false;



    return;

}





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

 * parseCmdlIVAS_enc()

 *

 * Encoder command-line parsing

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



static bool parseCmdlIVAS_enc(

    int16_t argc,

    char *argv[],

    EncArguments *arg )

{

    int16_t i, j;

    char argv_to_upper[FILENAME_MAX];

    char stmp[FILENAME_MAX];

    int32_t tmp;

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

     * Initialization

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



    if ( argc < 5 )

    {

apps/isar_post_rend.c

+1 −1
Original line number Diff line number Diff line
@@ -945,7 +945,7 @@ int main( 


    memset( outBuffer.data, 0, outBuffer.config.numSamplesPerChannel * outBuffer.config.numChannels * sizeof( float ) );



    bitsBufferSize = SPLIT_REND_BITS_BUFF_SIZE;

    bitsBufferSize = ISAR_SPLIT_REND_BITS_BUFF_SIZE;



    if ( bitsBufferSize > 0 )

    {

apps/renderer.c

+3 −3
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ typedef struct 
    char externalOrientationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char customHrtfFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char renderConfigFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    int8_t orientation_tracking;

    IVAS_HEAD_ORIENT_TRK_T orientation_tracking;

    int16_t Opt_Headrotation;

    int16_t Opt_ExternalOrientation;

    int16_t nonDiegeticPan;
@@ -1436,7 +1436,7 @@ int main( 


    if ( is_split_pre_rend_mode( &args ) )

    {

        bitsBufferSize = SPLIT_REND_BITS_BUFF_SIZE;

        bitsBufferSize = ISAR_SPLIT_REND_BITS_BUFF_SIZE;

    }

    else

    {
@@ -2268,7 +2268,7 @@ static bool parseRenderFramesize( 


static bool parseOrientationTracking(

    char *value,

    int8_t *orientation_tracking )

    IVAS_HEAD_ORIENT_TRK_T *orientation_tracking )

{

    to_upper( value );