Commit b3570dfe authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '1554-lib_enc-ivas_cpe_enc_fx-c-remove-pop_wmops-in-ivas_cpe_enc_fx' into 'main' 

Resolve "lib_enc/ivas_cpe_enc_fx.c: remove pop_wmops in ivas_cpe_enc_fx()."

Closes #1554

See merge request !1530
parents 0d83f7fa 0a393ee2

lib_enc/ivas_cpe_enc_fx.c

+0 −7
Original line number Diff line number Diff line
@@ -336,7 +336,6 @@ ivas_error ivas_cpe_enc_fx( 
                                       &q_band_energies_LR, NULL, NULL, NULL, Q_inp, Q_buffer, Q_add, &front_create_flag ) ),

               IVAS_ERR_OK ) )

    {

        pop_wmops();

        return error;

    }
@@ -370,7 +369,6 @@ ivas_error ivas_cpe_enc_fx( 
     *----------------------------------------------------------------*/

    IF( ( error = stereo_memory_enc_fx( hCPE, input_Fs, max_bwidth, ivas_format, st_ivas->nchan_transport ) ) != IVAS_ERR_OK )

    {

        pop_wmops();

        return error;

    }
@@ -381,7 +379,6 @@ ivas_error ivas_cpe_enc_fx( 


    IF( ( error = stereo_set_tdm_fx( hCPE, input_frame, sts[1]->q_inp32 ) ) != IVAS_ERR_OK )

    {

        pop_wmops();

        return error;

    }
@@ -919,7 +916,6 @@ ivas_error ivas_cpe_enc_fx( 
        move16();

        IF( error != IVAS_ERR_OK )

        {

            pop_wmops();

            return error;

        }

    }
@@ -994,7 +990,6 @@ ivas_error ivas_cpe_enc_fx( 
            igf = getIgfPresent_fx( sts[n]->element_mode, L_mult0( sts[n]->bits_frame_nominal, FRAMES_PER_SEC ), sts[n]->max_bwidth, sts[n]->rf_mode ); /* Q0 */

            IF( ( error = IGF_Reconfig_fx( &sts[n]->hIGFEnc, igf, 0, L_mult0( sts[n]->bits_frame_nominal, FRAMES_PER_SEC ), sts[n]->max_bwidth, sts[n]->element_mode, sts[n]->rf_mode ) ) != IVAS_ERR_OK )

            {

                pop_wmops();

                return error;

            }

        }
@@ -1023,7 +1018,6 @@ ivas_error ivas_cpe_enc_fx( 
            {

                IF( ( error = initMdctItdHandling_fx( hCPE->hStereoMdct, input_Fs ) ) != IVAS_ERR_OK )

                {

                    pop_wmops();

                    return error;

                }

            }
@@ -1200,7 +1194,6 @@ ivas_error ivas_cpe_enc_fx( 
    }

    IF( NE_32( ( error = ivas_core_enc_fx( NULL, hCPE, st_ivas->hMCT, n_CoreChannels, old_inp_12k8_16fx, old_inp_16k_16fx, Q_new, ener_fx, A_fx, Aw_fx, epsP_fx, epsP_fx_q, lsp_new_fx, lsp_mid_fx, vad_hover_flag, attack_flag, realBuffer_fx, imagBuffer_fx, q_re_im_buf, old_wsp_fx, e_old_wsp, loc_harm, cor_map_sum_fx, vad_flag_dtx, enerBuffer_fx, enerBuffer_fx_exp, fft_buff_fx, tdm_SM_or_LRTD_Pri, ivas_format, 0 ) ), IVAS_ERR_OK ) )

    {

        pop_wmops();

        return error;

    }