Commit 64cdc572 authored by vaclav's avatar vaclav
Browse files

simplification

parent cfaff6c2

lib_dec/ivas_init_dec.c

+7 −6
Original line number Diff line number Diff line
@@ -782,6 +782,9 @@ ivas_error ivas_init_decoder_front( 


    st_ivas->nSCE = 0;

    st_ivas->nCPE = 0;

#ifdef NONBE_FIX_1052_SBA_EXT_FIX

    st_ivas->nchan_ism = 0;

#endif

    st_ivas->nchan_transport = -1;



    st_ivas->ism_mode = ISM_MODE_NONE;
@@ -943,17 +946,15 @@ ivas_error ivas_init_decoder( 
        {

            hDecoderConfig->nchan_out = CPE_CHANNELS;

        }

#ifdef NONBE_FIX_1052_SBA_EXT_FIX

        else if ( st_ivas->ivas_format == SBA_FORMAT )

        {

            hDecoderConfig->nchan_out = audioCfg2channels( ivas_set_audio_config_from_sba_order( st_ivas->sba_order ) );

        }

#endif

        else if ( st_ivas->ivas_format == MC_FORMAT )

        {

            hDecoderConfig->nchan_out = audioCfg2channels( st_ivas->transport_config );

        }

#ifdef NONBE_FIX_1052_SBA_EXT_FIX

        else if ( st_ivas->ivas_format == SBA_ISM_FORMAT || st_ivas->ivas_format == SBA_FORMAT )

#else

        else if ( st_ivas->ivas_format == SBA_ISM_FORMAT )

#endif

        {

            hDecoderConfig->nchan_out = audioCfg2channels( IVAS_AUDIO_CONFIG_HOA3 );

            hDecoderConfig->nchan_out += st_ivas->nchan_ism;