mirror of
https://github.com/nu774/fdkaac.git
synced 2025-06-05 23:29:14 +02:00
Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
d1ce25369b | |||
bae3489b91 | |||
f333a45f78 | |||
6da14aaeb7 |
21
Makefile.am
21
Makefile.am
@ -1,18 +1,18 @@
|
|||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
EXTRA_DIST = COPYING
|
AUTOMAKE_OPTIONS = subdir-objects
|
||||||
|
|
||||||
bin_PROGRAMS = fdkaac
|
bin_PROGRAMS = fdkaac
|
||||||
|
|
||||||
fdkaac_SOURCES = \
|
fdkaac_SOURCES = \
|
||||||
src/aacenc.c \
|
src/aacenc.c \
|
||||||
src/lpcm.c \
|
src/lpcm.c \
|
||||||
src/m4af.c \
|
src/m4af.c \
|
||||||
src/main.c \
|
src/main.c \
|
||||||
src/progress.c \
|
src/progress.c \
|
||||||
src/wav_reader.c
|
src/wav_reader.c
|
||||||
|
|
||||||
fdkaac_LDADD = \
|
fdkaac_LDADD = \
|
||||||
@LIBICONV@ -lm
|
@LIBICONV@ -lm
|
||||||
|
|
||||||
if FDK_PLATFORM_POSIX
|
if FDK_PLATFORM_POSIX
|
||||||
fdkaac_SOURCES += \
|
fdkaac_SOURCES += \
|
||||||
@ -23,3 +23,8 @@ if FDK_PLATFORM_WIN32
|
|||||||
fdkaac_SOURCES += \
|
fdkaac_SOURCES += \
|
||||||
src/compat_win32.c
|
src/compat_win32.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
EXTRA_DIST = \
|
||||||
|
src/*.h \
|
||||||
|
missings/*.c \
|
||||||
|
missings/*.h
|
||||||
|
@ -10,6 +10,7 @@ AC_CONFIG_MACRO_DIR([m4])
|
|||||||
AM_INIT_AUTOMAKE
|
AM_INIT_AUTOMAKE
|
||||||
|
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
|
AM_PROG_CC_C_O
|
||||||
|
|
||||||
AC_CHECK_HEADERS([getopt.h sys/time.h])
|
AC_CHECK_HEADERS([getopt.h sys/time.h])
|
||||||
AC_CHECK_HEADERS([localcharset.h langinfo.h endian.h byteswap.h])
|
AC_CHECK_HEADERS([localcharset.h langinfo.h endian.h byteswap.h])
|
||||||
|
@ -34,7 +34,7 @@ inline int lrint(double x)
|
|||||||
# endif
|
# endif
|
||||||
#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)
|
if (n < min_value)
|
||||||
return 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)
|
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)
|
inline int16_t pcm_s8_to_s16(int8_t n)
|
||||||
{
|
{
|
||||||
|
@ -398,8 +398,7 @@ int finalize_m4a(m4af_writer_t *m4af, const aacenc_param_ex_t *params,
|
|||||||
|
|
||||||
p += sprintf(p, PROGNAME " %s, ", fdkaac_version);
|
p += sprintf(p, PROGNAME " %s, ", fdkaac_version);
|
||||||
|
|
||||||
lib_info = malloc(FDK_MODULE_LAST * sizeof(LIB_INFO));
|
lib_info = calloc(FDK_MODULE_LAST, sizeof(LIB_INFO));
|
||||||
/* XXX: aacEncGetLibInfo() seems buggy and sometimes fails */
|
|
||||||
if (aacEncGetLibInfo(lib_info) == AACENC_OK) {
|
if (aacEncGetLibInfo(lib_info) == AACENC_OK) {
|
||||||
for (i = 0; i < FDK_MODULE_LAST; ++i)
|
for (i = 0; i < FDK_MODULE_LAST; ++i)
|
||||||
if (lib_info[i].module_id == FDK_AACENC)
|
if (lib_info[i].module_id == FDK_AACENC)
|
||||||
|
Reference in New Issue
Block a user