Commit 40771f50 authored by kinuthia's avatar kinuthia
Browse files

Merge branch 'main' into... 

Merge branch 'main' into 330-enable-reverb-for-td-renderer-while-using-the-external-render-ivas_rend
parents b24077f7 c2007202

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ workflow: 
    # see https://docs.gitlab.com/ee/ci/yaml/workflow.html#switch-between-branch-pipelines-and-merge-request-pipelines

    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push"

      when: never

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' # Runs for merge requests

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Pushes to main

    - if: $CI_PIPELINE_SOURCE == 'schedule' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Scheduled in main

    - if: $CI_PIPELINE_SOURCE == 'web' # for testing
@@ -130,7 +130,7 @@ stages: 
.rules-merge-request:

  extends: .rules-basis

  rules:

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main

    - if: $CI_PIPELINE_SOURCE == 'push'

      when: never

CMakeLists.txt

+7 −9
Original line number Diff line number Diff line
@@ -112,45 +112,42 @@ project(stereo-evs) 
set_property(GLOBAL PROPERTY USE_FOLDERS ON) # make Visual Studio projects look nicer

include(CTest)



include_directories(

  lib_com

  lib_debug

  lib_dec

  lib_enc

  lib_rend

  lib_util

)



file(GLOB libComSrcs "lib_com/*.c")

file(GLOB libComHeaders "lib_com/*.h")

add_library(lib_com ${libComSrcs} ${libComHeaders})

if(UNIX)

  target_link_libraries(lib_com m)

endif()

target_include_directories(lib_com PUBLIC lib_com PRIVATE lib_enc lib_dec lib_rend lib_debug)



file(GLOB libDebugSrcs "lib_debug/*.c")

file(GLOB libDebugHeaders "lib_debug/*.h")

add_library(lib_debug ${libDebugSrcs} ${libDebugHeaders})

target_link_libraries(lib_debug lib_com)

target_include_directories(lib_debug PUBLIC lib_debug PRIVATE lib_enc lib_dec lib_rend)



file(GLOB libEncSrcs "lib_enc/*.c")

file(GLOB libEncHeaders "lib_enc/*.h")

add_library(lib_enc ${libEncSrcs} ${libEncHeaders})

target_link_libraries(lib_enc lib_com lib_debug)

target_include_directories(lib_enc PUBLIC lib_enc PRIVATE lib_dec lib_rend)



file(GLOB libRendSrcs "lib_rend/*.c")

file(GLOB libRendHeaders "lib_rend/*.h")

add_library(lib_rend ${libRendSrcs} ${libRendHeaders})

target_link_libraries(lib_rend lib_dec lib_com lib_debug) # Todo refactor: This dependency on lib_dec should be removed.

target_include_directories(lib_rend PUBLIC lib_rend PRIVATE lib_enc)



file(GLOB libDecSrcs "lib_dec/*.c")

file(GLOB libDecHeaders "lib_dec/*.h")

add_library(lib_dec ${libDecSrcs} ${libDecHeaders})

target_link_libraries(lib_dec lib_com lib_rend lib_debug)

target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_enc)



file(GLOB libUtilSrcs "lib_util/*.c")

file(GLOB libUtilHeaders "lib_util/*.h")

add_library(lib_util ${libUtilSrcs} ${libUtilHeaders})

target_include_directories(lib_util PUBLIC lib_util PRIVATE lib_com lib_enc lib_dec lib_rend lib_debug)



add_executable(IVAS_cod apps/encoder.c)

target_link_libraries(IVAS_cod lib_enc lib_util)
@@ -166,6 +163,7 @@ endif() 


add_executable(IVAS_rend apps/renderer.c)

target_link_libraries(IVAS_rend lib_rend lib_util)

target_include_directories(IVAS_rend PRIVATE lib_enc)



if(COPY_EXECUTABLES_FROM_BUILD_DIR)

  # Optionally copy executables to the same place where Make puts them (useful for tests that expect executables in specific places)

