Commit 817418bc authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch '5ms_api_sgi_merge' of forge.3gpp.org:ivas-codec-pc/ivas-codec into 5ms_api_main_merge

parents 39cfd25c 9cebadc9

lib_com/ivas_error.h

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ typedef enum 
#ifdef API_5MS

    IVAS_ERR_TSM_NOT_ENABLED,

    IVAS_ERR_FETCH_SIZE_NO_MULTIPLE_OF_5MS,

    IVAS_ERR_NEED_NEW_FRAME,

#endif

#ifdef DEBUGGING

    IVAS_ERR_INVALID_FORCE_MODE,

lib_dec/lib_dec.c

+6 −4
Original line number Diff line number Diff line
@@ -1108,18 +1108,20 @@ ivas_error IVAS_DEC_GetSplitBinaural( 
    }



    *nOutSamples = 0;

    *needNewFrame = FALSE;



    while ( error == IVAS_ERR_OK )

    while ( error == IVAS_ERR_OK && !*needNewFrame )

    {

        int16_t nOutSamplesLocal;



        /* Decode and render */

        if ( ( error = IVAS_DEC_GetSamples(

        error = IVAS_DEC_GetSamples(

                   hIvasDec,

                   numSamplesPerChannel,

                   output_int,

                   &nOutSamplesLocal,

                   needNewFrame ) ) != IVAS_ERR_OK )

                   needNewFrame );

        if ( error != IVAS_ERR_OK || *needNewFrame )

        {

            return error;

        }
@@ -1139,7 +1141,7 @@ ivas_error IVAS_DEC_GetSplitBinaural( 
        numPoses = hSplitBinRend->splitrend.multiBinPoseData.num_poses;



        /* [tmp] convert int back to float and change buffer layout */

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

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

        {

            for (j = 0; j < BINAURAL_CHANNELS * numPoses; ++j)

            {