Commit eacf2155 authored by vaillancour's avatar vaillancour
Browse files

Merge branch 'basop_noglob' of forge.3gpp.org:ivas-codec-pc/ivas-codec-basop into basop_noglob

parents 36db77ad cf8ab748

CMakeLists.txt

+6 −6
Original line number Diff line number Diff line
@@ -18,15 +18,15 @@ endif() 


add_executable(EVS_cod lib_enc/encoder.c)

target_link_libraries(EVS_cod lib_evs)

# if(WIN32)

#   target_link_libraries(EVS_cod Ws2_32)

# endif()

if(WIN32)

  target_link_libraries(EVS_cod Ws2_32)

endif()



add_executable(EVS_dec lib_dec/decoder.c)

target_link_libraries(EVS_dec lib_evs)

# if(WIN32)

#   target_link_libraries(EVS_dec Ws2_32)

# endif()

if(WIN32)

  target_link_libraries(EVS_dec Ws2_32)

endif()



set(CPACK_PROJECT_NAME ${PROJECT_NAME})

set(CPACK_PROJECT_VERSION ${PROJECT_VERSION})

basic_op/basop32.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ void print_stack(void) { 
}

#else

void print_stack(void) {

  printf("[BASOP] <call stack would be here> - printing call stack currently only supported on UNIX");

  printf("[BASOP] <call stack would be here> - printing call stack currently only supported on UNIX\n");

}

#endif

lib_dec/swb_bwe_dec_hr_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -1038,7 +1038,7 @@ Word16 swb_bwe_dec_hr_fx( /* o : Exponent of SHB synthesis */ 
#ifdef BASOP_NOGLOB

                round_fx_sat(L_shl_sat(L_tilt_wb, 3)), /* Q(24+3-16) -> Q11 */

#else

                round_fx(L_s5hl(L_tilt_wb, 3)), /* Q(24+3-16) -> Q11 */

                round_fx(L_shl(L_tilt_wb, 3)), /* Q(24+3-16) -> Q11 */

#endif

                pitch, nq, Nsv, &hBWE_FD_HR->bwe_highrate_seed_fx, t_audio + NUM_NONTRANS_START_FREQ_COEF, t_audio_exp );

            }