Commit c0987abc authored by multrus's avatar multrus
Browse files

Merge branch '20260609_cleanup' into 'main' 

20260609 cleanup

See merge request !2649
parents 033ab6d2 bcf61360

apps/decoder.c

+0 −16
Original line number Diff line number Diff line
@@ -183,9 +183,7 @@ static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBs 
static int16_t app_own_random( int16_t *seed );

#endif

static void do_object_editing( 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





/*------------------------------------------------------------------------------------------*
@@ -2265,11 +2263,7 @@ static ivas_error decodeG192( 
    int16_t vec_pos_update, vec_pos_len;

    SplitFileReadWrite *splitRendWriter = NULL;

    int16_t isSplitRend, isSplitCoded;

#ifdef FIX_FMSW_DEC_EXT

    bool restartNeeded = false;

#else

    bool restartNeeded;

#endif



#ifdef VARIABLE_SPEED_DECODING

    if ( arg.tsmEnabled )
@@ -2737,7 +2731,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 )

        {
@@ -2747,7 +2740,6 @@ static ivas_error decodeG192( 
                goto cleanup;

            }

        }

#endif



        /* Write current frame */

        if ( decodedGoodFrame )
@@ -3230,11 +3222,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 };
@@ -3724,7 +3712,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 )

        {
@@ -3734,7 +3721,6 @@ static ivas_error decodeVoIP( 
                goto cleanup;

            }

        }

#endif



        /* Write current frame */

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

}



#ifdef FIX_FMSW_DEC_EXT



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

 * updateOnFormatSwitching()
@@ -4412,6 +4397,5 @@ static ivas_error updateOnFormatSwitching( 


    return IVAS_ERR_OK;

}

#endif



#undef WMC_TOOL_SKIP

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -170,8 +170,6 @@ 
/* any switch which is non-be wrt. TS 26.258 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_BASOP_2442_MASA2TC_TO_MONO_AND_AMBI         /* Nokia: BASOP issue 2442: Aligns float with identical diffuse gain limitation to minimize diff */

#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_FLOAT_1600_OMASA_WRONG_RENDER_PATH          /* Nokia: float issue 1600: fix initialization condition of stereo type detection for OMASA */

lib_rend/ivas_dirac_output_synthesis_dec.c

+2 −15
Original line number Diff line number Diff line
@@ -56,10 +56,8 @@ 
#define DIRAC_AVG_LENGTH_SYNTH_MS_FAST 10

#define DIRAC_ALPHA_MAX_FAST           0.12f

#define DIRECTION_SMOOTHNESS_ALPHA     0.01f

#ifdef FIX_BASOP_2442_MASA2TC_TO_MONO_AND_AMBI

#define DIRAC_SMALL_DIFF_POW_LIM       65536.0f

#define DIRAC_SMALL_DIFF_POW_MAX_GAIN  2.0f

#endif





/*-------------------------------------------------------------------------
@@ -1254,9 +1252,7 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls( 
    float *alpha_synthesis_fast;

    int16_t alphaMaxBin;

    int16_t alphaMaxBinFast;

#ifdef FIX_BASOP_2442_MASA2TC_TO_MONO_AND_AMBI

    float diff_gain_limit;

#endif



    push_wmops( "dirac_out_synth_sfr" );
@@ -1441,26 +1437,17 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls( 
            /*diffuse*/

            *p_power_diff_smooth_prev = g1 * ( *p_power_smooth_diff++ ) + g2 * ( *p_power_diff_smooth_prev ) + EPSILON;

            *( p_cy_auto_diff_smooth_prev ) = g1 * ( *( p_cy_auto_diff_smooth++ ) ) + g2 * ( *( p_cy_auto_diff_smooth_prev ) );

#ifdef FIX_BASOP_2442_MASA2TC_TO_MONO_AND_AMBI

            diff_gain_limit = *p_power_diff_smooth_prev < DIRAC_SMALL_DIFF_POW_LIM ? DIRAC_SMALL_DIFF_POW_MAX_GAIN : DIRAC_GAIN_LIMIT;

#endif

            *( p_gains_diff ) = sqrtf( *( p_cy_auto_diff_smooth_prev++ ) / ( *( p_power_diff_smooth_prev++ ) ) );



            if ( *( p_gains_diff ) < 0.f )

            {

                *( p_gains_diff ) = 0.f;

            }

#ifdef FIX_BASOP_2442_MASA2TC_TO_MONO_AND_AMBI

            else if ( *( p_gains_diff ) > diff_gain_limit )

            {

                *( p_gains_diff ) = diff_gain_limit;

            }

#else

            else if ( *( p_gains_diff ) > DIRAC_GAIN_LIMIT )

            {

                *( p_gains_diff ) = DIRAC_GAIN_LIMIT;

            }

#endif

            p_gains_diff++;

        }