1
0
mirror of https://github.com/nu774/fdkaac.git synced 2025-06-05 23:29:14 +02:00

4 Commits

Author SHA1 Message Date
d1ce25369b zero clear LIB_INFO before calling aacEncGetLibInfo() 2013-01-05 23:56:15 +09:00
bae3489b91 tweak configure.ac and Makefile.am 2013-01-05 14:20:23 +09:00
f333a45f78 update version.h 2013-01-05 14:04:44 +09:00
6da14aaeb7 fixed to clip before converting float to int 2013-01-05 10:47:21 +09:00
5 changed files with 18 additions and 13 deletions

View File

@ -1,5 +1,5 @@
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = COPYING
AUTOMAKE_OPTIONS = subdir-objects
bin_PROGRAMS = fdkaac
@ -23,3 +23,8 @@ if FDK_PLATFORM_WIN32
fdkaac_SOURCES += \
src/compat_win32.c
endif
EXTRA_DIST = \
src/*.h \
missings/*.c \
missings/*.h

View File

@ -10,6 +10,7 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
AC_PROG_CC
AM_PROG_CC_C_O
AC_CHECK_HEADERS([getopt.h sys/time.h])
AC_CHECK_HEADERS([localcharset.h langinfo.h endian.h byteswap.h])

View File

@ -34,7 +34,7 @@ inline int lrint(double x)
# endif
#endif
inline int pcm_clip(int n, int min_value, int max_value)
inline double pcm_clip(double n, double min_value, double max_value)
{
if (n < min_value)
return min_value;
@ -67,7 +67,7 @@ inline int16_t pcm_quantize_s32(int32_t n)
}
inline int16_t pcm_quantize_f64(double v)
{
return pcm_clip(lrint(v * 32768.0), -32768, 32767);
return (int16_t)lrint(pcm_clip(v * 32768.0, -32768.0, 32767.0));
}
inline int16_t pcm_s8_to_s16(int8_t n)
{

View File

@ -398,8 +398,7 @@ int finalize_m4a(m4af_writer_t *m4af, const aacenc_param_ex_t *params,
p += sprintf(p, PROGNAME " %s, ", fdkaac_version);
lib_info = malloc(FDK_MODULE_LAST * sizeof(LIB_INFO));
/* XXX: aacEncGetLibInfo() seems buggy and sometimes fails */
lib_info = calloc(FDK_MODULE_LAST, sizeof(LIB_INFO));
if (aacEncGetLibInfo(lib_info) == AACENC_OK) {
for (i = 0; i < FDK_MODULE_LAST; ++i)
if (lib_info[i].module_id == FDK_AACENC)

View File

@ -1,4 +1,4 @@
#ifndef VERSION_H
#define VERSION_H
const char *fdkaac_version = "0.0.1";
const char *fdkaac_version = "0.0.3";
#endif