Commit 3bf40de1 authored by vaclav's avatar vaclav
Browse files

review + beautification

parent bd01c3e2

lib_dec/ivas_sba_dec.c

+64 −463

File changed.

Preview size limit exceeded, changes collapsed.

lib_enc/ivas_core_enc.c

+4 −4
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ ivas_error ivas_core_enc( 
    int16_t unbits[CPE_CHANNELS];

    float tdm_lspQ_PCh[M], tdm_lsfQ_PCh[M];

    int16_t last_element_mode, tdm_Pitch_reuse_flag;

#ifdef SBA_BITRATE_SWITCHING

#ifdef CORECODER_BITRATE_SWITCHING

    int32_t element_brate, last_element_brate, input_Fs;

#else

    int32_t element_brate, input_Fs;
@@ -127,7 +127,7 @@ ivas_error ivas_core_enc( 
        hStereoTD = NULL;

        hStereoICBWE = NULL;

        element_brate = hSCE->element_brate;

#ifdef SBA_BITRATE_SWITCHING

#ifdef CORECODER_BITRATE_SWITCHING

        last_element_brate = hSCE->last_element_brate;

#endif

        last_element_mode = IVAS_SCE;
@@ -144,7 +144,7 @@ ivas_error ivas_core_enc( 
        sts = hCPE->hCoreCoder;

        hStereoICBWE = hCPE->hStereoICBWE;

        element_brate = hCPE->element_brate;

#ifdef SBA_BITRATE_SWITCHING

#ifdef CORECODER_BITRATE_SWITCHING

        last_element_brate = hCPE->last_element_brate;

#endif

        last_element_mode = hCPE->last_element_mode;
@@ -187,7 +187,7 @@ ivas_error ivas_core_enc( 
         * Pre-processing, incl. Decision matrix

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



#ifdef SBA_BITRATE_SWITCHING

#ifdef CORECODER_BITRATE_SWITCHING

        if ( ( error = pre_proc_ivas( st, last_element_mode, element_brate, ivas_format == SBA_FORMAT ? last_element_brate : element_brate, input_frame, old_inp_12k8[n], old_inp_16k[n], &inp[n], &ener[n], A[n], Aw[n], epsP[n], lsp_new[n], lsp_mid[n], new_inp_resamp16k[n], &Voicing_flag[n], old_wsp[n], loc_harm[n], cor_map_sum[n], vad_flag_dtx[n], enerBuffer[n], fft_buff[n], is_MCT, vad_hover_flag[n], flag_16k_smc ) ) != IVAS_ERR_OK )

#else

        if ( ( error = pre_proc_ivas( st, last_element_mode, element_brate, input_frame, old_inp_12k8[n], old_inp_16k[n], &inp[n], &ener[n], A[n], Aw[n], epsP[n], lsp_new[n], lsp_mid[n], new_inp_resamp16k[n], &Voicing_flag[n], old_wsp[n], loc_harm[n], cor_map_sum[n], vad_flag_dtx[n], enerBuffer[n], fft_buff[n], is_MCT, vad_hover_flag[n], flag_16k_smc ) ) != IVAS_ERR_OK )

lib_enc/ivas_sba_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -569,11 +569,7 @@ ivas_error ivas_sba_enc_reconfigure( 
            }

            else if ( st_ivas->hMCT != NULL && st_ivas->nCPE > 1 )

            {

#ifdef SBA_BITRATE_SWITCHING

                if ( ( error = mct_enc_reconfigure( st_ivas, st_ivas->nchan_transport != nchan_transport_old ) ) != IVAS_ERR_OK )

#else

                if ( ( error = mct_enc_reconfigure( st_ivas, st_ivas->nCPE != nCPE_old ) ) != IVAS_ERR_OK )

#endif

                {

                    return error;

                }