apps/decoder.c

+118 −13
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <stdio.h>

#include <string.h>

#include <stdlib.h>

#include "options.h"

#include "lib_dec.h"

#include "cmdl_tools.h"

#include "audio_file_writer.h"
@@ -223,8 +222,21 @@ int main( 


    if ( arg.hrtfReaderEnabled )

    {

#ifdef FIX_351_HRTF_COMMAND

        /* sanity check */

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )

        {

            arg.hrtfReaderEnabled = false;

            fprintf( stderr, "\nError: HRTF binary file cannot be used in this output configuration.\n\n" );

            goto cleanup;

        }

#endif



        if ( ( error = hrtfFileReader_open( arg.hrtfFileName, &hrtfReader ) ) != IVAS_ERR_OK )

        {

#ifdef FIX_351_HRTF_COMMAND

            arg.hrtfReaderEnabled = false;

#endif

            fprintf( stderr, "\nError: Can't open HRTF binary file %s \n\n", arg.hrtfFileName );

            goto cleanup;

        }
@@ -236,6 +248,15 @@ int main( 


    if ( arg.enableHeadRotation )

    {

#ifdef FIX_351_HRTF_COMMAND

        /* sanity check */

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )

        {

            fprintf( stderr, "\nError: Head-rotation file file cannot be used in this output configuration.\n\n" );

            goto cleanup;

        }

#endif



        if ( ( error = HeadRotationFileReader_open( arg.headrotTrajFileName, &headRotReader ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError: Can't open head-rotation file %s \n\n", arg.headrotTrajFileName );
@@ -262,6 +283,15 @@ int main( 


    if ( arg.renderConfigEnabled )

    {

#ifdef FIX_351_HRTF_COMMAND

        /* sanity check */

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )

        {

            fprintf( stderr, "\nError: Renderer configuration file cannot be used in this output configuration.\n\n" );

            goto cleanup;

        }

#endif



        if ( ( error = RenderConfigReader_open( arg.renderConfigFilename, &renderConfigReader ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError: Can't open Renderer configuration file %s \n\n", arg.renderConfigFilename );
@@ -274,13 +304,21 @@ int main( 
     *------------------------------------------------------------------------------------------*/



#ifdef REMOVE_FORCE_SUBFRAME_BIN

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation ) ) != IVAS_ERR_OK )

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled ) ) != IVAS_ERR_OK )

#else

#ifdef DEBUGGING

#ifdef FIX_351_HRTF_COMMAND

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled, arg.forceSubframeBinauralization ) ) != IVAS_ERR_OK )

#else

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.forceSubframeBinauralization ) ) != IVAS_ERR_OK )

#endif

#else

#ifdef FIX_351_HRTF_COMMAND

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled ) ) != IVAS_ERR_OK )

#else

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation ) ) != IVAS_ERR_OK )

#endif

#endif

