Commit b9ef646a authored by vaclav's avatar vaclav
Browse files

FIX_1525_UNINIT_FORMAT_SWITCHING_DEC

parent 2133f18c
Loading
Loading
Loading
Loading
Loading
+10 −1
Original line number Diff line number Diff line
@@ -2962,6 +2962,10 @@ static ivas_error decodeVoIP(

            *phIvasDec = hIvasDec; /* Update for main()' s free */
            ivasRtp.restartNeeded = false;
#ifdef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC
            bitstreamReadDone = false;
            parametersAvailableForEditing = false;
#endif
        }

        /* reference vector */
@@ -3211,6 +3215,10 @@ static ivas_error decodeVoIP(
                    }

                    *phIvasDec = hIvasDec; /* Update for main()' s free */
#ifdef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC
                    bitstreamReadDone = false;
                    parametersAvailableForEditing = false;
#endif
                }

                /* Placeholder for memory reallocation */
@@ -3974,12 +3982,13 @@ static ivas_error restartDecoder(
        }
    }

#ifndef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC
    if ( ( error = IVAS_DEC_PrintConfig( hIvasDec, 1, arg->voipMode ) ) != IVAS_ERR_OK )
    {
        fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
        goto cleanup;
    }

#endif
    /* ISAR frame size is set from command line, not renderer config file.
     * This will be ignored if output format is not split rendering. */
    if ( renderConfig != NULL )
+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@
#define FIX_FLOAT_1536_INIT_NO_PARAM_LPC                /* FhG: make sure no_param_lpc is initialized in core_encode_twodiv() */
#define FIX_BASOP_2871_INIT_Q_SYN_FACTOR                /* FhG: make sure, st_fx->Q_syn_factor gets initialized during decoder startup */
#define FIX_BASOP_2470_POWER_SPEC_E_INIT                /* FhG: make sure powerSpec_e is always initialized in core_signal_analysis_high_bitrate_fx() */
#define FIX_1525_UNINIT_FORMAT_SWITCHING_DEC            /* VA: float issue 1525: fix reading of uninitialized memory in format switching at the decoder */

/* #################### End BE switches ################################## */