Commit 6400d88b authored by multrus's avatar multrus
Browse files

merge from main

parents fd52744e acb4374f

apps/decoder.c

+49 −0
Original line number Diff line number Diff line
@@ -159,7 +159,11 @@ typedef struct 


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

static void usage_dec( void );

#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH

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 *phIvasDec, 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, ObjectEditFileReader *objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

#endif

static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_RENDER_CONFIG_DATA *renderConfig, IVAS_DEC_HANDLE *phIvasDec, int16_t *pcmBuf );

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

static void do_object_editing_fx( IVAS_EDITABLE_PARAMETERS *editableParameters, ObjectEditFileReader *objectEditFileReader );
@@ -668,7 +672,11 @@ int main( 
    }

    else

    {

#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH

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

#else

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

#endif

    }



    if ( error == IVAS_ERR_OK || error == IVAS_ERR_END_OF_FILE )
@@ -2002,7 +2010,11 @@ static ivas_error decodeG192( 
    Vector3PairFileReader *referenceVectorReader,

    ObjectEditFileReader *objectEditFileReader,

    ISAR_SPLIT_REND_BITS_DATA *splitRendBits,

#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH

    IVAS_DEC_HANDLE *phIvasDec,

#else

    IVAS_DEC_HANDLE hIvasDec,

#endif

    int16_t *pcmBuf )



{
@@ -2010,6 +2022,9 @@ static ivas_error decodeG192( 
    uint16_t bit_stream[IVAS_MAX_BITS_PER_FRAME + 4 * 8];

    int16_t i, num_bits;

    int16_t bfi = 0;

#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH

    IVAS_DEC_HANDLE hIvasDec = *phIvasDec;

#endif

    AudioFileWriter *afWriter = NULL;

    MasaFileWriter *masaWriter = NULL;

    bool decodedGoodFrame = false;
@@ -2033,6 +2048,9 @@ static ivas_error decodeG192( 
    int16_t isSplitRend, isSplitCoded;

    IVAS_RENDER_CONFIG_DATA renderConfig;

    RenderConfigReader *renderConfigReader = NULL;

#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH

    bool restartNeeded;

#endif



#ifdef VARIABLE_SPEED_DECODING

    if ( arg.tsmEnabled )
@@ -2289,6 +2307,37 @@ static ivas_error decodeG192( 
                    return error;

                }



#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH

                if ( ( error = IVAS_DEC_isRestartNeeded( hIvasDec, &restartNeeded ) ) != IVAS_ERR_OK )

                {

                    return error;

                }



                if ( restartNeeded )

                {

                    IVAS_DEC_BS_FORMAT tempFormat;

                    if ( ( error = IVAS_DEC_GetFormat( hIvasDec, &tempFormat ) ) != IVAS_ERR_OK )

                    {

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

                        goto cleanup;

                    }

                    IVAS_DEC_MODE codecMode = ( tempFormat == IVAS_DEC_BS_MONO ) ? IVAS_DEC_MODE_EVS : IVAS_DEC_MODE_IVAS;

                    error = restartDecoder(

                        &hIvasDec,

                        codecMode,

                        &arg,

                        NULL, /* ToDo : Provide rendererConfig */

                        NULL  /* ToDo : Provide LS Custom Data */

                    );

                    if ( error != IVAS_ERR_OK )

                    {

                        fprintf( stderr, "\nFailed to restart decoder\n" );

                        goto cleanup;

                    }

                    *phIvasDec = hIvasDec; /* Update for main()' s free */

                }

#endif



                /* Placeholder for memory reallocation */

                /* ... */

lib_com/basop_util.c

+60 −0
Original line number Diff line number Diff line
@@ -714,6 +714,66 @@ Word16 getScaleFactor16( /* o: measured headroom in range [ 
    return i;

}



#ifdef OPTIMIZE_FFT_STACK

/* o: measured headroom in range [0..31], 0 if all x[i] == 0 */

Word16 getScaleFactor32_cmplx(

    cmplx *x,          /* i: array containing 32-bit data */

    const Word16 len_x /* i: length of the array to scan  */

)

{

    Word16 i, i_min, i_max, i_re, i_im;

    Word32 x_min_re, x_max_re, x_min_im, x_max_im;



    x_max_re = 0;

    move32();

    x_min_re = 0;

    move32();

    x_max_im = 0;

    move32();

    x_min_im = 0;

    move32();

    FOR( i = 0; i < len_x; i++ )

    {

        if ( x[i].re >= 0 )

            x_max_re = L_max( x_max_re, x[i].re );

        if ( x[i].re < 0 )

            x_min_re = L_min( x_min_re, x[i].re );

        if ( x[i].im >= 0 )

            x_max_im = L_max( x_max_im, x[i].im );

        if ( x[i].im < 0 )

            x_min_im = L_min( x_min_im, x[i].im );

    }



    i_max = 0x20;

    move16();

    i_min = 0x20;

    move16();



    if ( x_max_re != 0 )

        i_max = norm_l( x_max_re );



    if ( x_min_re != 0 )

        i_min = norm_l( x_min_re );



    i_re = s_and( s_min( i_max, i_min ), 0x1F );



    i_max = 0x20;

    move16();

    i_min = 0x20;

    move16();



    if ( x_max_im != 0 )

        i_max = norm_l( x_max_im );



    if ( x_min_im != 0 )

        i_min = norm_l( x_min_im );



    i_im = s_and( s_min( i_max, i_min ), 0x1F );



    return s_min( i_re, i_im );

}

#endif





/********************************************************************/

/*!

lib_com/basop_util.h

+12 −3
Original line number Diff line number Diff line
@@ -216,10 +216,19 @@ void BASOP_Util_Sqrt_InvSqrt_MantExp( Word16 mantissa, /*!< mantissa */ 
    and   -32768 <= x <= -16384 for negative x

*/



Word16 getScaleFactor16(                       /* o: measured headroom in range [0..15], 0 if all x[i] == 0 */

/* o: measured headroom in range [0..15], 0 if all x[i] == 0 */

Word16 getScaleFactor16(

    const Word16 *x,      /* i: array containing 16-bit data */

    const Word16 len_x ); /* i: length of the array to scan  */



#ifdef OPTIMIZE_FFT_STACK

/* o: measured headroom in range [0..31], 0 if all x[i] == 0 */

Word16 getScaleFactor32_cmplx(

    cmplx *x,          /* i: array containing 32-bit data */

    const Word16 len_x /* i: length of the array to scan  */

);

#endif



/********************************************************************/

/*!

  \brief   Calculates the scalefactor needed to normalize input array

lib_com/edct_fx.c

+316 −26

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/fd_cng_com_fx.c

+719 −0

File changed.

Preview size limit exceeded, changes collapsed.