Commit 15faa017 authored by eichenseer's avatar eichenseer
Browse files

Merge branch 'main' into 549-paramism-output-too-quiet

parents 9e72fafc edfab72e

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ variables: 
  SANITIZER_TESTS: "CLANG1 CLANG2"

  OUT_FORMATS_CHANNEL_BASED: "stereo mono 5_1 5_1_2 5_1_4 7_1 7_1_4"

  OUT_FORMATS_SCENE_BASED: "FOA HOA2 HOA3"

  OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM"

  OUT_FORMATS_BINAURAL: "BINAURAL BINAURAL_ROOM_IR BINAURAL_ROOM_REVERB"

  EXIT_CODE_NON_BE: 123

  EXIT_CODE_FAIL: 1

apps/decoder.c

+0 −155

File changed.

Preview size limit exceeded, changes collapsed.

apps/encoder.c

+0 −20
Original line number Diff line number Diff line
@@ -98,9 +98,7 @@ typedef struct 
    char *outputBitstreamFilename;

    int32_t inputFs;

    IVAS_ENC_INPUT_FORMAT inputFormat;

#ifdef BINAURAL_AUDIO_CMDLINE

    bool is_binaural;

#endif

    EncInputFormatConfig inputFormatConfig;

    bool max_bwidth_user;

    IVAS_ENC_BANDWIDTH maxBandwidth;
@@ -365,29 +363,17 @@ int main( 
    switch ( arg.inputFormat )

    {

        case IVAS_ENC_INPUT_MONO:

#ifdef BINAURAL_AUDIO_CMDLINE

            if ( ( error = IVAS_ENC_ConfigureForMono( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, caConfig, arg.inputFormatConfig.stereoToMonoDownmix, arg.is_binaural ) ) != IVAS_ERR_OK )

#else

            if ( ( error = IVAS_ENC_ConfigureForMono( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, caConfig, arg.inputFormatConfig.stereoToMonoDownmix ) ) != IVAS_ERR_OK )

#endif

            {

                fprintf( stderr, "\nIVAS_ENC_ConfigureForMono failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );

                goto cleanup;

            }

            break;

        case IVAS_ENC_INPUT_STEREO:

#ifdef BINAURAL_AUDIO_CMDLINE

#ifdef DEBUGGING

            if ( ( error = IVAS_ENC_ConfigureForStereo( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.is_binaural, arg.inputFormatConfig.stereoMode ) ) != IVAS_ERR_OK )

#else

            if ( ( error = IVAS_ENC_ConfigureForStereo( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.is_binaural ) ) != IVAS_ERR_OK )

#endif

#else

#ifdef DEBUGGING

            if ( ( error = IVAS_ENC_ConfigureForStereo( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.stereoMode ) ) != IVAS_ERR_OK )

#else

            if ( ( error = IVAS_ENC_ConfigureForStereo( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig ) ) != IVAS_ERR_OK )

#endif

#endif

            {

                fprintf( stderr, "\nIVAS_ENC_ConfigureForStereo failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
@@ -880,9 +866,7 @@ static void initArgStruct( EncArguments *arg ) 
    arg->outputBitstreamFilename = NULL;

    arg->inputFs = 0;

    arg->inputFormat = IVAS_ENC_INPUT_MONO;

#ifdef BINAURAL_AUDIO_CMDLINE

    arg->is_binaural = false;

#endif

    arg->inputFormatConfig.stereoToMonoDownmix = false;

    arg->max_bwidth_user = false;

    arg->maxBandwidth = IVAS_ENC_BANDWIDTH_UNDEFINED;
@@ -1302,13 +1286,11 @@ static bool parseCmdlIVAS_enc( 
            }

#endif /* DEBUGGING */

        }

#ifdef BINAURAL_AUDIO_CMDLINE

        else if ( strcmp( argv_to_upper, "-BINAURAL" ) == 0 )

        {

            arg->is_binaural = true;

            i++;

        }

#endif

        else if ( strcmp( argv_to_upper, "-ISM" ) == 0 )

        {

            arg->inputFormat = IVAS_ENC_INPUT_ISM;
@@ -1731,9 +1713,7 @@ static void usage_enc( void ) 
    fprintf( stdout, "                      alternatively, B can be a text file where each line contains \"nb_frames B\"\n" );

    fprintf( stdout, "-no_delay_cmp       : Turn off delay compensation\n" );

    fprintf( stdout, "-stereo_dmx_evs     : Activate stereo downmix function for EVS.\n" );

#ifdef BINAURAL_AUDIO_CMDLINE

    fprintf( stdout, "-binaural           : Optional indication that input is binaural audio (to be used with -stereo or -stereo_dmx_evs)\n" );

#endif

    fprintf( stdout, "-mime               : Mime output bitstream file format\n" );

    fprintf( stdout, "                      The encoder produces TS26.445 Annex.2.6 Mime Storage Format, (not RFC4867 Mime Format).\n" );

    fprintf( stdout, "                      default output bitstream file format is G.192\n" );

apps/renderer.c

+0 −221

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/common_api_types.h

+0 −4
Original line number Diff line number Diff line
@@ -133,10 +133,6 @@ typedef struct 
typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG

{

    int16_t override;

#ifndef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

    int16_t use_brir;

    int16_t late_reverb_on;

#endif

    int16_t nBands;                                   /* Number of frequency bands for which reverb properties are provided, integer, range [2..256] */

    float pFc_input[IVAS_CLDFB_NO_CHANNELS_MAX];      /* Center frequencies for which following values are provided: */

    float pAcoustic_rt60[IVAS_CLDFB_NO_CHANNELS_MAX]; /*  - The room's T60 per center frequency */