Commit 8dd9ee4a authored by vaclav's avatar vaclav
Browse files

call "st_ivas->nchan_transport = nchan_transport_orig" assignment only at one... 

call "st_ivas->nchan_transport = nchan_transport_orig" assignment only at one place; under BRATE_SWITCHING_FRAMEWORK
parent 7e44f316

lib_dec/ivas_dirac_dec.c

+8 −6
Original line number Diff line number Diff line
@@ -262,6 +262,10 @@ ivas_error ivas_dirac_dec_config( 
     * set input parameters

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



#ifdef BRATE_SWITCHING_FRAMEWORK

    st_ivas->nchan_transport = nchan_transport_orig;

#endif



    if ( flag_config == DIRAC_OPEN )

    {

        hDirAC->slot_size = (int16_t) ( ( output_Fs / FRAMES_PER_SEC ) / CLDFB_NO_COL_MAX );
@@ -273,15 +277,12 @@ ivas_error ivas_dirac_dec_config( 
    /* band config needed only for SPAR with FOA output */

    if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_FOA && st_ivas->sba_mode == SBA_MODE_SPAR )

    {

#ifdef BRATE_SWITCHING_FRAMEWORK

        st_ivas->nchan_transport = nchan_transport_orig;

#endif



        return IVAS_ERR_OK;

    }



#ifndef BRATE_SWITCHING_FRAMEWORK

    st_ivas->nchan_transport = nchan_transport_orig;



#endif

    if ( nchan_transport_orig > 2 && hDirAC->hOutSetup.is_loudspeaker_setup && st_ivas->renderer_type == RENDERER_DIRAC )

    {

        hDirAC->synthesisConf = DIRAC_SYNTHESIS_PSD_LS;
@@ -876,8 +877,9 @@ ivas_error ivas_dirac_dec_config( 
        st_ivas->hDirAC = hDirAC;

    }



#ifndef BRATE_SWITCHING_FRAMEWORK

    st_ivas->nchan_transport = nchan_transport_orig;



#endif

    return error;

}