Commit 81201191 authored by vaclav's avatar vaclav
Browse files

FIX_FMSW_DEC_EXT

parent a90fd817

apps/decoder.c

+111 −0
Original line number Diff line number Diff line
@@ -168,6 +168,9 @@ static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS 
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 );

static ivas_error restartDecoder( IVAS_DEC_HANDLE *phIvasDec, const IVAS_DEC_MODE decMode, DecArguments *arg, IVAS_RENDER_CONFIG_DATA *renderConfig, IVAS_CUSTOM_LS_DATA *hLsCustomData );

#ifdef FIX_FMSW_DEC_EXT

static ivas_error updateOnFormatSwitching( IVAS_DEC_HANDLE hIvasDec, IVAS_DEC_BS_FORMAT *pBsFormat, const char *outputWavFilename, MasaFileWriter **ppMasaWriter, IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS], int16_t *pNumOutChannels, uint16_t *pNumObj, const bool delayCompensationEnabled );

#endif





/*------------------------------------------------------------------------------------------*
@@ -2053,8 +2056,12 @@ static ivas_error decodeG192( 
    IVAS_RENDER_CONFIG_DATA renderConfig;

    RenderConfigReader *renderConfigReader = NULL;

#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH

#ifdef FIX_FMSW_DEC_EXT

    bool restartNeeded = false;

#else

    bool restartNeeded;

#endif

#endif



#ifdef VARIABLE_SPEED_DECODING

    if ( arg.tsmEnabled )
@@ -2459,6 +2466,18 @@ static ivas_error decodeG192( 
            }

        }



#ifdef FIX_FMSW_DEC_EXT

        /* Output writing update in case of format switching and EXTERNAL output */

        if ( restartNeeded && arg.outputConfig == IVAS_AUDIO_CONFIG_EXTERNAL )

        {

            if ( ( error = updateOnFormatSwitching( hIvasDec, &bsFormat, arg.outputWavFilename, &masaWriter, ismWriters, &nOutChannels, &numObj, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )

            {

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

                goto cleanup;

            }

        }

#endif



        /* Write current frame */

        if ( decodedGoodFrame )

        {
@@ -2853,7 +2872,11 @@ static ivas_error decodeVoIP( 
    int16_t i;

    IVAS_DEC_HANDLE hIvasDec = *phIvasDec;



#ifdef FIX_FMSW_DEC_EXT

    bool restartNeeded = false;

#else

    bool restartNeeded;

#endif

    IVAS_RTP ivasRtp = { 0 };

    IVAS_RTP srRtp = { 0 };

    IVAS_RTP_SR_INFO srInfo = { true, false, 0, 20, IVAS_SR_TRANSPORT_LCLD };
@@ -3357,6 +3380,18 @@ static ivas_error decodeVoIP( 
            }

        }



#ifdef FIX_FMSW_DEC_EXT

        /* Output writing update in case of format switching and EXTERNAL output */

        if ( restartNeeded && arg.outputConfig == IVAS_AUDIO_CONFIG_EXTERNAL )

        {

            if ( ( error = updateOnFormatSwitching( hIvasDec, &bsFormat, arg.outputWavFilename, &masaWriter, ismWriters, &nOutChannels, &numObj, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )

            {

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

                goto cleanup;

            }

        }

#endif



        /* Write current frame */

        if ( !srRtp.hPack && decodedGoodFrame )

        {
@@ -3965,6 +4000,82 @@ static ivas_error load_hrtf_from_file( 
    return IVAS_ERR_OK;

}



#ifdef FIX_FMSW_DEC_EXT



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

 * updateOnFormatSwitching()

 *

 * In case of IVAS format switching and EXTERNAL output,

 * update decoder wrt. output writing

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



static ivas_error updateOnFormatSwitching(

    IVAS_DEC_HANDLE hIvasDec,                        /* i/o: IVAS decoder handle                             */

    IVAS_DEC_BS_FORMAT *pBsFormat,                   /* o  : format of currently decoded bitstream           */

    const char *outputWavFilename,                   /* i  : name of the output audio file                   */

    MasaFileWriter **ppMasaWriter,                   /* o  : MasaFileWriter handle                           */

    IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS], /* o  : 1-4 ismWriters handles                          */

    int16_t *pNumOutChannels,                        /* o  : number of output channels                       */

    uint16_t *pNumObj,                               /* o  : number of ISM objects                           */

    const bool delayCompensationEnabled              /* i  : is delay compensation enabled                   */

)

{

    ivas_error error;



    /* in case of EXT output, the number of output audio channels can change */

    if ( ( error = IVAS_DEC_GetNumOutputChannels( hIvasDec, pNumOutChannels ) ) != IVAS_ERR_OK )

    {

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

        return error;

    }



    /* Get the format of currently decoded bitstream */

    if ( ( error = IVAS_DEC_GetFormat( hIvasDec, pBsFormat ) ) != IVAS_ERR_OK )

    {

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

        return error;

    }



    *pNumObj = 0;

    if ( *pBsFormat == IVAS_DEC_BS_OBJ || *pBsFormat == IVAS_DEC_BS_MASA_ISM || *pBsFormat == IVAS_DEC_BS_SBA_ISM )

    {

        if ( ( error = IVAS_DEC_GetNumObjects( hIvasDec, pNumObj ) ) != IVAS_ERR_OK )

        {

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

            return error;

        }



        /* If outputting ISM/OMASA/OSBA, ensure the output metadata files are opened */

        for ( int16_t i = 0; i < *pNumObj; ++i )

        {

            if ( ismWriters[i] == NULL )

            {

                if ( ( error = IsmFileWriter_open( outputWavFilename, i, &ismWriters[i] ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nError: Error opening ISM decoded metadata file %s\n", IsmFileWriter_getFilePath( ismWriters[i] ) );

                    return error;

                }

            }

        }

    }



    /* If outputting MASA, ensure the output file metadata is opened */

    if ( *pBsFormat == IVAS_DEC_BS_MASA || *pBsFormat == IVAS_DEC_BS_MASA_ISM )

    {

        if ( ppMasaWriter != NULL )

        {

            if ( ( error = MasaFileWriter_open( outputWavFilename, delayCompensationEnabled, ppMasaWriter ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nError: Error opening MASA decoded metadata file %s\n", MasaFileWriter_getFilePath( *ppMasaWriter ) );

                return error;

            }

        }

    }



    return IVAS_ERR_OK;

}



#endif



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

 * restartDecoder()

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ 
#define FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC        /* VA : Basop issue 2547: Align conditions in core sw dec */

#define FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC_EVS    /* VA : Basop issue 2547: Align conditions in core sw dec, condition that could affect EVS as well, but adapted to keep EVS BE */

#define FIX_BASOP_2548_ProcessIGF_fx_PREDICTIONGAIN     /* FhG: fixes obvious bug for IVAS path. For EVS path, issue is still not resolved */

#define FIX_FMSW_DEC_EXT                                /* float issue 1566: fix EXT output in format switching */



/* ##################### End NON-BE switches ########################### */