Commit 838125d7 authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/ivas-float-update' into... 

- Merge remote-tracking branch 'remotes/origin/ivas-float-update' into 2053-ref-PortMr2078-from-float-unnecessary-allocation-of-memories-for-channels-in-the-jbm-decoder
parents 8e04d562 79bf601b

apps/decoder.c

+16 −132
Original line number Diff line number Diff line
@@ -32,9 +32,7 @@ 


#include "lib_dec.h"

#include <string.h>

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

#include <math.h>

#endif

#include "cmdl_tools.h"

#include "audio_file_writer.h"

#include "bitstream_reader.h"
@@ -50,9 +48,7 @@ 
#include "aeid_file_reader.h"

#endif

#include "split_render_file_read_write.h"

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

#include "obj_edit_file_reader.h"

#endif

#ifdef VARIABLE_SPEED_DECODING

#include "tsm_scale_file_reader.h"

#include <math.h>
@@ -148,9 +144,7 @@ typedef struct 
    bool dpidEnabled;

    uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];

    bool objEditEnabled;

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    char *objEditFileName;

#endif



} DecArguments;
@@ -179,24 +173,15 @@ typedef struct 


static bool parseCmdlIVAS_dec( int16_t argc, char **argv, DecArguments *arg );

static void usage_dec( void );

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, 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 *hHrtfBinary, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

#else

static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, 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 *hHrtfBinary, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

#endif

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 );

static int16_t app_own_random( int16_t *seed );

static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec( char *forcedRendModeChar );

#endif

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

static void do_object_editing( IVAS_EDITABLE_PARAMETERS *editableParameters, ObjectEditFileReader *objectEditFileReader );

#else

static void do_object_editing( IVAS_EDITABLE_PARAMETERS *editableParameters );

#endif





/*------------------------------------------------------------------------------------------*
@@ -228,9 +213,7 @@ int main( 
    int16_t *pcmBuf = NULL;

    IVAS_RENDER_FRAMESIZE asked_frame_size;

    IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary;

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    ObjectEditFileReader *objectEditFileReader = NULL;

#endif

#ifdef DEBUGGING

    int32_t noClipping;

    int32_t cnt_frames_limited;
@@ -434,7 +417,6 @@ int main( 
        }

    }



#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

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

     * Open object editing instruction file

     *------------------------------------------------------------------------------------------*/
@@ -447,7 +429,6 @@ int main( 
            goto cleanup;

        }

    }

#endif



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

     * Configure the decoder
