Commit f24ee91a authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch... 

- Merge remote-tracking branch 'remotes/origin/2053-basop-PortMr2078-from-float-unnecessary-allocation-of-memories-for-channels-in-the-jbm-decoder' into 2055-basop-PortMr2186-from-float-memory-reduction-for-audio-channels-in-jbm-decoder
parents 3d907785 661dc761

apps/decoder.c

+16 −129
Original line number Diff line number Diff line
@@ -47,9 +47,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

#include "vector3_pair_file_reader.h"

#include "wmc_auto.h"

#include "options.h"
@@ -130,9 +128,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;
@@ -161,19 +157,10 @@ 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 FIX_1217_OBJECT_EDIT_FILE_INTERFACE

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

#else

static void do_object_editing_fx( IVAS_EDITABLE_PARAMETERS *editableParameters );

#endif





/*------------------------------------------------------------------------------------------*
@@ -205,9 +192,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 WMOPS

    reset_wmops();
@@ -401,7 +386,6 @@ int main( 
        }

    }



#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

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

     * Open object editing instruction file

     *------------------------------------------------------------------------------------------*/
@@ -414,7 +398,6 @@ int main( 
            goto cleanup;

        }

    }

#endif



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

     * Configure the decoder
@@ -423,14 +406,9 @@ int main( 
    asked_frame_size = arg.renderFramesize;

    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_fx, 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_fx,

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

#endif

    {

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

        goto cleanup;
@@ -654,19 +632,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 )
@@ -724,9 +694,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 )

    {
@@ -908,9 +876,7 @@ static bool parseCmdlIVAS_dec( 
        arg->directivityPatternId[i] = 65535;

    }

    arg->objEditEnabled = false;

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    arg->objEditFileName = NULL;

#endif



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

     * Initialization
@@ -937,30 +903,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++;

        }
@@ -1041,10 +995,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;

                }
@@ -1383,7 +1335,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" );
@@ -1400,7 +1351,6 @@ static bool parseCmdlIVAS_dec( 
                arg->objEditFileName = argv[i]; /* read edit instructions from this file */

            }

            i++;

#endif

        }



        /*-----------------------------------------------------------------*
@@ -1518,6 +1468,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;

}
@@ -1554,7 +1516,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

    fprintf( stdout, "-fr L               : render frame size in ms L=(5,10,20), default is 20)\n" );

    fprintf( stdout, "-fec_cfg_file       : Optimal channel aware configuration computed by the JBM   \n" );
@@ -1590,11 +1553,7 @@ static void usage_dec( void ) 
    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" );

#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" );
@@ -1668,15 +1627,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 */
@@ -1734,7 +1684,6 @@ static ivas_error initOnFirstGoodFrame( 
        }

    }



#ifdef LIB_DEC_REVISION

    int16_t pcmFrameSize;

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

    {
@@ -1742,16 +1691,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 )

    {
@@ -1854,7 +1800,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;
@@ -1867,9 +1812,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 )

                {
@@ -1879,9 +1821,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 ) );
@@ -1930,9 +1869,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 )
@@ -1966,7 +1903,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 )
@@ -1976,7 +1912,6 @@ static ivas_error decodeG192( 
        }

    }



#endif

#endif

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

    {
@@ -2261,7 +2196,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 )
@@ -2270,14 +2204,9 @@ static ivas_error decodeG192( 
                            return error;

                        }

                    }

#endif



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

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

                    do_object_editing_fx( &editableParameters, objectEditFileReader );

#else

                    do_object_editing_fx( &editableParameters );

