Commit 6b932cb9 authored by vaclav's avatar vaclav
Browse files

Merge branch 'evs_basop_alt_code_instrumented' of... 

Merge branch 'evs_basop_alt_code_instrumented' of https://forge.3gpp.org/rep/sa4/audio/ivas-basop into evs_basop_alt_code_instrumented
parents 067d12e2 a38e87df

lib_dec/decoder.c

+6 −5
Original line number Diff line number Diff line
@@ -199,16 +199,17 @@ int main(int argc, char *argv[]) 
                }

            }



#ifdef WMOPS

            update_wmops();

            update_mem();

#endif



            frame++;

            if (quietMode == 0)

            {

                fprintf( stdout, "%-8ld\b\b\b\b\b\b\b\b", frame);

            }



#ifdef WMOPS

            update_wmops();

            update_mem();

#endif



        }



        /*----- decode-a-frame-loop end -----*/

lib_enc/encoder.c

+15 −4
Original line number Diff line number Diff line
@@ -156,6 +156,17 @@ int main( int argc, char** argv ) 
            read_next_bwidth_fx( &st_fx->max_bwidth_fx, f_bwidth, &bwidth_profile_cnt, st_fx->input_Fs_fx );

        }



#ifdef WMOPS

        IF(st_fx->Opt_AMR_WB_fx)

        {

            push_wmops("amr_wb_enc");

        }

        else

        {

            push_wmops("evs_enc");

        }

#endif



        IF( ( st_fx->Opt_RF_ON && ( NE_32( st_fx->total_brate_fx, ACELP_13k20 )||EQ_32(st_fx->input_Fs_fx,8000)||st_fx->max_bwidth_fx==NB))

            || st_fx->rf_fec_offset == 0 )

        {
@@ -191,16 +202,12 @@ int main( int argc, char** argv ) 
        /* run the main encoding routine */

        IF ( st_fx->Opt_AMR_WB_fx )

        {

            push_wmops("amr_wb_enc");

            amr_wb_enc_fx( st_fx, data, n_samples);

            pop_wmops();

        }

        ELSE

        {

            push_wmops("evs_enc");

            /* EVS encoder*/

            evs_enc_fx( st_fx, data, n_samples);

            pop_wmops();

        }



        /* pack indices into serialized payload format */
@@ -212,6 +219,10 @@ int main( int argc, char** argv ) 
        /* write indices into bitstream file */

        write_indices_fx( st_fx, f_stream, pFrame, pFrame_size );



#ifdef WMOPS

        pop_wmops();

#endif



        fflush(stderr);



        frame++;