#endif

    {

        fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -457,9 +495,7 @@ int main( 
        if ( ( error = create_SetOfHRTF_from_binary( hSetOfHRTF, hrtfReader, arg.output_Fs ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError in loading HRTF binary file %s for CRend \n\n", arg.hrtfCRendFileName );

#ifndef FIX_FOR_TEST

            goto cleanup;

#endif

        }

        IVAS_DEC_HRTF_FASTCONV_HANDLE hHrtfFastConv;

        IVAS_DEC_GetHrtfFastConvHandle( hIvasDec, &hHrtfFastConv );
@@ -536,6 +572,7 @@ cleanup: 
#ifdef DEBUG_SBA_AUDIO_DUMP

    IVAS_DEC_GetSbaDebugParams( hIvasDec, &numOutChannels, &numTransportChannels, &pca_ingest_channels );

#endif



    if ( arg.hrtfReaderEnabled )

    {

        IVAS_DEC_HRTF_HANDLE hHrtfTD;
@@ -1154,9 +1191,17 @@ static ivas_error initOnFirstGoodFrame( 
    }

    else

    {

#ifdef BINAURALIZATION_DELAY_REPORT

        pFullDelayNumSamples[0] = 0;

#else

        *pFullDelayNumSamples = 0;

#endif

    }

#ifdef BINAURALIZATION_DELAY_REPORT

    *pRemainingDelayNumSamples = pFullDelayNumSamples[0];

#else

    *pRemainingDelayNumSamples = *pFullDelayNumSamples;

#endif



    if ( ( error = IVAS_DEC_GetNumOutputChannels( hIvasDec, pNumOutChannels ) ) != IVAS_ERR_OK )

    {
@@ -1307,7 +1352,11 @@ static ivas_error decodeG192( 
    int16_t numInitialBadFrames = 0; /* Number of bad frames received until first good frame is decoded */

    int16_t nOutChannels = 0;

    int16_t delayNumSamples = -1;

#ifdef BINAURALIZATION_DELAY_REPORT

    int16_t delayNumSamples_orig[3]; /* stores: overall delay, dec+rend delay, and binauralization delay */

#else

    int16_t delayNumSamples_orig = 0;

#endif

    int16_t nOutSamples = 0;

    int32_t delayTimeScale = 0;

    ivas_error error = IVAS_ERR_UNKNOWN;
@@ -1330,6 +1379,10 @@ static ivas_error decodeG192( 
        fprintf( stdout, "\n-- Start the decoder (quiet mode) --\n\n" );

    }



#ifdef BINAURALIZATION_DELAY_REPORT

    delayNumSamples_orig[0] = -1;

#endif



#ifdef WMOPS

    reset_stack();

    reset_wmops();
@@ -1420,7 +1473,11 @@ static ivas_error decodeG192( 
                    arg,

                    numInitialBadFrames,

                    nOutSamples,

#ifdef BINAURALIZATION_DELAY_REPORT

                    delayNumSamples_orig,

#else

                    &delayNumSamples_orig,

#endif

                    &delayNumSamples,

                    &delayTimeScale,

                    &bsFormat,
@@ -1521,13 +1578,39 @@ static ivas_error decodeG192( 
#endif

    }



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

     * Add zeros at the end to have equal length of synthesized signals

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



#ifdef BINAURALIZATION_DELAY_REPORT

    memset( pcmBuf, 0, delayNumSamples_orig[0] * nOutChannels * sizeof( int16_t ) );

    if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, delayNumSamples_orig[0] * nOutChannels ) ) != IVAS_ERR_OK )

#else

    memset( pcmBuf, 0, delayNumSamples_orig * nOutChannels * sizeof( int16_t ) );

    if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, delayNumSamples_orig * nOutChannels ) ) != IVAS_ERR_OK )

#endif

    {

        fprintf( stderr, "\nError writing output file: %s\n", ivas_error_to_string( error ) );

        goto cleanup;

    }



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

     * Printouts after decoding has finished

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



    if ( !arg.quietModeEnabled )

    {

#ifdef BINAURALIZATION_DELAY_REPORT

        printf( "\n\nDecoder+renderer delay: %4.2f ms   (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[1] / (float) delayTimeScale, delayNumSamples_orig[1], delayTimeScale );



        if ( delayNumSamples_orig[2] > 0 )

        {

            printf( "HRIR/BRIR delay:        %4.2f ms   (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[2] / (float) delayTimeScale, delayNumSamples_orig[2], delayTimeScale );

            printf( "Total delay:            %4.2f ms   (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[0] / (float) delayTimeScale, delayNumSamples_orig[0], delayTimeScale );

        }

#else

        fprintf( stdout, "\nDecoder delay:          %-5u [samples]  - Timescale: %5u\n", delayNumSamples_orig, delayTimeScale );

#endif

    }



    /* Print output metadata file name(s) */
@@ -1547,14 +1630,6 @@ static ivas_error decodeG192( 
        }

    }



    /* add zeros at the end to have equal length of synthesized signals */

    memset( pcmBuf, 0, delayNumSamples_orig * nOutChannels * sizeof( int16_t ) );

    if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, delayNumSamples_orig * nOutChannels ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nError writing output file: %s\n", ivas_error_to_string( error ) );

        goto cleanup;

    }



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

     * Close files and deallocate resources

     *------------------------------------------------------------------------------------------*/
@@ -1724,7 +1799,11 @@ static ivas_error decodeVoIP( 
#endif

    JbmOffsetFileWriter *jbmOffsetWriter = NULL;



#ifdef BINAURALIZATION_DELAY_REPORT

    int16_t delayNumSamples_orig[3]; /* stores: overall delay, dec+rend delay, and binauralization delay */

#else

    int16_t delayNumSamples_orig = -1;

#endif

    int16_t delayNumSamples = -1;

    int32_t delayTimeScale = -1;
@@ -1738,11 +1817,15 @@ static ivas_error decodeVoIP( 


    IVAS_DEC_BS_FORMAT bsFormat = IVAS_DEC_BS_UNKOWN;

    IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS];



    for ( int16_t i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )

    {

        ismWriters[i] = NULL;

    }



#ifdef BINAURALIZATION_DELAY_REPORT

    delayNumSamples_orig[0] = -1;

#endif



    rtpdumpDepacker.rtpdump = NULL;

    switch ( arg.inputFormat )
@@ -1939,7 +2022,11 @@ static ivas_error decodeVoIP( 
                    arg,

                    numInitialBadFrames,

                    nOutSamples,

#ifdef BINAURALIZATION_DELAY_REPORT

                    delayNumSamples_orig,

#else

                    &delayNumSamples_orig,

#endif

                    &delayNumSamples,

                    &delayTimeScale,

                    &bsFormat,
@@ -1992,9 +2079,17 @@ static ivas_error decodeVoIP( 
#endif

    }



    /* add zeros at the end to have equal length of synthesized signals */

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

     * Add zeros at the end to have equal length of synthesized signals

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



#ifdef BINAURALIZATION_DELAY_REPORT

    memset( pcmBuf, 0, delayNumSamples_orig[0] * nOutChannels * sizeof( int16_t ) );

    if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, delayNumSamples_orig[0] * nOutChannels ) ) != IVAS_ERR_OK )

#else

    memset( pcmBuf, 0, delayNumSamples_orig * nOutChannels * sizeof( int16_t ) );

    if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, delayNumSamples_orig * nOutChannels ) ) != IVAS_ERR_OK )