#endif



                    /* set new object parameters*/

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

            else

            {

#ifdef LIB_DEC_REVISION

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

#else

                if ( ( error = IVAS_DEC_GetSamples( hIvasDec, nSamplesToRender, ( 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;
@@ -2351,9 +2276,7 @@ static ivas_error decodeG192( 
            {

                if ( ( error = initOnFirstGoodFrame( hIvasDec, arg, numInitialBadFrames, &nOutSamples, &vec_pos_len, 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;

                }

            }
@@ -2698,9 +2621,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 )

{
@@ -2979,12 +2900,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 )

            {
@@ -2992,7 +2908,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 )
@@ -3094,11 +3009,7 @@ static ivas_error decodeVoIP( 
                }



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

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

                do_object_editing_fx( &editableParameters, objectEditFileReader );

#else

                do_object_editing_fx( &editableParameters );

#endif



                /* set new object parameters */

                if ( ( error = IVAS_DEC_SetEditableParameters( hIvasDec, editableParameters ) ) != IVAS_ERR_OK )
@@ -3132,11 +3043,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;

            }
@@ -3230,23 +3137,12 @@ static ivas_error decodeVoIP( 
            }

        }



#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

        vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;

#else

        // frame++;

        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++;
@@ -3255,7 +3151,6 @@ static ivas_error decodeVoIP( 
                fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );

            }

        }

#endif



#ifdef WMOPS

        update_mem();
@@ -3418,12 +3313,8 @@ cleanup: 
 *---------------------------------------------------------------------*/



static void do_object_editing_fx(

#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... */
@@ -3439,7 +3330,6 @@ static void do_object_editing_fx( 
        }

    }



#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    if ( objectEditFileReader != NULL )

    {

        ReadObjectEditInfo *readInfo;
@@ -3502,7 +3392,6 @@ static void do_object_editing_fx( 
    }

    else

    {

#endif

        if ( num_nondiegetic_objects )

        {

            float start_angle, angle_inc;
@@ -3526,9 +3415,7 @@ static void do_object_editing_fx( 
        }



        editableParameters->gain_bed_fx = ( 1 << 28 ); // 0.5 in Q29

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    }

#endif



    return;

}

apps/isar_post_rend.c

+0 −18
Original line number Diff line number Diff line
@@ -992,9 +992,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;
@@ -1003,11 +1001,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 )
@@ -1074,24 +1068,13 @@ 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 )
@@ -1100,7 +1083,6 @@ int main( 
                goto cleanup;

            }

        }

#endif



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

        {

lib_com/basop_util.c

+65 −2
Original line number Diff line number Diff line
@@ -2563,7 +2563,71 @@ Word16 BASOP_Util_Cmp_Mant32Exp /*!< o: flag: result of comparison */ 
     headroom is introduced into acc

*/



#ifdef OPT_2146_BASOP_UTIL_ADD_MANT32EXP

Word32 BASOP_Util_Add_Mant32Exp /* o  : normalized result mantissa */

    ( Word32 a_m,               /* i  : Mantissa of 1st operand a  */

      Word16 a_e,               /* i  : Exponent of 1st operand a  */

      Word32 b_m,               /* i  : Mantissa of 2nd operand b  */

      Word16 b_e,               /* i  : Exponent of 2nd operand b  */

      Word16 *ptr_e )           /* o  : exponent of result         */

{

    Word16 shift;

    /* Compare exponents: the difference is limited to +/- 31

       The Word32 mantissa of the operand with lower exponent is shifted right by the exponent difference.

       Then, the unshifted mantissa of the operand with the higher exponent is added. The addition result

       is normalized and the result represents the mantissa to return. The returned exponent takes into

       account all shift operations.

    */



    if ( !a_m )

    {

        a_e = b_e;

        move16();

    }



    if ( !b_m )

    {

        b_e = a_e;

        move16();

    }



    shift = sub( a_e, b_e );



    if ( shift > 0 )

        shift = s_min( shift, 31 );

    if ( shift < 0 )

        shift = s_max( shift, -31 );



    /* shift > 0 exponent of a is greater than exponent of b */

    if ( shift > 0 )

        b_m = L_shr( b_m, shift );

    /* shift < 0 exponent of b is greater than exponent of a */

    if ( shift < 0 )

        a_m = L_shl( a_m, shift );



    a_m = L_add( L_shr( a_m, 1 ), L_shr( b_m, 1 ) );



    if ( shift >= 0 )

        a_e = add( a_e, 1 );

    if ( shift < 0 )

        a_e = add( b_e, 1 );



    shift = norm_l( a_m );

    if ( shift )

        a_m = L_shl( a_m, shift );

    if ( !a_m )

    {

        a_e = 0;

        move16();

    }

    if ( a_m )

        a_e = sub( a_e, shift );



    *ptr_e = a_e;



    return ( a_m );

}

#else

Word32 BASOP_Util_Add_Mant32Exp /* o  : normalized result mantissa */

    ( Word32 a_m,               /* i  : Mantissa of 1st operand a  */

      Word16 a_e,               /* i  : Exponent of 1st operand a  */
@@ -2580,7 +2644,6 @@ Word32 BASOP_Util_Add_Mant32Exp /* o : normalized result mantissa */ 
       is normalized and the result represents the mantissa to return. The returned exponent takes into

       account all shift operations.

    */



    if ( !a_m )

    {

        a_e = b_e;
@@ -2622,7 +2685,7 @@ Word32 BASOP_Util_Add_Mant32Exp /* o : normalized result mantissa */ 


    return ( L_tmp );

}



#endif



static const Word16 shift_lc[] = { 9, 10 };

lib_com/ivas_cnst.h

+0 −4
Original line number Diff line number Diff line
@@ -200,11 +200,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,
@@ -258,10 +256,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: