From 374ae78b970a9249d047f0958472114b16523e23 Mon Sep 17 00:00:00 2001 From: Marius Gavrilescu Date: Tue, 21 Apr 2020 23:36:41 +0300 Subject: [PATCH] New upstream version 1.0.0 --- ChangeLog | 44 +++++++++++++++++++-- MSVC/fdk-aac.vcxproj | 41 ++++++++++++++------ MSVC/fdk-aac.vcxproj.filters | 74 ++++++++++++++++++++++++++++-------- MSVC/fdkaac.vcxproj | 18 +++++---- Makefile.am | 2 +- configure.ac | 8 +++- src/compat_posix.c | 4 +- src/main.c | 72 +++++++++++++++++------------------ version.h | 2 +- 9 files changed, 184 insertions(+), 81 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4455a7e..51815a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,44 @@ +2016-08-26 nu774 + + * update ChangeLog [HEAD -> master] + + * bump [origin/master] + + * Ticket #23: quit supporting MPEG-2 AOT + +2016-08-25 nu774 + + * fix libfdkaac encoder version check for SBR_RATIO availability + + * Use our SBR signaling implementation on old libfdkaac + +2015-10-10 nu774 + + * improve MSVC project + +2015-09-21 nu774 + + * fix indents + + * update compat layer, mainly for MSVC14 issue + +2015-07-22 nu774 + + * add platformtoolset in vcxproj + + * fix build issue on MSVC14 + +2015-06-12 nu774 + + * remove an unused variable decl + + * remove an unused variable decl + + * m4af: move internal struct m4af_itmf_entry_t from header + 2015-02-14 nu774 - * update ChangeLog [HEAD] + * update ChangeLog * bump version [v0.6.2] @@ -10,9 +48,9 @@ 2014-09-13 nu774 - * update ChangeLog [origin/master] + * update ChangeLog - * bump version + * bump version [v0.6.1] 2014-09-12 nu774 diff --git a/MSVC/fdk-aac.vcxproj b/MSVC/fdk-aac.vcxproj index 2035c14..ca80189 100644 --- a/MSVC/fdk-aac.vcxproj +++ b/MSVC/fdk-aac.vcxproj @@ -1,4 +1,4 @@ - + @@ -24,10 +24,13 @@ fdk-aac - v140_xp - v120_xp - v110_xp - v100 + v141_xp + v140_xp + v120_xp + v110_xp + + + fdk-aac\$(Platform)\$(Configuration) @@ -50,7 +53,7 @@ NotUsing Level3 WIN32;_LIB;%(PreprocessorDefinitions) - ../fdk-aac/libaacenc/include;../fdk-aac/libFDK/include;../fdk-aac/libMpegTPEnc/include;../fdk-aac/libPCMutils/include;../fdk-aac/libSBRenc/include;../fdk-aac/libSYS/include + ../fdk-aac/libaacenc/include;../fdk-aac/libFDK/include;../fdk-aac/libMpegTPEnc/include;../fdk-aac/libPCMutils/include;../fdk-aac/libSACenc/include;../fdk-aac/libSBRenc/include;../fdk-aac/libSYS/include @@ -71,7 +74,6 @@ - @@ -91,6 +93,7 @@ + @@ -109,6 +112,8 @@ + + @@ -122,7 +127,20 @@ - + + + + + + + + + + + + + + @@ -136,19 +154,18 @@ + + - - - + - diff --git a/MSVC/fdk-aac.vcxproj.filters b/MSVC/fdk-aac.vcxproj.filters index 194d0b0..0ebb547 100644 --- a/MSVC/fdk-aac.vcxproj.filters +++ b/MSVC/fdk-aac.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -18,9 +18,6 @@ Source Files - - Source Files - Source Files @@ -171,9 +168,6 @@ Source Files - - Source Files - Source Files @@ -219,22 +213,73 @@ Source Files - + + Source Files + + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + Source Files @@ -245,9 +290,6 @@ Header Files - - Header Files - Header Files diff --git a/MSVC/fdkaac.vcxproj b/MSVC/fdkaac.vcxproj index 0a59d91..11b1cd6 100644 --- a/MSVC/fdkaac.vcxproj +++ b/MSVC/fdkaac.vcxproj @@ -24,10 +24,10 @@ fdkaac - v140_xp - v120_xp - v110_xp - v100 + v141_xp + v140_xp + v120_xp + v110_xp @@ -55,11 +55,13 @@ true - copy ..\fdk-aac\libAACdec\include\aacdecoder_lib.h include\fdk-aac\ -copy ..\fdk-aac\libAACenc\include\aacenc_lib.h include\fdk-aac\ + copy ..\fdk-aac\libAACdec\include\aacdecoder_lib.h include\fdk-aac\ +copy ..\fdk-aac\libAACenc\include\aacenc_lib.h include\fdk-aac\ copy ..\fdk-aac\libSYS\include\FDK_Audio.h include\fdk-aac\ -copy ..\fdk-aac\libSYS\include\genericStds.h include\fdk-aac\ -copy ..\fdk-aac\libSYS\include\machine_type.h include\fdk-aac\ +copy ..\fdk-aac\libSYS\include\genericStds.h include\fdk-aac\ +copy ..\fdk-aac\libSYS\include\machine_type.h include\fdk-aac\ +copy ..\fdk-aac\libSYS\include\syslib_channelMapDescr.h include\fdk-aac\ + diff --git a/Makefile.am b/Makefile.am index 17b74ce..73291aa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ fdkaac_SOURCES = \ dist_man_MANS = man/fdkaac.1 fdkaac_LDADD = \ - @LIBICONV@ -lfdk-aac -lm + @LIBICONV@ @CHARSET_LIB@ -lfdk-aac -lm if FDK_PLATFORM_POSIX fdkaac_SOURCES += \ diff --git a/configure.ac b/configure.ac index 6fbe8c0..40673d0 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ AC_PROG_CC AM_PROG_CC_C_O AC_CHECK_HEADERS([sys/time.h]) -AC_CHECK_HEADERS([localcharset.h langinfo.h endian.h byteswap.h]) +AC_CHECK_HEADERS([libcharset.h langinfo.h endian.h byteswap.h]) AC_CHECK_HEADERS([fdk-aac/aacenc_lib.h], , AC_MSG_ERROR([libfdk-aac is required])) @@ -38,6 +38,12 @@ AC_CHECK_FUNC(getopt_long) AM_CONDITIONAL([FDK_NO_GETOPT_LONG],[test "$ac_cv_func_getopt_long" != "yes"]) AC_SEARCH_LIBS([aacEncOpen],[fdk-aac],[],[],[]) +CHARSET_LIB= +AC_CHECK_LIB([iconv], [locale_charset], + [CHARSET_LIB=-liconv], + [AC_CHECK_LIB([charset], [locale_charset], [CHARSET_LIB=-lcharset])]) +AC_SUBST([CHARSET_LIB]) + AC_CANONICAL_HOST X_PLATFORM=posix diff --git a/src/compat_posix.c b/src/compat_posix.c index f895637..741c87f 100644 --- a/src/compat_posix.c +++ b/src/compat_posix.c @@ -59,8 +59,8 @@ char *aacenc_to_utf8(const char *s) #include #include -#if HAVE_LOCALCHARSET_H -#include +#if HAVE_LIBCHARSET_H +#include #elif HAVE_LANGINFO_H #include static const char *locale_charset(void) diff --git a/src/main.c b/src/main.c index 1eb9a0e..4905130 100644 --- a/src/main.c +++ b/src/main.c @@ -289,7 +289,7 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params) params->afterburner = 1; aacenc_getmainargs(&argc, &argv); - while ((ch = getopt_long(argc, argv, "hp:b:m:w:a:Ls:f:CP:G:Io:SR", + while ((ch = getopt_long(argc, argv, "hp:b:m:w:a:L:s:f:CP:G:Io:SR", long_options, 0)) != EOF) { switch (ch) { case 'h': @@ -503,6 +503,11 @@ int write_sample(FILE *ofp, m4af_ctx_t *m4af, aacenc_frame_t *frame) return 0; } +static int do_smart_padding(int profile) +{ + return profile == 2 || profile == 5 || profile == 29; +} + static int encode(aacenc_param_ex_t *params, pcm_reader_t *reader, HANDLE_AACENCODER encoder, uint32_t frame_length, @@ -517,15 +522,12 @@ int encode(aacenc_param_ex_t *params, pcm_reader_t *reader, int frames_written = 0, encoded = 0; aacenc_progress_t progress = { 0 }; const pcm_sample_description_t *fmt = pcm_get_format(reader); + const int is_padding = do_smart_padding(params->profile); ibuf = malloc(frame_length * fmt->bytes_per_frame); aacenc_progress_init(&progress, pcm_get_length(reader), fmt->sample_rate); for (;;) { - /* - * Since we delay the write, we cannot just exit loop when interrupted. - * Instead, we regard it as EOF. - */ if (g_interrupted) nread = 0; if (nread > 0) { @@ -548,7 +550,7 @@ int encode(aacenc_param_ex_t *params, pcm_reader_t *reader, remaining -= consumed; ip += consumed * fmt->channels_per_frame; - flip ^= 1; + if (is_padding) { /* * As we pad 1 frame at beginning and ending by our extrapolator, * we want to drop them. @@ -557,25 +559,26 @@ int encode(aacenc_param_ex_t *params, pcm_reader_t *reader, * Since sbr_header is included in the first frame (in case of * SBR), we cannot discard first frame. So we pick second instead. */ - ++encoded; - if (encoded == 1 || encoded == 3) - continue; - + flip ^= 1; + ++encoded; + if (encoded == 1 || encoded == 3) + continue; + } if (write_sample(params->output_fp, m4af, &obuf[flip]) < 0) goto END; ++frames_written; } while (remaining > 0); - /* - * When interrupted, we haven't pulled out last extrapolated frames - * from the reader. Therefore, we have to write the final outcome. - */ - if (g_interrupted) { - if (write_sample(params->output_fp, m4af, &obp[flip^1]) < 0) - goto END; - ++frames_written; - } } DONE: + /* + * When interrupted, we haven't pulled out last extrapolated frames + * from the reader. Therefore, we have to write the final outcome. + */ + if (g_interrupted) { + if (write_sample(params->output_fp, m4af, &obp[flip^1]) < 0) + goto END; + ++frames_written; + } if (!params->silent) aacenc_progress_finish(&progress, pcm_get_position(reader)); rc = frames_written; @@ -755,8 +758,10 @@ pcm_reader_t *open_input(aacenc_param_ex_t *params) reader = pcm_open_native_converter(reader); if (reader && PCM_IS_FLOAT(pcm_get_format(reader))) reader = limiter_open(reader); - if (reader && (reader = pcm_open_sint16_converter(reader)) != 0) - reader = extrapolater_open(reader); + if (reader && (reader = pcm_open_sint16_converter(reader)) != 0) { + if (do_smart_padding(params->profile)) + reader = extrapolater_open(reader); + } return reader; FAIL: return 0; @@ -846,29 +851,22 @@ int main(int argc, char **argv) m4af_set_priming_mode(m4af, params.gapless_mode + 1); m4af_begin_write(m4af); } - if (scale_shift && (aacinfo.encoderDelay & 1)) { - /* - * Since odd delay cannot be exactly expressed in downsampled scale, - * we push one zero frame to the encoder here, to make delay even - */ - int16_t zero[8] = { 0 }; - aacenc_frame_t frame = { 0 }; - aac_encode_frame(encoder, sample_format, zero, 1, &frame); - free(frame.data); - } frame_count = encode(¶ms, reader, encoder, aacinfo.frameLength, m4af); if (frame_count < 0) goto END; if (m4af) { - uint32_t delay = aacinfo.encoderDelay; uint32_t padding; +#if AACENCODER_LIB_VL0 < 4 + uint32_t delay = aacinfo.encoderDelay; + if (sbr_mode && params.profile != AOT_ER_AAC_ELD + && !params.include_sbr_delay) + delay -= 481 << scale_shift; +#else + uint32_t delay = params.include_sbr_delay ? aacinfo.nDelay + : aacinfo.nDelayCore; +#endif int64_t frames_read = pcm_get_position(reader); - if (sbr_mode && params.profile != AOT_ER_AAC_ELD && - !params.include_sbr_delay) - delay -= 481 << scale_shift; - if (scale_shift && (delay & 1)) - ++delay; padding = frame_count * aacinfo.frameLength - frames_read - delay; m4af_set_priming(m4af, 0, delay >> scale_shift, padding >> scale_shift); if (finalize_m4a(m4af, ¶ms, encoder) < 0) diff --git a/version.h b/version.h index 10bb7c4..52527c6 100644 --- a/version.h +++ b/version.h @@ -1,4 +1,4 @@ #ifndef VERSION_H #define VERSION_H -const char *fdkaac_version = "0.6.3"; +const char *fdkaac_version = "1.0.0"; #endif -- 2.39.2