Commit 0c611159 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_FMSW_DEC_EXT

parent c5866e1f

apps/decoder.c

+0 −16
Original line number Diff line number Diff line
@@ -163,9 +163,7 @@ static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS 
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_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 );

#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





/*------------------------------------------------------------------------------------------*
@@ -2027,11 +2025,7 @@ static ivas_error decodeG192( 
    int16_t isSplitRend, isSplitCoded;

    IVAS_RENDER_CONFIG_DATA renderConfig;

    RenderConfigReader *renderConfigReader = NULL;

#ifdef FIX_FMSW_DEC_EXT

    bool restartNeeded = false;

#else

    bool restartNeeded;

#endif



#ifdef VARIABLE_SPEED_DECODING

    if ( arg.tsmEnabled )
@@ -2418,7 +2412,6 @@ 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 )

        {
@@ -2428,7 +2421,6 @@ static ivas_error decodeG192( 
                goto cleanup;

            }

        }

#endif



        /* Write current frame */

        if ( decodedGoodFrame )
@@ -2823,11 +2815,7 @@ 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 };
@@ -3314,7 +3302,6 @@ 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 )

        {
@@ -3324,7 +3311,6 @@ static ivas_error decodeVoIP( 
                goto cleanup;

            }

        }

#endif



        /* Write current frame */

        if ( !srRtp.hPack && decodedGoodFrame )
@@ -3934,7 +3920,6 @@ static ivas_error load_hrtf_from_file( 
    return IVAS_ERR_OK;

}



#ifdef FIX_FMSW_DEC_EXT



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

 * updateOnFormatSwitching()
@@ -4008,6 +3993,5 @@ static ivas_error updateOnFormatSwitching( 


    return IVAS_ERR_OK;

}

#endif



#undef WMC_TOOL_SKIP

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ 
/* any switch which is non-be wrt. TS 26.251 V3.0 */



#define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE  /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */

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

#define FIX_BASOP_2612_RESET_DECIM_MEM                  /* FhG: BASOP #2612: reset (zero) the 16k resampler memory of the secondary channel on DFT->TD stereo switch (otherwise -> fx overshoot) */

#define FIX_BASOP_2621_STEREO_CNG_NOISY_SPEECH_QSHIFT   /* FhG: BASOP #2621: stereo_dft_generate_comfort_noise_fx flag_noisy_speech: compare (lp_speech-lp_noise) Q23 diff against 28.0 in Q23 (was vs integer 28 with q_lp_noise=0) */

#define FIX_ISSUE_2618_PLC_RES_ATT_SCALING              /* FhG: BASOP #2618: residual PLC burst attenuation, apply divide/Sqrt32 exponent so fac tracks exponent correctly */