#endif

    {

        fprintf( stderr, "\nError writing output file: %s\n", ivas_error_to_string( error ) );

        goto cleanup;
@@ -2006,7 +2101,17 @@ static ivas_error decodeVoIP( 


    if ( !arg.quietModeEnabled )

    {

#ifdef BINAURALIZATION_DELAY_REPORT

        printf( "\n\nDecoder+renderer delay: %4.2f ms   (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[1] / (float) delayTimeScale, delayNumSamples_orig[1], delayTimeScale );



        if ( delayNumSamples_orig[2] > 0 )

        {

            printf( "HRIR/BRIR delay:        %4.2f ms   (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[2] / (float) delayTimeScale, delayNumSamples_orig[2], delayTimeScale );

            printf( "Total delay:            %4.2f ms   (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[0] / (float) delayTimeScale, delayNumSamples_orig[0], delayTimeScale );

        }

#else

        printf( "\nDecoder delay:       %5u [samples]  - Timescale: %5u\n", delayNumSamples_orig, delayTimeScale );

#endif

    }



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

apps/encoder.c

+79 −8
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <stdio.h>

#include <string.h>

#include <stdlib.h>

#include "options.h"

#include "lib_enc.h"

#include "cmdl_tools.h"

#include "audio_file_reader.h"
@@ -214,6 +213,7 @@ int main( 
        goto cleanup;

    }



#ifndef FIX_94_VERIFY_WAV_NUM_CHANNELS

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

     * Open input audio file

     *------------------------------------------------------------------------------------------*/
@@ -229,6 +229,7 @@ int main( 
        fprintf( stderr, "Sampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n", arg.inputFs, inFileSampleRate, arg.inputWavFilename );

        goto cleanup;

    }

#endif



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

     * Open output bitstream file
@@ -451,6 +452,67 @@ int main( 
        goto cleanup;

    }



#ifdef FIX_94_VERIFY_WAV_NUM_CHANNELS

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

     * Open input audio file

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



    if ( AudioFileReader_open( &audioReader, arg.inputWavFilename ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nCan't open %s\n\n", arg.inputWavFilename );

        goto cleanup;

    }



    /* Validate input sampling rate */

    int32_t inFileSampleRate = 0;

    error = AudioFileReader_getSamplingRate( audioReader, &inFileSampleRate );

    switch ( error )

    {

        case IVAS_ERR_OK:

            if ( inFileSampleRate != arg.inputFs )

            {

                fprintf( stderr, "\nSampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n\n", arg.inputFs, inFileSampleRate, arg.inputWavFilename );

                goto cleanup;

            }

            break;

        case IVAS_ERR_SAMPLING_RATE_UNKNOWN:

            /* IVAS_ERR_SAMPLING_RATE_UNKNOWN will be returned for raw PCM files.

             * Nothing to check here */

            break;

        default:

            fprintf( stderr, "\nError: %s\n", ivas_error_to_string( error ) );

            goto cleanup;

    }





    /* Validate number of channels */

    int16_t encInNumChannels = 0;

    if ( ( error = IVAS_ENC_GetNumInChannels( hIvasEnc, &encInNumChannels ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nError: %s\n", ivas_error_to_string( error ) );

        goto cleanup;

    }

    int16_t inFileNumChannels = 0;

    error = AudioFileReader_getNumChannels( audioReader, &inFileNumChannels );

    switch ( error )

    {

        case IVAS_ERR_OK:

            if ( inFileNumChannels != encInNumChannels )

            {

                fprintf( stderr, "\nNumber of input audio channels mismatch: %d accepted by encoder, but %d found in file %s\n\n", encInNumChannels, inFileNumChannels, arg.inputWavFilename );

                goto cleanup;

            }

            break;

        case IVAS_ERR_NUM_CHANNELS_UNKNOWN:

            /* IVAS_ERR_NUM_CHANNELS_UNKNOWN will be returned for raw PCM files.

             * Nothing to check here */

            break;

        default:

            fprintf( stderr, "\nError: %s\n", ivas_error_to_string( error ) );

            goto cleanup;

    }

#endif



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

     * Open input metadata files

     *------------------------------------------------------------------------------------------*/
@@ -1578,8 +1640,18 @@ static void usage_enc( void ) 
    fprintf( stdout, "                                                *VBR mode (average bitrate),\n" );

    fprintf( stdout, "                      for AMR-WB IO modes R =  (6600, 8850, 12650, 14250, 15850, 18250,\n" );

    fprintf( stdout, "                                                19850, 23050, 23850) \n" );

#ifdef ISM_HIGHEST_BITRATE

    fprintf( stdout, "                      for IVAS stereo R =      (13200, 16400, 24400, 32000, 48000, 64000, 80000, \n" );

    fprintf( stdout, "                                                96000, 128000, 160000, 192000, 256000) \n" );

    fprintf( stdout, "                      for IVAS ISM R =          13200 for 1 ISM, 16400 for 1 ISM and 2 ISM, \n" );

    fprintf( stdout, "                                               (24400, 32000, 48000, 64000, 80000, 96000, 128000) \n" );

    fprintf( stdout, "                                                for 2 ISM, 3 ISM and 4 ISM also 160000, 192000, 256000) \n" );

    fprintf( stdout, "                                                for 3 ISM and 4 ISM also 384000 \n" );

    fprintf( stdout, "                                                for 4 ISM also 512000 \n" );

#else

    fprintf( stdout, "                      for IVAS stereo & ISm R =(13200, 16400, 24400, 32000, 48000, 64000, 80000, \n" );

    fprintf( stdout, "                                                96000, 128000, 160000, 192000, 256000) \n" );

#endif

    fprintf( stdout, "                      for IVAS SBA, MASA, MC R=(13200, 16400, 24400, 32000, 48000, 64000, 80000, \n" );

    fprintf( stdout, "                                                96000, 128000, 160000, 192000, 256000, 384000, 512000) \n" );

    fprintf( stdout, "                      Alternatively, R can be a bitrate switching file which consists of R values\n" );
@@ -1595,16 +1667,16 @@ static void usage_enc( void ) 
    fprintf( stdout, "EVS mono is default, for IVAS choose one of the following: -stereo, -ism, -sba, -masa, -mc\n" );

    fprintf( stdout, "-stereo [Mode]      : Stereo format, default is unified stereo \n" );

    fprintf( stdout, "                      optional for Mode: 1: DFT Stereo, 2: TD Stereo, 3: MDCT Stereo\n" );

    fprintf( stdout, "-ism Channels Files : ISm format \n" );

    fprintf( stdout, "                      where Channels specifies the number of ISms (1-4)\n" );

    fprintf( stdout, "-ism Channels Files : ISM format \n" );

    fprintf( stdout, "                      where Channels specifies the number of ISMs (1-4)\n" );

    fprintf( stdout, "                      and Files specify input files containing metadata, one file per object\n" );

    fprintf( stdout, "                      (use NULL for no input metadata)\n" );

    fprintf( stdout, "-sba +/-Order       : Scene Based Audio input format (Ambisonics ACN/SN3D),\n" );

    fprintf( stdout, "                      where Order specifies the Ambisionics order (1-3),\n" );

    fprintf( stdout, "                      where positive (+) means full 3D and negative (-) only 2D/planar components to be coded\n" );

    fprintf( stdout, "-masa Ch File       : MASA format \n" );

    fprintf( stdout, "                      where Ch specifies the number of input/transport channels (1 or 2): \n" );

    fprintf( stdout, "                      and File specifies input file containing parametric metadata \n" );

    fprintf( stdout, "-masa Channels File : MASA format \n" );

    fprintf( stdout, "                      where Channels specifies the number of input/transport channels (1 or 2): \n" );

    fprintf( stdout, "                      and File specifies input file containing parametric MASA metadata \n" );

    fprintf( stdout, "-mc InputConf       : Multi-channel format\n" );

    fprintf( stdout, "                      where InputConf specifies the channel configuration: 5_1, 7_1, 5_1_2, 5_1_4, 7_1_4\n" );

    fprintf( stdout, "                      Loudspeaker positions are assumed to have azimuth and elevation as per \n" );
@@ -1614,8 +1686,7 @@ static void usage_enc( void ) 
    fprintf( stdout, "                      where 0 = adaptive, 3-100 = fixed in number of frames,\n" );

    fprintf( stdout, "                      default is deactivated\n" );

    fprintf( stdout, "-dtx                : Activate DTX mode with a SID update rate of 8 frames\n" );

    fprintf( stdout, "                      Note: DTX is currently supported in EVS, stereo, 1 ISm, \n" );

    fprintf( stdout, "                      SBA (up to 128kbps) and MASA (up to 128kbps)\n" );

    fprintf( stdout, "                      Note: DTX is supported in EVS, stereo, ISM, SBA up to 80kbps and MASA up to 128kbps \n" );

    fprintf( stdout, "-rf p o             : Activate channel-aware mode for WB and SWB signal at 13.2kbps, \n" );

    fprintf( stdout, "                      where FEC indicator, p: LO or HI, and FEC offset, o: 2, 3, 5, or 7 in number of frames.\n" );

    fprintf( stdout, "                      Alternatively p and o can be replaced by a rf configuration file with each line  \n" );

apps/renderer.c

+51 −4

File changed.

Preview size limit exceeded, changes collapsed.