Commit 552b9ed0 authored by Mohammadreza Naghibzadeh's avatar Mohammadreza Naghibzadeh
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 1826-improve-wmops-performance-of-householderreduction_fx-in-ivas_svd_dec_fx-c

# Conflicts:
#	lib_com/options.h
parents 57a152a3 a2c5446e

apps/decoder.c

+208 −2
Original line number Diff line number Diff line
@@ -80,6 +80,18 @@ static 
 * Local structure for storing cmdln arguments

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



#ifdef FIX_1053_REVERB_RECONFIGURATION

typedef struct

{

    uint16_t *pID;

    uint16_t *pValidity;

    uint16_t count;

    uint16_t selected;

    uint16_t frameCounter;

} AcousticEnvironmentSequence;

#endif





typedef struct

{

    char *inputBitstreamFilename;
@@ -119,7 +131,11 @@ typedef struct 
    IVAS_DEC_COMPLEXITY_LEVEL complexityLevel;

    bool tsmEnabled;

    IVAS_RENDER_FRAMESIZE renderFramesize;

#ifdef FIX_1053_REVERB_RECONFIGURATION

    AcousticEnvironmentSequence aeSequence;

#else

    uint16_t acousticEnvironmentId;

#endif

    int16_t Opt_dpid_on;

    uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];
@@ -383,9 +399,14 @@ int main( 
     *------------------------------------------------------------------------------------------*/



    asked_frame_size = arg.renderFramesize;

#ifdef FIX_1053_REVERB_RECONFIGURATION

    uint16_t aeID = arg.aeSequence.count > 0 ? arg.aeSequence.pID[0] : 65535;

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.tsmEnabled, arg.renderFramesize, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled, arg.Opt_non_diegetic_pan, arg.non_diegetic_pan_gain_fx,

                                       arg.Opt_dpid_on, aeID, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )

#else

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.tsmEnabled, arg.renderFramesize, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled, arg.Opt_non_diegetic_pan, arg.non_diegetic_pan_gain_fx,

                                       arg.Opt_dpid_on, arg.acousticEnvironmentId, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )



#endif

    {

        fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

        goto cleanup;
@@ -467,18 +488,30 @@ int main( 
            goto cleanup;

        }



#ifdef CONF_DISTATT

        if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, arg.directivityPatternId, renderConfig.directivity_fx ) ) != IVAS_ERR_OK )

#else

        if ( ( error = RenderConfigReader_getDirectivity( renderConfigReader, arg.directivityPatternId, renderConfig.directivity ) ) != IVAS_ERR_OK )

#endif

        {

            fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", arg.directivityPatternId[0], arg.directivityPatternId[1], arg.directivityPatternId[2], arg.directivityPatternId[3] );

            goto cleanup;

        }

#ifndef CONF_DISTATT

        FOR( Word16 i = 0; i < 4; i++ )

        {

            renderConfig.directivity_fx[i * 3] = (Word16) ( renderConfig.directivity[i * 3] * ( 1u << 6 ) );

            renderConfig.directivity_fx[i * 3 + 1] = (Word16) ( renderConfig.directivity[i * 3 + 1] * ( 1u << 6 ) );

            renderConfig.directivity_fx[i * 3 + 2] = (Word16) ( renderConfig.directivity[i * 3 + 2] * ( ( 1u << 15 ) - 1 ) );

        }



#endif