@@ -457,13 +438,8 @@ int main( 


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



#ifdef LIB_DEC_REVISION

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.renderFramesize, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled, arg.non_diegetic_pan_enabled, arg.non_diegetic_pan_gain,

                                       arg.dpidEnabled, aeID, arg.objEditEnabled, 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.non_diegetic_pan_enabled, arg.non_diegetic_pan_gain,

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

#endif

    {

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

        goto cleanup;
@@ -780,19 +756,11 @@ int main( 


    if ( arg.voipMode )

    {

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

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

#else

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

#endif

    }

    else

    {

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

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

#else

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

#endif

    }



    if ( error == IVAS_ERR_OK || error == IVAS_ERR_END_OF_FILE )
@@ -857,9 +825,7 @@ cleanup: 
    RotationFileReader_close( &refRotReader );

    Vector3PairFileReader_close( &referenceVectorReader );

    RenderConfigReader_close( &renderConfigReader );

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    ObjectEditFileReader_close( &objectEditFileReader );

#endif



    if ( BS_Reader_Close( &hBsReader ) != IVAS_ERR_OK )

    {
@@ -1062,9 +1028,7 @@ static bool parseCmdlIVAS_dec( 
    }



    arg->objEditEnabled = false;

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    arg->objEditFileName = NULL;

#endif



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

     * Initialization
@@ -1091,30 +1055,18 @@ static bool parseCmdlIVAS_dec( 


        if ( strcmp( argv_to_upper, "-VOIP" ) == 0 )

        {

#ifdef LIB_DEC_REVISION

            arg->voipMode = true;

#else

            arg->voipMode = 1;

#endif

            i++;

        }

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

        {

#ifdef LIB_DEC_REVISION

            arg->voipMode = true;

#else

            arg->voipMode = 1;

#endif

            arg->inputFormat = IVAS_DEC_INPUT_FORMAT_RTPDUMP;

            i++;

        }

        else if ( strcmp( argv_to_upper, "-VOIP_HF_ONLY=1" ) == 0 )

        {

#ifdef LIB_DEC_REVISION

            arg->voipMode = true;

#else

            arg->voipMode = 1;

#endif

            arg->inputFormat = IVAS_DEC_INPUT_FORMAT_RTPDUMP_HF;

            i++;

        }
@@ -1264,10 +1216,8 @@ static bool parseCmdlIVAS_dec( 
            {

                if ( !is_digits_only( argv[i] ) )

                {

#ifdef LIB_DEC_REVISION

                    fprintf( stderr, "Error: Render frame size is invalid or not specified!\n\n" );

                    usage_dec();

#endif

                    return false;

                }
@@ -1598,7 +1548,6 @@ static bool parseCmdlIVAS_dec( 
        {

            arg->objEditEnabled = true;

            i++;

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

            if ( argc - i <= 3 || argv[i][0] == '-' )

            {

                fprintf( stderr, "Error: Object editing instruction filename not specified!\n\n" );
@@ -1615,7 +1564,6 @@ static bool parseCmdlIVAS_dec( 
                arg->objEditFileName = argv[i]; /* read edit instructions from this file */

            }

            i++;

#endif

        }



        /*-----------------------------------------------------------------*
@@ -1733,6 +1681,18 @@ static bool parseCmdlIVAS_dec( 
        return false;

    }



#ifdef SUPPORT_JBM_TRACEFILE

    /* Validate options that depend on other options */

    if ( arg->jbmTraceFilename != NULL && arg->delayCompensationEnabled

         /* This decMode check should be removed once timestamp sync issues between JBM trace and audio are fixed in EVS */

         && arg->decMode != IVAS_DEC_MODE_EVS )

    {

        fprintf( stderr, "Error: Writing to a JBM trace file requires delay compensation to be disabled with -no_delay_cmp\n\n" );

        usage_dec();

        return false;

    }

#endif



    return true;

}
@@ -1769,7 +1729,8 @@ static void usage_dec( void ) 
    fprintf( stdout, "                      EVS RTP Payload Format. The SDP parameter hf_only is required.\n" );

    fprintf( stdout, "                      Reading RFC4867 AMR/AMR-WB RTP payload format is not supported.\n" );

#ifdef SUPPORT_JBM_TRACEFILE

    fprintf( stdout, "-Tracefile TF       : VoIP mode: Generate trace file named TF\n" );

    fprintf( stdout, "-Tracefile TF       : VoIP mode: Generate trace file named TF. Requires -no_delay_cmp to\n" );

    fprintf( stdout, "                      be enabled so that trace contents remain in sync with audio output.\n" );

#endif

#ifdef DEBUGGING

#ifdef VARIABLE_SPEED_DECODING
@@ -1824,11 +1785,7 @@ static void usage_dec( void ) 
    fprintf( stdout, "                      ID and duration pairs, where duration is specified in frames\n" );

#endif

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

#ifndef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    fprintf( stdout, "-obj_edit           : Enable objects editing\n" );

#else

    fprintf( stdout, "-obj_edit File      : Object editing instructions file or NULL for built-in example\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" );
@@ -1921,15 +1878,6 @@ static ivas_error initOnFirstGoodFrame( 
        return error;

    }



#ifndef LIB_DEC_REVISION

    int32_t pcmFrameSize;



    if ( ( error = IVAS_DEC_GetPcmFrameSize( hIvasDec, &pcmFrameSize ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nError in IVAS_DEC_GetPcmFrameSize, error code: %d\n", error );

        return error;

    }

#endif

    if ( isSplitRend )

    {

        /* Open split rendering metadata writer */
@@ -1987,8 +1935,6 @@ static ivas_error initOnFirstGoodFrame( 
        }

    }





#ifdef LIB_DEC_REVISION

    int16_t pcmFrameSize;

    if ( ( error = IVAS_DEC_GetOutputBufferSize( hIvasDec, &pcmFrameSize ) ) != IVAS_ERR_OK )

    {
@@ -1996,16 +1942,13 @@ static ivas_error initOnFirstGoodFrame( 
        return error;

    }



#endif

    int16_t *zeroBuf = malloc( pcmFrameSize * sizeof( int16_t ) );

#ifdef LIB_DEC_REVISION

    /* Write zeros to the output audio buffer */

    int16_t *zeroBuf = calloc( pcmFrameSize, sizeof( int16_t ) );

    if ( zeroBuf == NULL )

    {

        fprintf( stdout, "Error: Unable to allocate memory for output buffer.\n" );

        return IVAS_ERR_FAILED_ALLOC;

    }

#endif

    memset( zeroBuf, 0, pcmFrameSize * sizeof( int16_t ) );



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

    {
@@ -2029,7 +1972,6 @@ static ivas_error initOnFirstGoodFrame( 
        }

        else

        {



            if ( *pRemainingDelayNumSamples < *numOutSamples )

            {

                if ( ( error = AudioFileWriter_write( *ppAfWriter, zeroBuf, *numOutSamples * *pNumOutChannels - ( *pRemainingDelayNumSamples * *pNumOutChannels ) ) ) != IVAS_ERR_OK )
@@ -2109,7 +2051,6 @@ static ivas_error initOnFirstGoodFrame( 
            if ( numInitialBadFrames > 0 )

            {

                /* Duplicate good first frame metadata to fill the beginning of stream. */

#ifdef NONBE_FIX_1261_MASA_EXT_META_JBM

                int16_t fullDelayNumSamplesLocal[3];

                int32_t delayTimeScaleLocal;

                float delayMs;
@@ -2122,9 +2063,6 @@ static ivas_error initOnFirstGoodFrame( 
                    fprintf( stderr, "\nUnable to get delay of decoder: %s\n", ivas_error_to_string( error ) );

                }

                delayMs = (float) ( fullDelayNumSamplesLocal[0] ) / (float) ( delayTimeScaleLocal );

#else

                IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta = NULL;

#endif



                if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )

                {
@@ -2134,9 +2072,6 @@ static ivas_error initOnFirstGoodFrame( 


                for ( int16_t j = 0; j < numInitialBadFrames; ++j )

                {

#ifndef NONBE_FIX_1261_MASA_EXT_META_JBM

                    float delayMs = (float) ( pFullDelayNumSamples[0] ) / (float) ( *delayTimeScale );

#endif

                    if ( ( error = MasaFileWriter_writeFrame( *ppMasaWriter, hMasaExtOutMeta, &delayMs ) ) != IVAS_ERR_OK )

                    {

                        fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( *ppMasaWriter ) );
@@ -2185,9 +2120,7 @@ static ivas_error decodeG192( 
    RotFileReader *externalOrientationFileReader,

    RotFileReader *refRotReader,

    Vector3PairFileReader *referenceVectorReader,

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    ObjectEditFileReader *objectEditFileReader,

#endif

    ISAR_SPLIT_REND_BITS_DATA *splitRendBits,

    IVAS_DEC_HANDLE hIvasDec,

    int16_t *pcmBuf )
@@ -2230,7 +2163,6 @@ static ivas_error decodeG192( 
    RenderConfigReader *renderConfigReader = NULL;



#ifdef VARIABLE_SPEED_DECODING

#ifdef LIB_DEC_REVISION

    if ( arg.tsmEnabled )

    {

        if ( ( error = IVAS_DEC_EnableTsm( hIvasDec ) ) != IVAS_ERR_OK )
@@ -2240,7 +2172,6 @@ static ivas_error decodeG192( 
        }

    }



#endif

#endif

    if ( ( error = IVAS_DEC_is_split_rendering_enabled( hIvasDec, &isSplitRend ) ) != IVAS_ERR_OK )

    {
@@ -2596,7 +2527,6 @@ static ivas_error decodeG192( 
                        return error;

                    }



#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

                    if ( arg.objEditFileName != NULL )

                    {

                        if ( ( error = ObjectEditFileReader_readNextFrame( objectEditFileReader ) ) != IVAS_ERR_OK )
@@ -2605,14 +2535,9 @@ static ivas_error decodeG192( 
                            return error;

                        }

                    }

#endif



                    /* Do object metadata editing here ... */

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

                    do_object_editing( &editableParameters, objectEditFileReader );

#else

                    do_object_editing( &editableParameters );

#endif



                    /* set new object parameters*/

                    if ( ( error = IVAS_DEC_SetEditableParameters( hIvasDec, editableParameters ) ) != IVAS_ERR_OK )
@@ -2642,11 +2567,7 @@ static ivas_error decodeG192( 
            }

            else

            {

#ifdef LIB_DEC_REVISION

                if ( ( error = IVAS_DEC_GetSamplesRenderer( hIvasDec, nSamplesToRender, IVAS_DEC_PCM_INT16, (void *) ( pcmBuf + nOutChannels * nSamplesRendered ), &nSamplesRendered_loop, &needNewFrame ) ) != IVAS_ERR_OK )

#else

                if ( ( error = IVAS_DEC_GetSamples( hIvasDec, nSamplesToRender, IVAS_DEC_PCM_INT16, (void *) ( pcmBuf + nOutChannels * nSamplesRendered ), &nSamplesRendered_loop, &needNewFrame ) ) != IVAS_ERR_OK )

#endif

                {

                    fprintf( stderr, "\nError in IVAS_DEC_GetSamplesRenderer(): %s\n", IVAS_DEC_GetErrorMessage( error ) );

                    goto cleanup;
@@ -3138,9 +3059,7 @@ static ivas_error decodeVoIP( 
    RotFileReader *externalOrientationFileReader,

    RotFileReader *refRotReader,

    Vector3PairFileReader *referenceVectorReader,

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    ObjectEditFileReader *objectEditFileReader,

#endif

    IVAS_DEC_HANDLE hIvasDec,

    int16_t *pcmBuf )

{
@@ -3419,12 +3338,7 @@ static ivas_error decodeVoIP( 
            }

        }



#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

        if ( arg.objEditEnabled && arg.objEditFileName != NULL && vec_pos_update == 0 )

#else

        if ( arg.objEditEnabled && ( arg.objEditFileName != NULL ) )

#endif

        {

            if ( ( error = ObjectEditFileReader_readNextFrame( objectEditFileReader ) ) != IVAS_ERR_OK )

            {
@@ -3432,7 +3346,6 @@ static ivas_error decodeVoIP( 
                return error;

            }

        }

#endif



        /* read all packets with a receive time smaller than the system time */

        while ( nextPacketRcvTime_ms <= systemTime_ms )
@@ -3534,11 +3447,7 @@ static ivas_error decodeVoIP( 
                }



                /* Do object metadata editing here ... */

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

                do_object_editing( &editableParameters, objectEditFileReader );

#else

                do_object_editing( &editableParameters );

#endif



                /* set new object parameters */

                if ( ( error = IVAS_DEC_SetEditableParameters( hIvasDec, editableParameters ) ) != IVAS_ERR_OK )
@@ -3572,11 +3481,7 @@ static ivas_error decodeVoIP( 
        {

            if ( ( error = IVAS_DEC_HasDecodedFirstGoodFrame( hIvasDec, &decodedGoodFrame ) ) != IVAS_ERR_OK )

            {

#ifdef LIB_DEC_REVISION

                fprintf( stderr, "Error in IVAS_DEC_HasDecodedFirstGoodFrame(): %s\n", IVAS_DEC_GetErrorMessage( error ) );

#else

                fprintf( stderr, "Error in IVAS_DEC_HasDecodedFirstGoodFrame, code: %d\n", error );

#endif

                goto cleanup;

            }
@@ -3588,9 +3493,7 @@ static ivas_error decodeVoIP( 
                if ( ( error = initOnFirstGoodFrame( hIvasDec, arg, numInitialBadFrames, &nOutSamples, NULL, delayNumSamples_orig, &delayNumSamples, &delayTimeScale,

                                                     &bsFormat, &afWriter, &masaWriter, ismWriters, &nOutChannels, &numObj, &splitRendWriter ) ) != IVAS_ERR_OK )

                {

#ifdef LIB_DEC_REVISION

                    fprintf( stderr, "Error in initOnFirstGoodFrame(): %s\n", IVAS_DEC_GetErrorMessage( error ) );

#endif

                    goto cleanup;

                }

            }
@@ -3672,22 +3575,12 @@ static ivas_error decodeVoIP( 
            }

        }



#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

        vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;

#else

        if ( !arg.quietModeEnabled )

        {

            fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );

        }

        vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;

        frame++;

#endif

        if ( vec_pos_update == 0 )

        {

            systemTime_ms += vec_pos_len * systemTimeInc_ms;

        }



#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

        if ( vec_pos_update == 0 )

        {

            frame++;
@@ -3696,7 +3589,6 @@ static ivas_error decodeVoIP( 
                fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );

            }

        }

#endif



#ifdef WMOPS

        update_mem();
@@ -3860,12 +3752,8 @@ cleanup: 
 *---------------------------------------------------------------------*/



static void do_object_editing(

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    IVAS_EDITABLE_PARAMETERS *editableParameters,

    ObjectEditFileReader *objectEditFileReader )

#else

    IVAS_EDITABLE_PARAMETERS *editableParameters )

#endif

{

    /* put the objects equally spaced at the horizontal plane */

    /* and play a little bit with the gains... */
@@ -3881,7 +3769,6 @@ static void do_object_editing( 
        }

    }



#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    if ( objectEditFileReader != NULL )

    {

        ReadObjectEditInfo *readInfo;
@@ -3940,7 +3827,6 @@ static void do_object_editing( 
    }

    else

    {

#endif

        if ( num_nondiegetic_objects )

        {

            float start_angle, angle_inc;
@@ -3964,9 +3850,7 @@ static void do_object_editing( 
        }



        editableParameters->gain_bed = 0.5f;

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    }

#endif





    return;

apps/isar_post_rend.c

+0 −18
Original line number Diff line number Diff line
@@ -953,9 +953,7 @@ int main( 


    while ( 1 )

    {

#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST

        int16_t bfi = 0;

#endif

        int16_t num_in_channels;

        num_in_channels = inBuffer.config.numChannels;
@@ -964,11 +962,7 @@ int main( 
        {

            ivas_error error_tmp;

            numSamplesRead = (int16_t) inBufferSize;

#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST

            error_tmp = split_rend_read_bits_from_file( hSplitRendFileReadWrite, bitsBuffer.bits, &bitsBuffer.config.bitsRead, &bitsBuffer.config.bitsWritten, &bfi );

#else

            error_tmp = split_rend_read_bits_from_file( hSplitRendFileReadWrite, bitsBuffer.bits, &bitsBuffer.config.bitsRead, &bitsBuffer.config.bitsWritten );

#endif

            if ( error_tmp != IVAS_ERR_OK )

            {

                if ( error_tmp == IVAS_ERR_END_OF_FILE )
@@ -1035,23 +1029,12 @@ int main( 
        /* Read from split renderer bfi file if specified */

        if ( splitRendBFIReader != NULL && splitBinNeedsNewFrame )

        {

#ifndef NONBE_1293_CRASH_FIRST_FRAME_LOST

            int16_t bfi;

#endif

            if ( ( error = SplitRendBFIFileReading( splitRendBFIReader, &bfi ) ) != IVAS_ERR_OK )

            {

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

                goto cleanup;

            }

#ifndef NONBE_1293_CRASH_FIRST_FRAME_LOST

            if ( ( error = ISAR_POST_REND_SetSplitRendBFI( hIsarPostRend, bfi ) ) != IVAS_ERR_OK )

            {

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

                goto cleanup;

        }

#endif

        }

#ifdef NONBE_1293_CRASH_FIRST_FRAME_LOST

        if ( splitBinNeedsNewFrame )

        {

            if ( ( error = ISAR_POST_REND_SetSplitRendBFI( hIsarPostRend, bfi ) ) != IVAS_ERR_OK )
@@ -1060,7 +1043,6 @@ int main( 
                goto cleanup;

            }

        }

#endif



        for ( i = 0; i < args.inConfig.numBinBuses; ++i )

        {

lib_com/ivas_cnst.h

+0 −4
Original line number Diff line number Diff line
@@ -180,11 +180,7 @@ typedef enum 
#define MAX_JBM_L_FRAME_NS                      40000000L

#endif

#define MAX_SPAR_INTERNAL_CHANNELS              IVAS_SPAR_MAX_CH

#ifdef UNIFIED_DECODING_PATHS_LEFTOVERS

#define MAX_CLDFB_DIGEST_CHANNELS               3                           /* == maximum of ParamISM TCs and ParamMC TCs */

#else

#define MAX_CLDFB_DIGEST_CHANNELS               (FOA_CHANNELS + MAX_NUM_OBJECTS)

#endif



typedef enum

{

lib_com/ivas_error.h

+0 −4
Original line number Diff line number Diff line
@@ -78,9 +78,7 @@ typedef enum 
    IVAS_ERR_DIRECTIVITY_NOT_SUPPORTED,

    IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED,

    IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED,

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    IVAS_ERR_OBJECTS_EDITING_AND_PANNING_NOT_SUPPORTED,

#endif

    IVAS_ERR_INVALID_HRTF,

    IVAS_ERR_INVALID_HRTF_SAMPLING_RATE,

    IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA,
@@ -264,10 +262,8 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) 
            return "Acoustic environment not supported";

        case IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED:

            return "Objects editing not supported";

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

        case IVAS_ERR_OBJECTS_EDITING_AND_PANNING_NOT_SUPPORTED:

            return "Wrong use of both Object editing and Non-diegetic panning";

#endif

        case IVAS_ERR_INVALID_HRTF:

            return "Unsupported HRTF filter set";

        case IVAS_ERR_INVALID_HRTF_SAMPLING_RATE:

lib_com/ivas_prot.h

+0 −28

File changed.

Preview size limit exceeded, changes collapsed.