#ifdef CONF_DISTATT

        if ( ( error = RenderConfigReader_getDistanceAttenuation( renderConfigReader, renderConfig.distAtt_fx ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Failed to get Distance Attenuation \n\n" );

            goto cleanup;

        }

#endif

        if ( ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ||

               arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

        {
@@ -507,7 +540,11 @@ int main( 


        if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

        {

#ifdef FIX_1053_REVERB_RECONFIGURATION

            if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, aeID, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )

#else

            if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, arg.acousticEnvironmentId, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )

#endif

            {

                if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )

                {
@@ -517,7 +554,11 @@ int main( 
            }

            else

            {

#ifdef FIX_1053_REVERB_RECONFIGURATION

                fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", aeID );

#else

                fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", arg.acousticEnvironmentId );

#endif

                goto cleanup;

            }

            renderConfig.roomAcoustics.override = true;
@@ -715,6 +756,14 @@ cleanup: 


    free( pcmBuf );



#ifdef FIX_1053_REVERB_RECONFIGURATION

    if ( arg.aeSequence.count > 0 )

    {

        free( arg.aeSequence.pID );

        free( arg.aeSequence.pValidity );

    }

#endif



    if ( arg.hrtfReaderEnabled )

    {

        IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD );
@@ -904,7 +953,15 @@ static bool parseCmdlIVAS_dec( 
    arg->non_diegetic_pan_gain = 0.f;

    arg->tsmEnabled = false;

    arg->renderFramesize = IVAS_RENDER_FRAMESIZE_20MS;

#ifdef FIX_1053_REVERB_RECONFIGURATION

    arg->aeSequence.count = 0;

    arg->aeSequence.pID = NULL;

    arg->aeSequence.pValidity = NULL;

    arg->aeSequence.selected = 0;

    arg->aeSequence.frameCounter = 0;

#else

    arg->acousticEnvironmentId = 65535;

#endif

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

    {

        arg->directivityPatternId[i] = 65535;
@@ -1226,11 +1283,90 @@ static bool parseCmdlIVAS_dec( 


            if ( !is_digits_only( argv[i] ) )

            {

#ifdef FIX_1053_REVERB_RECONFIGURATION

                uint16_t k;

                char *s = argv[i];

                char *token = argv[i];



                for ( k = 0; s[k]; )

                {

                    s[k] == ',' ? k++ : *s++;

                }

                k++;



                if ( k == 0 )

                {

                    fprintf( stdout, "Error: Invalid acoustic environment sequence specified: %s\n\n", argv[i] );

                    usage_dec();

                    return false;

                }



                if ( NULL == ( arg->aeSequence.pID = malloc( sizeof( uint16_t ) * k ) ) ||

                     NULL == ( arg->aeSequence.pValidity = malloc( sizeof( uint16_t ) * k ) ) )

                {

                    fprintf( stdout, "Error: Unable to allocate memory for acoustic environment sequence: %s\n\n", argv[i] );

                    usage_dec();

                    return false;

                }



                arg->aeSequence.count = k;



                k = 0;

                token = strtok( argv[i++], ":" );



                while ( token != NULL )

                {

                    if ( !is_number( token ) )

                    {

                        fprintf( stdout, "Error: Invalid token %s found in acoustic environment sequence: %s\n\n", token, argv[i] );

                        usage_dec();

                        return false;

                    }

                    arg->aeSequence.pID[k] = (uint16_t) atoi( token );



                    token = strtok( NULL, "," );

                    if ( !is_number( token ) )

                    {

                        fprintf( stdout, "Error: Invalid token %s found in acoustic environment sequence: %s\n\n", token, argv[i] );

                        usage_dec();

                        return false;

                    }

                    arg->aeSequence.pValidity[k] = (uint16_t) atoi( token );



                    token = strtok( NULL, ":" );

                    k++;

                }



                if ( k != arg->aeSequence.count )

                {

                    fprintf( stdout, "Error while parsing acoustic environment sequence: %s\n\n", argv[i] );

                    usage_dec();

                    return false;

                }

#else

                fprintf( stdout, "Error: Invalid acoustic environment ID specified: %s\n\n", argv[i] );

                usage_dec();

                return false;

#endif

            }

#ifdef FIX_1053_REVERB_RECONFIGURATION

            else

            {

                /* A single acoustic environment */

                if ( NULL == ( arg->aeSequence.pID = malloc( sizeof( uint16_t ) ) ) ||

                     NULL == ( arg->aeSequence.pValidity = malloc( sizeof( uint16_t ) ) ) )

                {

                    fprintf( stdout, "Error: Unable to allocate memory for acoustic environment sequence: %s\n\n", argv[i] );

                    usage_dec();

                    return false;

                }

                arg->aeSequence.count = 1;

                arg->aeSequence.pID[0] = (int16_t) atoi( argv[i++] );

                arg->aeSequence.pValidity[0] = 0;

            }

#else

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

#endif

        }

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

        {
@@ -1454,7 +1590,15 @@ static void usage_dec( void ) 
    fprintf( stdout, "                      output configuration. ID1, ID2, ID3, ID4 specify the directivity pattern IDs used for\n" );

    fprintf( stdout, "                      ISMs 1,2,3 and 4 respectively. This options needs to be accompanied by a render_config file,\n" );

    fprintf( stdout, "                      otherwise a default directivity pattern is used.\n" );

#ifdef FIX_1053_REVERB_RECONFIGURATION

    fprintf( stdout, "-aeid ID            : Acoustic environment ID (number > 0) or\n" );

    fprintf( stdout, "                      a sequence thereof in the format [ID1:duration1,ID2:duration2...]\n" );

    fprintf( stdout, "                      without braces and spaces, with ':' character separating ID from duration and ',' separating\n" );

    fprintf( stdout, "                      ID and duration pairs, where duration is specified in frames\n" );

    fprintf( stdout, "                      for BINAURAL_ROOM_REVERB output configuration.\n" );

#else

    fprintf( stdout, "-aeid ID            : Acoustic environment ID (number >= 0) for BINAURAL_ROOM_REVERB output configuration\n" );

#endif

    fprintf( stdout, "-level level        : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" );

    fprintf( stdout, "                      Currently, all values default to level 3 (full functionality).\n" );

    fprintf( stdout, "-q                  : Quiet mode, no frame counter\n" );
@@ -1798,6 +1942,32 @@ static ivas_error decodeG192( 
    int16_t vec_pos_update, vec_pos_len;

    SplitFileReadWrite *splitRendWriter = NULL;



#ifdef FIX_1053_REVERB_RECONFIGURATION

    IVAS_RENDER_CONFIG_DATA renderConfig;

    RenderConfigReader *renderConfigReader = NULL;



    if ( arg.renderConfigEnabled )

    {

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

        {

            fprintf( stderr, "\nError: Can't open Renderer configuration file %s \n\n", arg.renderConfigFilename );

            goto cleanup;

        }



        if ( ( error = IVAS_DEC_GetRenderConfig( hIvasDec, &renderConfig ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_GetRenderConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }



        if ( RenderConfigReader_read( renderConfigReader, arg.renderConfigFilename, &renderConfig ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Failed to read renderer configuration from file %s\n\n", arg.renderConfigFilename );

            goto cleanup;

        }

    }

#endif



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

    {

        ismWriters[i] = NULL;
@@ -1964,6 +2134,38 @@ static ivas_error decodeG192( 
        {

            if ( needNewFrame )

            {

#ifdef FIX_1053_REVERB_RECONFIGURATION

                if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && renderConfigReader != NULL &&

                     arg.aeSequence.count > 0 && arg.aeSequence.pValidity[arg.aeSequence.selected] != 0 )

                {

                    if ( ++arg.aeSequence.frameCounter >= arg.aeSequence.pValidity[arg.aeSequence.selected] )

                    {

                        if ( ++arg.aeSequence.selected >= arg.aeSequence.count )

                        {

                            arg.aeSequence.selected = 0;

                        }

                        arg.aeSequence.frameCounter = 0;

                        if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, arg.aeSequence.pID[arg.aeSequence.selected], &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )

                        {

                            if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )

                            {

                                fprintf( stderr, "Invalid acoustic environment configuratoin parameters\n\n" );

                                goto cleanup;

                            }

                        }

                        else

                        {

                            fprintf( stderr, "Failed to get acoustic environment with ID %d\n\n", arg.aeSequence.pID[arg.aeSequence.selected] );

                            goto cleanup;

                        }

                        if ( ( error = IVAS_DEC_FeedRenderConfig( hIvasDec, renderConfig ) ) != IVAS_ERR_OK )

                        {

                            fprintf( stderr, "\nIVAS_DEC_FeedRenderConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

                            goto cleanup;

                        }

                    }

                }

#endif

                if ( ( error = BS_Reader_ReadFrame_short( hBsReader, bit_stream, &num_bits, &bfi ) ) != IVAS_ERR_OK )

                {

                    if ( error == IVAS_ERR_END_OF_FILE )
@@ -2351,6 +2553,10 @@ static ivas_error decodeG192( 


cleanup:



#ifdef FIX_1053_REVERB_RECONFIGURATION

    RenderConfigReader_close( &renderConfigReader );

#endif



    split_rend_reader_writer_close( &splitRendWriter );

    AudioFileWriter_close( &afWriter );

    MasaFileWriter_close( &masaWriter );

apps/renderer.c

+178 −1
Original line number Diff line number Diff line
@@ -143,6 +143,17 @@ typedef struct 
    IVAS_CUSTOM_LS_DATA outSetupCustom;

} OutputConfig;



#ifdef FIX_1053_REVERB_RECONFIGURATION

typedef struct

{

    uint16_t *pID;

    uint16_t *pValidity;

    uint16_t count;

    uint16_t selected;

    uint16_t frameCounter;

} AcousticEnvironmentSequence;

#endif



typedef struct

{

    char executableName[RENDERER_MAX_CLI_ARG_LENGTH];
@@ -178,7 +189,11 @@ typedef struct 
    float syncMdDelay;

    IVAS_RENDER_FRAMESIZE render_framesize;

    uint16_t directivityPatternId[RENDERER_MAX_ISM_INPUTS];

#ifdef FIX_1053_REVERB_RECONFIGURATION

    AcousticEnvironmentSequence aeSequence;

#else

    uint16_t acousticEnvironmentId;

#endif

} CmdlnArgs;



typedef enum
@@ -373,7 +388,11 @@ static const CmdLnParser_Option cliOptions[] = { 
        .id = CmdLnOptionId_acousticEnvironmentId,

        .match = "acoustic_environment_id",

        .matchShort = "aeid",

        .description = "Acoustic environment ID (number >= 0) for BINAURAL_ROOM_REVERB output.",

#ifdef FIX_1053_REVERB_RECONFIGURATION

        .description = "Acoustic environment ID( number > 0 ) or a sequence thereof in the format [ID1:duration1,ID2:duration2...] without braces and spaces, with ':' character separating ID from duration and ',' separating ID and duration pairs, where duration is specified in frames for BINAURAL_ROOM_REVERB output configuration.",

#else

        .description = "Acoustic environment ID (number >= 0) for BINAURAL_ROOM_REVERB output configuration",

#endif

    },

};
@@ -769,6 +788,9 @@ int main( 
    int16_t zeroPadToWrite = 0;

    int32_t delayTimeScale = 0;

    int16_t i, numChannels;

#ifdef FIX_1053_REVERB_RECONFIGURATION

    uint16_t aeID;

#endif

    ivas_error error = IVAS_ERR_OK;



#ifdef WMOPS
@@ -1146,7 +1168,12 @@ int main( 


        if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

        {

#ifdef FIX_1053_REVERB_RECONFIGURATION

            aeID = args.aeSequence.count > 0 ? args.aeSequence.pID[0] : 65535;

            if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, aeID, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )

#else

            if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, args.acousticEnvironmentId, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )

#endif

            {

                if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )

                {
@@ -1156,7 +1183,11 @@ int main( 
            }

            else

            {

#ifdef FIX_1053_REVERB_RECONFIGURATION

                fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", aeID );

#else

                fprintf( stderr, "\nFailed to get acoustic environment with ID: %d\n\n", args.acousticEnvironmentId );

#endif

                goto cleanup;

            }

            renderConfig.roomAcoustics.override = 1;
@@ -1599,6 +1630,41 @@ int main( 
        num_in_channels = inBuffer.config.numChannels;

        const bool isCurrentFrameMultipleOf20ms = frame % ( 4 / args.render_framesize ) == 0;



#ifdef FIX_1053_REVERB_RECONFIGURATION

        if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && renderConfigReader != NULL &&

             args.aeSequence.count > 0 && args.aeSequence.pValidity[args.aeSequence.selected] != 0 )

        {

            if ( ++args.aeSequence.frameCounter >= args.aeSequence.pValidity[args.aeSequence.selected] )

            {

                IVAS_RENDER_CONFIG_DATA renderConfig;



                if ( ++args.aeSequence.selected >= args.aeSequence.count )

                {

                    args.aeSequence.selected = 0;

                }

                args.aeSequence.frameCounter = 0;

                if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, args.aeSequence.pID[args.aeSequence.selected], &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )

                {

                    if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )

                    {

                        fprintf( stderr, "Invalid acoustic environment configuratoin parameters\n\n" );

                        goto cleanup;

                    }

                }

                else

                {

                    fprintf( stderr, "Failed to get acoustic environment with ID %d\n\n", args.aeSequence.pID[args.aeSequence.selected] );

                    goto cleanup;

                }

                if ( ( error = IVAS_REND_FeedRenderConfig( hIvasRend, renderConfig ) ) != IVAS_ERR_OK )

                {

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

                    goto cleanup;

                }

            }

        }

#endif



        numSamplesRead = 0;



        /* Read the input data */
@@ -2064,6 +2130,15 @@ cleanup: 
    {

        free( bitsBufferData );

    }



#ifdef FIX_1053_REVERB_RECONFIGURATION

    if ( args.aeSequence.count > 0 )

    {

        free( args.aeSequence.pID );

        free( args.aeSequence.pValidity );

    }

#endif



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

    {

        MasaFileReader_close( &masaReaders[i] );
@@ -2530,6 +2605,93 @@ static bool parseLfePositionConfig( 
    return true;

}



#ifdef FIX_1053_REVERB_RECONFIGURATION

static bool parseAcousticEnvironmentIds(

    const char *value,

    AcousticEnvironmentSequence *aeSequence )

{

    uint16_t k;

    char config_string[RENDERER_MAX_METADATA_LINE_LENGTH];

    char *s;

    char *token;



    strncpy( config_string, value, RENDERER_MAX_METADATA_LINE_LENGTH );

    s = config_string;

    token = config_string;



    if ( !is_digits_only( config_string ) )

    {



        for ( k = 0; s[k]; )

        {

            s[k] == ',' ? k++ : *s++;

        }

        k++;



        if ( k == 0 )

        {

            fprintf( stdout, "Error: Invalid acoustic environment sequence specified: %s\n\n", config_string );

            return false;

        }



        if ( NULL == ( aeSequence->pID = malloc( sizeof( uint16_t ) * k ) ) ||

             NULL == ( aeSequence->pValidity = malloc( sizeof( uint16_t ) * k ) ) )

        {

            fprintf( stdout, "Error: Unable to allocate memory for acoustic environment sequence: %s\n\n", config_string );

            return false;

        }



        aeSequence->count = k;



        k = 0;



        token = strtok( config_string, ":" );



        while ( token != NULL )

        {

            if ( !is_number( token ) )

            {

                fprintf( stdout, "Error: Invalid token %s found in acoustic environment sequence: %s\n\n", token, config_string );

                return false;

            }

            aeSequence->pID[k] = (uint16_t) atoi( token );



            token = strtok( NULL, "," );

            if ( !is_number( token ) )

            {

                fprintf( stdout, "Error: Invalid token %s found in acoustic environment sequence: %s\n\n", token, config_string );

                return false;

            }

            aeSequence->pValidity[k] = (uint16_t) atoi( token );



            token = strtok( NULL, ":" );

            k++;

        }



        if ( k != aeSequence->count )

        {

            fprintf( stdout, "Error while parsing acoustic environment sequence: %s\n\n", config_string );

            return false;

        }

    }

    else

    {

        /* A single acoustic environment */

        if ( NULL == ( aeSequence->pID = malloc( sizeof( uint16_t ) ) ) ||

             NULL == ( aeSequence->pValidity = malloc( sizeof( uint16_t ) ) ) )

        {

            fprintf( stdout, "Error: Unable to allocate memory for acoustic environment sequence: %s\n\n", config_string );

            return false;

        }

        aeSequence->count = 1;

        aeSequence->pID[0] = (int16_t) atoi( config_string );

        aeSequence->pValidity[0] = 0;

    }



    return true;

}

#endif





static bool checkRequiredArgs(

    CmdlnArgs args )
@@ -2637,7 +2799,15 @@ static CmdlnArgs defaultArgs( 
        args.directivityPatternId[i] = 65535;

    }



#ifdef FIX_1053_REVERB_RECONFIGURATION

    args.aeSequence.count = 0;

    args.aeSequence.pID = NULL;

    args.aeSequence.pValidity = NULL;

    args.aeSequence.selected = 0;

    args.aeSequence.frameCounter = 0;

#else

    args.acousticEnvironmentId = 65535;

#endif



    return args;

}
@@ -2807,12 +2977,19 @@ static void parseOption( 
            break;

        case CmdLnOptionId_acousticEnvironmentId:

            assert( numOptionValues == 1 );

#ifdef FIX_1053_REVERB_RECONFIGURATION

            if ( !parseAcousticEnvironmentIds( optionValues[0], &args->aeSequence ) )

            {

                fprintf( stderr, "Invalid acoustic environment ID specified: %s\n", optionValues[0] );

            }

#else

            if ( !is_digits_only( optionValues[0] ) )

            {

                fprintf( stderr, "Invalid acousting environment ID specified: %s\n", optionValues[0] );

                exit( -1 );

            }

            args->acousticEnvironmentId = (int16_t) strtol( optionValues[0], NULL, 10 );

#endif

            break;

        case CmdLnOptionId_syncMdDelay:

            assert( numOptionValues == 1 );

lib_com/common_api_types.h

+4 −0
Original line number Diff line number Diff line
@@ -347,6 +347,10 @@ typedef struct _IVAS_RENDER_CONFIG 
    ISAR_SPLIT_REND_CONFIG_DATA split_rend_config;

    float directivity[IVAS_MAX_NUM_OBJECTS * 3];

    Word16 directivity_fx[IVAS_MAX_NUM_OBJECTS * 3]; // has the following q-factor pattern: {6, 6, 15, 6, 6, 15, 6, 6, 15, 6, 6, 15}

#ifdef CONF_DISTATT

    float distAtt[3];

    Word32 distAtt_fx[3]; /* {Q27, Q30, Q30} */

#endif

} IVAS_RENDER_CONFIG_DATA, *IVAS_RENDER_CONFIG_HANDLE;



typedef struct

lib_com/ivas_prot_fx.h

+9 −3
Original line number Diff line number Diff line
@@ -2376,9 +2376,14 @@ ivas_error ivas_ism_dec_config_fx( 


ivas_error ivas_ism_metadata_dec_create_fx(

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

    const Word16 n_ISms,       /* i  : number of objects           */

    const Word16 n_ISms,        /* i  : number of separately coded objects          */

    Word32 element_brate_tmp[] /* o  : element bitrate per object                   */

);



void ivas_ism_reset_metadata_handle_dec_fx(

    ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle                         */

);



ivas_error ivas_sba_dec_reconfigure_fx(

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

    UWord16 *nSamplesFlushed, /* o  : number of samples flushed           */
@@ -2394,6 +2399,7 @@ void ivas_spar_md_dec_matrix_close_fx( 
    ivas_spar_md_dec_state_t *hMdDecoder, /* i/o: SPAR MD decoder handle      */

    const Word16 num_channels             /* i  : number of internal channels */

);



ivas_error ivas_spar_dec_open_fx(

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

    const Word16 spar_reconfig_flag /* i  : SPAR reconfiguration flag  */

lib_com/options.h

+5 −14

File changed.

Preview size limit exceeded, changes collapsed.