mirror of https://github.com/mstorsjo/fdk-aac.git
Martin Storsjo
parent
1ff40b51f9
commit
964d6a3d10
|
|
@ -0,0 +1,30 @@
|
|||
*.o
|
||||
*.lo
|
||||
*.la
|
||||
*~
|
||||
.deps
|
||||
.libs
|
||||
.dirstamp
|
||||
Makefile
|
||||
Makefile.in
|
||||
aclocal.m4
|
||||
autom4te.cache
|
||||
configure
|
||||
fdk-aac.pc
|
||||
config.guess
|
||||
config.log
|
||||
config.status
|
||||
config.sub
|
||||
depcomp
|
||||
install-sh
|
||||
libtool
|
||||
ltmain.sh
|
||||
m4/libtool.m4
|
||||
m4/ltoptions.m4
|
||||
m4/ltsugar.m4
|
||||
m4/ltversion.m4
|
||||
m4/lt~obsolete.m4
|
||||
missing
|
||||
stamp-h1
|
||||
aac-enc
|
||||
compile
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
2.0.3
|
||||
- Minor upstream updates
|
||||
- Fixed one case of a failed assert in SBR encoding
|
||||
- Added build support for s390x
|
||||
|
||||
2.0.2
|
||||
- Minor upstream updates
|
||||
- Lots of upstream and local fuzzing fixes
|
||||
- Added CMake project files
|
||||
- Removed the MSVC specific makefile
|
||||
|
||||
2.0.1
|
||||
- Minor release with a number of crash/fuzz fixes, primarily for the decoder
|
||||
|
||||
2.0.0
|
||||
- Major update in the upstream source base, with support for new
|
||||
profiles and features, and numerous crash/fuzz fixes. The new
|
||||
upstream version is referred to as FDKv2, thus skipping the
|
||||
major version 1 and syncing the fdk-aac major version number to 2.
|
||||
|
||||
0.1.6
|
||||
- Lots of minor assorted crash/fuzz fixes, mostly for the decoder but
|
||||
also some for the encoder
|
||||
|
||||
0.1.5
|
||||
- Updated upstream sources
|
||||
- Fixed building with GCC 3.3 and 3.4
|
||||
- Fixed building with GCC 6
|
||||
- AArch64 optimizations
|
||||
- Makefiles for building with MSVC
|
||||
- Support building the code in C++11 mode
|
||||
|
||||
0.1.4
|
||||
- Updated upstream sources, with minor changes to the decoder API
|
||||
breaking the ABI. (Calling code using AUDIO_CHANNEL_TYPE may need to
|
||||
be updated. A new option AAC_PCM_LIMITER_ENABLE has been added, enabled
|
||||
by default, which incurs extra decoding delay.)
|
||||
- PowerPC optimizations, fixes for building on AIX
|
||||
- Support for reading streamed wav files in the encoder example
|
||||
- Fix VBR encoding of sample rates over 64 kHz
|
||||
|
||||
0.1.3
|
||||
- Updated upstream sources, with a number of crash fixes and new features
|
||||
(including support for encoding 7.1)
|
||||
|
||||
0.1.2
|
||||
- Fix a few more crashes
|
||||
- Include dependency libs (such as -lm) in the pkg-config file
|
||||
|
||||
0.1.1
|
||||
- Updated to a new upstream version from Android 4.2, fixing a lot of crashes
|
||||
- Cleanup of autotools usage
|
||||
- Make sure the shared library links to libm if necessary
|
||||
- Performance improvements on x86
|
||||
- Added support for WG4/DVD audio channel mappings
|
||||
- Minimized the differences to upstream
|
||||
- Added an example encoder tool
|
||||
|
||||
0.1.0
|
||||
- Initial release of fdk-aac
|
||||
- autotools based build system
|
||||
- Enable setting VBR bitrate modes
|
||||
|
|
@ -0,0 +1,294 @@
|
|||
ACLOCAL_AMFLAGS = -I m4
|
||||
AUTOMAKE_OPTIONS = subdir-objects
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/libAACdec/include \
|
||||
-I$(top_srcdir)/libAACenc/include \
|
||||
-I$(top_srcdir)/libArithCoding/include \
|
||||
-I$(top_srcdir)/libDRCdec/include \
|
||||
-I$(top_srcdir)/libSACdec/include \
|
||||
-I$(top_srcdir)/libSACenc/include \
|
||||
-I$(top_srcdir)/libSBRdec/include \
|
||||
-I$(top_srcdir)/libSBRenc/include \
|
||||
-I$(top_srcdir)/libMpegTPDec/include \
|
||||
-I$(top_srcdir)/libMpegTPEnc/include \
|
||||
-I$(top_srcdir)/libSYS/include \
|
||||
-I$(top_srcdir)/libFDK/include \
|
||||
-I$(top_srcdir)/libPCMutils/include
|
||||
|
||||
AM_CXXFLAGS = -fno-exceptions -fno-rtti
|
||||
libfdk_aac_la_LINK = $(LINK) $(libfdk_aac_la_LDFLAGS)
|
||||
# Mention a dummy pure C file to trigger generation of the $(LINK) variable
|
||||
nodist_EXTRA_libfdk_aac_la_SOURCES = dummy.c
|
||||
|
||||
fdk_aacincludedir = $(includedir)/fdk-aac
|
||||
fdk_aacinclude_HEADERS = \
|
||||
$(top_srcdir)/libSYS/include/machine_type.h \
|
||||
$(top_srcdir)/libSYS/include/genericStds.h \
|
||||
$(top_srcdir)/libSYS/include/FDK_audio.h \
|
||||
$(top_srcdir)/libSYS/include/syslib_channelMapDescr.h \
|
||||
$(top_srcdir)/libAACenc/include/aacenc_lib.h \
|
||||
$(top_srcdir)/libAACdec/include/aacdecoder_lib.h
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = fdk-aac.pc
|
||||
|
||||
lib_LTLIBRARIES = libfdk-aac.la
|
||||
|
||||
libfdk_aac_la_LDFLAGS = -version-info @FDK_AAC_VERSION@ -no-undefined \
|
||||
-export-symbols $(top_srcdir)/fdk-aac.sym
|
||||
|
||||
if EXAMPLE
|
||||
bin_PROGRAMS = aac-enc$(EXEEXT)
|
||||
|
||||
aac_enc_LDADD = libfdk-aac.la
|
||||
aac_enc_SOURCES = aac-enc.c wavreader.c
|
||||
|
||||
noinst_HEADERS = wavreader.h
|
||||
endif
|
||||
|
||||
AACDEC_SRC = \
|
||||
libAACdec/src/FDK_delay.cpp \
|
||||
libAACdec/src/aac_ram.cpp \
|
||||
libAACdec/src/aac_rom.cpp \
|
||||
libAACdec/src/aacdec_drc.cpp \
|
||||
libAACdec/src/aacdec_hcr.cpp \
|
||||
libAACdec/src/aacdec_hcr_bit.cpp \
|
||||
libAACdec/src/aacdec_hcrs.cpp \
|
||||
libAACdec/src/aacdec_pns.cpp \
|
||||
libAACdec/src/aacdec_tns.cpp \
|
||||
libAACdec/src/aacdecoder.cpp \
|
||||
libAACdec/src/aacdecoder_lib.cpp \
|
||||
libAACdec/src/block.cpp \
|
||||
libAACdec/src/channel.cpp \
|
||||
libAACdec/src/channelinfo.cpp \
|
||||
libAACdec/src/conceal.cpp \
|
||||
libAACdec/src/ldfiltbank.cpp \
|
||||
libAACdec/src/pulsedata.cpp \
|
||||
libAACdec/src/rvlc.cpp \
|
||||
libAACdec/src/rvlcbit.cpp \
|
||||
libAACdec/src/rvlcconceal.cpp \
|
||||
libAACdec/src/stereo.cpp \
|
||||
libAACdec/src/usacdec_ace_d4t64.cpp \
|
||||
libAACdec/src/usacdec_ace_ltp.cpp \
|
||||
libAACdec/src/usacdec_acelp.cpp \
|
||||
libAACdec/src/usacdec_fac.cpp \
|
||||
libAACdec/src/usacdec_lpc.cpp \
|
||||
libAACdec/src/usacdec_lpd.cpp \
|
||||
libAACdec/src/usacdec_rom.cpp
|
||||
|
||||
AACENC_SRC = \
|
||||
libAACenc/src/aacEnc_ram.cpp \
|
||||
libAACenc/src/aacEnc_rom.cpp \
|
||||
libAACenc/src/aacenc.cpp \
|
||||
libAACenc/src/aacenc_lib.cpp \
|
||||
libAACenc/src/aacenc_pns.cpp \
|
||||
libAACenc/src/aacenc_tns.cpp \
|
||||
libAACenc/src/adj_thr.cpp \
|
||||
libAACenc/src/band_nrg.cpp \
|
||||
libAACenc/src/bandwidth.cpp \
|
||||
libAACenc/src/bit_cnt.cpp \
|
||||
libAACenc/src/bitenc.cpp \
|
||||
libAACenc/src/block_switch.cpp \
|
||||
libAACenc/src/channel_map.cpp \
|
||||
libAACenc/src/chaosmeasure.cpp \
|
||||
libAACenc/src/dyn_bits.cpp \
|
||||
libAACenc/src/grp_data.cpp \
|
||||
libAACenc/src/intensity.cpp \
|
||||
libAACenc/src/line_pe.cpp \
|
||||
libAACenc/src/metadata_compressor.cpp \
|
||||
libAACenc/src/metadata_main.cpp \
|
||||
libAACenc/src/mps_main.cpp \
|
||||
libAACenc/src/ms_stereo.cpp \
|
||||
libAACenc/src/noisedet.cpp \
|
||||
libAACenc/src/pnsparam.cpp \
|
||||
libAACenc/src/pre_echo_control.cpp \
|
||||
libAACenc/src/psy_configuration.cpp \
|
||||
libAACenc/src/psy_main.cpp \
|
||||
libAACenc/src/qc_main.cpp \
|
||||
libAACenc/src/quantize.cpp \
|
||||
libAACenc/src/sf_estim.cpp \
|
||||
libAACenc/src/spreading.cpp \
|
||||
libAACenc/src/tonality.cpp \
|
||||
libAACenc/src/transform.cpp
|
||||
|
||||
ARITHCODING_SRC = \
|
||||
libArithCoding/src/ac_arith_coder.cpp
|
||||
|
||||
DRCDEC_SRC = \
|
||||
libDRCdec/src/FDK_drcDecLib.cpp \
|
||||
libDRCdec/src/drcDec_gainDecoder.cpp \
|
||||
libDRCdec/src/drcDec_reader.cpp \
|
||||
libDRCdec/src/drcDec_rom.cpp \
|
||||
libDRCdec/src/drcDec_selectionProcess.cpp \
|
||||
libDRCdec/src/drcDec_tools.cpp \
|
||||
libDRCdec/src/drcGainDec_init.cpp \
|
||||
libDRCdec/src/drcGainDec_preprocess.cpp \
|
||||
libDRCdec/src/drcGainDec_process.cpp
|
||||
|
||||
FDK_SRC = \
|
||||
libFDK/src/FDK_bitbuffer.cpp \
|
||||
libFDK/src/FDK_core.cpp \
|
||||
libFDK/src/FDK_crc.cpp \
|
||||
libFDK/src/FDK_decorrelate.cpp \
|
||||
libFDK/src/FDK_hybrid.cpp \
|
||||
libFDK/src/FDK_lpc.cpp \
|
||||
libFDK/src/FDK_matrixCalloc.cpp \
|
||||
libFDK/src/FDK_qmf_domain.cpp \
|
||||
libFDK/src/FDK_tools_rom.cpp \
|
||||
libFDK/src/FDK_trigFcts.cpp \
|
||||
libFDK/src/autocorr2nd.cpp \
|
||||
libFDK/src/dct.cpp \
|
||||
libFDK/src/fft.cpp \
|
||||
libFDK/src/fft_rad2.cpp \
|
||||
libFDK/src/fixpoint_math.cpp \
|
||||
libFDK/src/huff_nodes.cpp \
|
||||
libFDK/src/mdct.cpp \
|
||||
libFDK/src/nlc_dec.cpp \
|
||||
libFDK/src/qmf.cpp \
|
||||
libFDK/src/scale.cpp
|
||||
|
||||
MPEGTPDEC_SRC = \
|
||||
libMpegTPDec/src/tpdec_adif.cpp \
|
||||
libMpegTPDec/src/tpdec_adts.cpp \
|
||||
libMpegTPDec/src/tpdec_asc.cpp \
|
||||
libMpegTPDec/src/tpdec_drm.cpp \
|
||||
libMpegTPDec/src/tpdec_latm.cpp \
|
||||
libMpegTPDec/src/tpdec_lib.cpp
|
||||
|
||||
MPEGTPENC_SRC = \
|
||||
libMpegTPEnc/src/tpenc_adif.cpp \
|
||||
libMpegTPEnc/src/tpenc_adts.cpp \
|
||||
libMpegTPEnc/src/tpenc_asc.cpp \
|
||||
libMpegTPEnc/src/tpenc_latm.cpp \
|
||||
libMpegTPEnc/src/tpenc_lib.cpp
|
||||
|
||||
PCMUTILS_SRC = \
|
||||
libPCMutils/src/limiter.cpp \
|
||||
libPCMutils/src/pcm_utils.cpp \
|
||||
libPCMutils/src/pcmdmx_lib.cpp
|
||||
|
||||
SACDEC_SRC = \
|
||||
libSACdec/src/sac_bitdec.cpp \
|
||||
libSACdec/src/sac_calcM1andM2.cpp \
|
||||
libSACdec/src/sac_dec.cpp \
|
||||
libSACdec/src/sac_dec_conceal.cpp \
|
||||
libSACdec/src/sac_dec_lib.cpp \
|
||||
libSACdec/src/sac_process.cpp \
|
||||
libSACdec/src/sac_qmf.cpp \
|
||||
libSACdec/src/sac_reshapeBBEnv.cpp \
|
||||
libSACdec/src/sac_rom.cpp \
|
||||
libSACdec/src/sac_smoothing.cpp \
|
||||
libSACdec/src/sac_stp.cpp \
|
||||
libSACdec/src/sac_tsd.cpp
|
||||
|
||||
SACENC_SRC = \
|
||||
libSACenc/src/sacenc_bitstream.cpp \
|
||||
libSACenc/src/sacenc_delay.cpp \
|
||||
libSACenc/src/sacenc_dmx_tdom_enh.cpp \
|
||||
libSACenc/src/sacenc_filter.cpp \
|
||||
libSACenc/src/sacenc_framewindowing.cpp \
|
||||
libSACenc/src/sacenc_huff_tab.cpp \
|
||||
libSACenc/src/sacenc_lib.cpp \
|
||||
libSACenc/src/sacenc_nlc_enc.cpp \
|
||||
libSACenc/src/sacenc_onsetdetect.cpp \
|
||||
libSACenc/src/sacenc_paramextract.cpp \
|
||||
libSACenc/src/sacenc_staticgain.cpp \
|
||||
libSACenc/src/sacenc_tree.cpp \
|
||||
libSACenc/src/sacenc_vectorfunctions.cpp
|
||||
|
||||
SBRDEC_SRC = \
|
||||
libSBRdec/src/HFgen_preFlat.cpp \
|
||||
libSBRdec/src/env_calc.cpp \
|
||||
libSBRdec/src/env_dec.cpp \
|
||||
libSBRdec/src/env_extr.cpp \
|
||||
libSBRdec/src/hbe.cpp \
|
||||
libSBRdec/src/huff_dec.cpp \
|
||||
libSBRdec/src/lpp_tran.cpp \
|
||||
libSBRdec/src/psbitdec.cpp \
|
||||
libSBRdec/src/psdec.cpp \
|
||||
libSBRdec/src/psdec_drm.cpp \
|
||||
libSBRdec/src/psdecrom_drm.cpp \
|
||||
libSBRdec/src/pvc_dec.cpp \
|
||||
libSBRdec/src/sbr_deb.cpp \
|
||||
libSBRdec/src/sbr_dec.cpp \
|
||||
libSBRdec/src/sbr_ram.cpp \
|
||||
libSBRdec/src/sbr_rom.cpp \
|
||||
libSBRdec/src/sbrdec_drc.cpp \
|
||||
libSBRdec/src/sbrdec_freq_sca.cpp \
|
||||
libSBRdec/src/sbrdecoder.cpp
|
||||
|
||||
SBRENC_SRC = \
|
||||
libSBRenc/src/bit_sbr.cpp \
|
||||
libSBRenc/src/code_env.cpp \
|
||||
libSBRenc/src/env_bit.cpp \
|
||||
libSBRenc/src/env_est.cpp \
|
||||
libSBRenc/src/fram_gen.cpp \
|
||||
libSBRenc/src/invf_est.cpp \
|
||||
libSBRenc/src/mh_det.cpp \
|
||||
libSBRenc/src/nf_est.cpp \
|
||||
libSBRenc/src/ps_bitenc.cpp \
|
||||
libSBRenc/src/ps_encode.cpp \
|
||||
libSBRenc/src/ps_main.cpp \
|
||||
libSBRenc/src/resampler.cpp \
|
||||
libSBRenc/src/sbr_encoder.cpp \
|
||||
libSBRenc/src/sbr_misc.cpp \
|
||||
libSBRenc/src/sbrenc_freq_sca.cpp \
|
||||
libSBRenc/src/sbrenc_ram.cpp \
|
||||
libSBRenc/src/sbrenc_rom.cpp \
|
||||
libSBRenc/src/ton_corr.cpp \
|
||||
libSBRenc/src/tran_det.cpp
|
||||
|
||||
SYS_SRC = \
|
||||
libSYS/src/genericStds.cpp \
|
||||
libSYS/src/syslib_channelMapDescr.cpp
|
||||
|
||||
libfdk_aac_la_SOURCES = \
|
||||
$(AACDEC_SRC) $(AACENC_SRC) \
|
||||
$(ARITHCODING_SRC) \
|
||||
$(DRCDEC_SRC) \
|
||||
$(MPEGTPDEC_SRC) $(MPEGTPENC_SRC) \
|
||||
$(SACDEC_SRC) $(SACENC_SRC) \
|
||||
$(SBRDEC_SRC) $(SBRENC_SRC) \
|
||||
$(PCMUTILS_SRC) $(FDK_SRC) $(SYS_SRC)
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(top_srcdir)/.clang-format \
|
||||
$(top_srcdir)/autogen.sh \
|
||||
$(top_srcdir)/MODULE_LICENSE_FRAUNHOFER \
|
||||
$(top_srcdir)/NOTICE \
|
||||
$(top_srcdir)/OWNERS \
|
||||
$(top_srcdir)/Android.bp \
|
||||
$(top_srcdir)/fdk-aac.sym \
|
||||
$(top_srcdir)/documentation/*.pdf \
|
||||
$(top_srcdir)/fuzzer/* \
|
||||
$(top_srcdir)/libAACdec/src/*.h \
|
||||
$(top_srcdir)/libAACdec/src/arm/*.cpp \
|
||||
$(top_srcdir)/libAACenc/src/*.h \
|
||||
$(top_srcdir)/libArithCoding/include/*.h \
|
||||
$(top_srcdir)/libDRCdec/include/*.h \
|
||||
$(top_srcdir)/libDRCdec/src/*.h \
|
||||
$(top_srcdir)/libSACdec/include/*.h \
|
||||
$(top_srcdir)/libSACdec/src/*.h \
|
||||
$(top_srcdir)/libSACenc/include/*.h \
|
||||
$(top_srcdir)/libSACenc/src/*.h \
|
||||
$(top_srcdir)/libSBRenc/src/*.h \
|
||||
$(top_srcdir)/libSBRenc/include/*.h \
|
||||
$(top_srcdir)/libSBRdec/src/*.h \
|
||||
$(top_srcdir)/libSBRdec/include/*.h \
|
||||
$(top_srcdir)/libSYS/include/*.h \
|
||||
$(top_srcdir)/libPCMutils/include/*.h \
|
||||
$(top_srcdir)/libPCMutils/src/*.h \
|
||||
$(top_srcdir)/libMpegTPEnc/include/*.h \
|
||||
$(top_srcdir)/libMpegTPEnc/src/*.h \
|
||||
$(top_srcdir)/libMpegTPDec/include/*.h \
|
||||
$(top_srcdir)/libMpegTPDec/src/*.h \
|
||||
$(top_srcdir)/libFDK/include/*.h \
|
||||
$(top_srcdir)/libFDK/include/arm/*.h \
|
||||
$(top_srcdir)/libFDK/include/mips/*.h \
|
||||
$(top_srcdir)/libFDK/include/x86/*.h \
|
||||
$(top_srcdir)/libFDK/src/arm/*.cpp \
|
||||
$(top_srcdir)/libFDK/src/mips/*.cpp \
|
||||
$(top_srcdir)/METADATA \
|
||||
$(top_srcdir)/PREUPLOAD.cfg
|
||||
|
||||
|
|
@ -0,0 +1,231 @@
|
|||
/* ------------------------------------------------------------------
|
||||
* Copyright (C) 2011 Martin Storsjo
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
|
||||
* express or implied.
|
||||
* See the License for the specific language governing permissions
|
||||
* and limitations under the License.
|
||||
* -------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdint.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include "libAACenc/include/aacenc_lib.h"
|
||||
#include "wavreader.h"
|
||||
|
||||
void usage(const char* name) {
|
||||
fprintf(stderr, "%s [-r bitrate] [-t aot] [-a afterburner] [-s sbr] [-v vbr] in.wav out.aac\n", name);
|
||||
fprintf(stderr, "Supported AOTs:\n");
|
||||
fprintf(stderr, "\t2\tAAC-LC\n");
|
||||
fprintf(stderr, "\t5\tHE-AAC\n");
|
||||
fprintf(stderr, "\t29\tHE-AAC v2\n");
|
||||
fprintf(stderr, "\t23\tAAC-LD\n");
|
||||
fprintf(stderr, "\t39\tAAC-ELD\n");
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
int bitrate = 64000;
|
||||
int ch;
|
||||
const char *infile, *outfile;
|
||||
FILE *out;
|
||||
void *wav;
|
||||
int format, sample_rate, channels, bits_per_sample;
|
||||
int input_size;
|
||||
uint8_t* input_buf;
|
||||
int16_t* convert_buf;
|
||||
int aot = 2;
|
||||
int afterburner = 1;
|
||||
int eld_sbr = 0;
|
||||
int vbr = 0;
|
||||
HANDLE_AACENCODER handle;
|
||||
CHANNEL_MODE mode;
|
||||
AACENC_InfoStruct info = { 0 };
|
||||
while ((ch = getopt(argc, argv, "r:t:a:s:v:")) != -1) {
|
||||
switch (ch) {
|
||||
case 'r':
|
||||
bitrate = atoi(optarg);
|
||||
break;
|
||||
case 't':
|
||||
aot = atoi(optarg);
|
||||
break;
|
||||
case 'a':
|
||||
afterburner = atoi(optarg);
|
||||
break;
|
||||
case 's':
|
||||
eld_sbr = atoi(optarg);
|
||||
break;
|
||||
case 'v':
|
||||
vbr = atoi(optarg);
|
||||
break;
|
||||
case '?':
|
||||
default:
|
||||
usage(argv[0]);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
if (argc - optind < 2) {
|
||||
usage(argv[0]);
|
||||
return 1;
|
||||
}
|
||||
infile = argv[optind];
|
||||
outfile = argv[optind + 1];
|
||||
|
||||
wav = wav_read_open(infile);
|
||||
if (!wav) {
|
||||
fprintf(stderr, "Unable to open wav file %s\n", infile);
|
||||
return 1;
|
||||
}
|
||||
if (!wav_get_header(wav, &format, &channels, &sample_rate, &bits_per_sample, NULL)) {
|
||||
fprintf(stderr, "Bad wav file %s\n", infile);
|
||||
return 1;
|
||||
}
|
||||
if (format != 1) {
|
||||
fprintf(stderr, "Unsupported WAV format %d\n", format);
|
||||
return 1;
|
||||
}
|
||||
if (bits_per_sample != 16) {
|
||||
fprintf(stderr, "Unsupported WAV sample depth %d\n", bits_per_sample);
|
||||
return 1;
|
||||
}
|
||||
switch (channels) {
|
||||
case 1: mode = MODE_1; break;
|
||||
case 2: mode = MODE_2; break;
|
||||
case 3: mode = MODE_1_2; break;
|
||||
case 4: mode = MODE_1_2_1; break;
|
||||
case 5: mode = MODE_1_2_2; break;
|
||||
case 6: mode = MODE_1_2_2_1; break;
|
||||
default:
|
||||
fprintf(stderr, "Unsupported WAV channels %d\n", channels);
|
||||
return 1;
|
||||
}
|
||||
if (aacEncOpen(&handle, 0, channels) != AACENC_OK) {
|
||||
fprintf(stderr, "Unable to open encoder\n");
|
||||
return 1;
|
||||
}
|
||||
if (aacEncoder_SetParam(handle, AACENC_AOT, aot) != AACENC_OK) {
|
||||
fprintf(stderr, "Unable to set the AOT\n");
|
||||
return 1;
|
||||
}
|
||||
if (aot == 39 && eld_sbr) {
|
||||
if (aacEncoder_SetParam(handle, AACENC_SBR_MODE, 1) != AACENC_OK) {
|
||||
fprintf(stderr, "Unable to set SBR mode for ELD\n");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
if (aacEncoder_SetParam(handle, AACENC_SAMPLERATE, sample_rate) != AACENC_OK) {
|
||||
fprintf(stderr, "Unable to set the sample rate\n");
|
||||
return 1;
|
||||
}
|
||||
if (aacEncoder_SetParam(handle, AACENC_CHANNELMODE, mode) != AACENC_OK) {
|
||||
fprintf(stderr, "Unable to set the channel mode\n");
|
||||
return 1;
|
||||
}
|
||||
if (aacEncoder_SetParam(handle, AACENC_CHANNELORDER, 1) != AACENC_OK) {
|
||||
fprintf(stderr, "Unable to set the wav channel order\n");
|
||||
return 1;
|
||||
}
|
||||
if (vbr) {
|
||||
if (aacEncoder_SetParam(handle, AACENC_BITRATEMODE, vbr) != AACENC_OK) {
|
||||
fprintf(stderr, "Unable to set the VBR bitrate mode\n");
|
||||
return 1;
|
||||
}
|
||||
} else {
|
||||
if (aacEncoder_SetParam(handle, AACENC_BITRATE, bitrate) != AACENC_OK) {
|
||||
fprintf(stderr, "Unable to set the bitrate\n");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
if (aacEncoder_SetParam(handle, AACENC_TRANSMUX, TT_MP4_ADTS) != AACENC_OK) {
|
||||
fprintf(stderr, "Unable to set the ADTS transmux\n");
|
||||
return 1;
|
||||
}
|
||||
if (aacEncoder_SetParam(handle, AACENC_AFTERBURNER, afterburner) != AACENC_OK) {
|
||||
fprintf(stderr, "Unable to set the afterburner mode\n");
|
||||
return 1;
|
||||
}
|
||||
if (aacEncEncode(handle, NULL, NULL, NULL, NULL) != AACENC_OK) {
|
||||
fprintf(stderr, "Unable to initialize the encoder\n");
|
||||
return 1;
|
||||
}
|
||||
if (aacEncInfo(handle, &info) != AACENC_OK) {
|
||||
fprintf(stderr, "Unable to get the encoder info\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
out = fopen(outfile, "wb");
|
||||
if (!out) {
|
||||
perror(outfile);
|
||||
return 1;
|
||||
}
|
||||
|
||||
input_size = channels*2*info.frameLength;
|
||||
input_buf = (uint8_t*) malloc(input_size);
|
||||
convert_buf = (int16_t*) malloc(input_size);
|
||||
|
||||
while (1) {
|
||||
AACENC_BufDesc in_buf = { 0 }, out_buf = { 0 };
|
||||
AACENC_InArgs in_args = { 0 };
|
||||
AACENC_OutArgs out_args = { 0 };
|
||||
int in_identifier = IN_AUDIO_DATA;
|
||||
int in_size, in_elem_size;
|
||||
int out_identifier = OUT_BITSTREAM_DATA;
|
||||
int out_size, out_elem_size;
|
||||
int read, i;
|
||||
void *in_ptr, *out_ptr;
|
||||
uint8_t outbuf[20480];
|
||||
AACENC_ERROR err;
|
||||
|
||||
read = wav_read_data(wav, input_buf, input_size);
|
||||
for (i = 0; i < read/2; i++) {
|
||||
const uint8_t* in = &input_buf[2*i];
|
||||
convert_buf[i] = in[0] | (in[1] << 8);
|
||||
}
|
||||
in_ptr = convert_buf;
|
||||
in_size = read;
|
||||
in_elem_size = 2;
|
||||
|
||||
in_args.numInSamples = read <= 0 ? -1 : read/2;
|
||||
in_buf.numBufs = 1;
|
||||
in_buf.bufs = &in_ptr;
|
||||
in_buf.bufferIdentifiers = &in_identifier;
|
||||
in_buf.bufSizes = &in_size;
|
||||
in_buf.bufElSizes = &in_elem_size;
|
||||
|
||||
out_ptr = outbuf;
|
||||
out_size = sizeof(outbuf);
|
||||
out_elem_size = 1;
|
||||
out_buf.numBufs = 1;
|
||||
out_buf.bufs = &out_ptr;
|
||||
out_buf.bufferIdentifiers = &out_identifier;
|
||||
out_buf.bufSizes = &out_size;
|
||||
out_buf.bufElSizes = &out_elem_size;
|
||||
|
||||
if ((err = aacEncEncode(handle, &in_buf, &out_buf, &in_args, &out_args)) != AACENC_OK) {
|
||||
if (err == AACENC_ENCODE_EOF)
|
||||
break;
|
||||
fprintf(stderr, "Encoding failed\n");
|
||||
return 1;
|
||||
}
|
||||
if (out_args.numOutBytes == 0)
|
||||
continue;
|
||||
fwrite(outbuf, 1, out_args.numOutBytes, out);
|
||||
}
|
||||
free(input_buf);
|
||||
free(convert_buf);
|
||||
fclose(out);
|
||||
wav_read_close(wav);
|
||||
aacEncClose(&handle);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
#!/bin/sh
|
||||
autoreconf -fiv
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
dnl -*- Autoconf -*-
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_INIT([fdk-aac], [2.0.3], [http://sourceforge.net/projects/opencore-amr/])
|
||||
AC_CONFIG_AUX_DIR(.)
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AM_INIT_AUTOMAKE([tar-ustar foreign])
|
||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||
|
||||
dnl Various options for configure
|
||||
AC_ARG_ENABLE([example],
|
||||
[AS_HELP_STRING([--enable-example],
|
||||
[enable example encoding program (default is no)])],
|
||||
[example=$enableval], [example=no])
|
||||
|
||||
dnl Automake conditionals to set
|
||||
AM_CONDITIONAL(EXAMPLE, test x$example = xyes)
|
||||
|
||||
dnl Checks for programs.
|
||||
AC_PROG_CC
|
||||
AC_PROG_CXX
|
||||
LT_INIT
|
||||
|
||||
AC_SEARCH_LIBS([sin], [m])
|
||||
|
||||
dnl soname version to use
|
||||
dnl goes by ‘current[:revision[:age]]’ with the soname ending up as
|
||||
dnl current.age.revision
|
||||
FDK_AAC_VERSION=2:3:0
|
||||
|
||||
AS_IF([test x$enable_shared = xyes], [LIBS_PRIVATE=$LIBS], [LIBS_PUBLIC=$LIBS])
|
||||
AC_SUBST(FDK_AAC_VERSION)
|
||||
AC_SUBST(LIBS_PUBLIC)
|
||||
AC_SUBST(LIBS_PRIVATE)
|
||||
|
||||
AC_CONFIG_FILES([Makefile
|
||||
fdk-aac.pc])
|
||||
AC_OUTPUT
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
|
||||
Name: Fraunhofer FDK AAC Codec Library
|
||||
Description: AAC codec library
|
||||
Version: @PACKAGE_VERSION@
|
||||
Libs: -L${libdir} -lfdk-aac @LIBS_PUBLIC@
|
||||
Libs.private: @LIBS_PRIVATE@
|
||||
Cflags: -I${includedir}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
aacDecoder_AncDataGet
|
||||
aacDecoder_AncDataInit
|
||||
aacDecoder_Close
|
||||
aacDecoder_ConfigRaw
|
||||
aacDecoder_DecodeFrame
|
||||
aacDecoder_Fill
|
||||
aacDecoder_GetFreeBytes
|
||||
aacDecoder_GetLibInfo
|
||||
aacDecoder_GetStreamInfo
|
||||
aacDecoder_Open
|
||||
aacDecoder_SetParam
|
||||
aacEncClose
|
||||
aacEncEncode
|
||||
aacEncGetLibInfo
|
||||
aacEncInfo
|
||||
aacEncOpen
|
||||
aacEncoder_GetParam
|
||||
aacEncoder_SetParam
|
||||
|
|
@ -0,0 +1,193 @@
|
|||
/* ------------------------------------------------------------------
|
||||
* Copyright (C) 2009 Martin Storsjo
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
|
||||
* express or implied.
|
||||
* See the License for the specific language governing permissions
|
||||
* and limitations under the License.
|
||||
* -------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#include "wavreader.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#define TAG(a, b, c, d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d))
|
||||
|
||||
struct wav_reader {
|
||||
FILE *wav;
|
||||
uint32_t data_length;
|
||||
|
||||
int format;
|
||||
int sample_rate;
|
||||
int bits_per_sample;
|
||||
int channels;
|
||||
int byte_rate;
|
||||
int block_align;
|
||||
|
||||
int streamed;
|
||||
};
|
||||
|
||||
static uint32_t read_tag(struct wav_reader* wr) {
|
||||
uint32_t tag = 0;
|
||||
tag = (tag << 8) | fgetc(wr->wav);
|
||||
tag = (tag << 8) | fgetc(wr->wav);
|
||||
tag = (tag << 8) | fgetc(wr->wav);
|
||||
tag = (tag << 8) | fgetc(wr->wav);
|
||||
return tag;
|
||||
}
|
||||
|
||||
static uint32_t read_int32(struct wav_reader* wr) {
|
||||
uint32_t value = 0;
|
||||
value |= fgetc(wr->wav) << 0;
|
||||
value |= fgetc(wr->wav) << 8;
|
||||
value |= fgetc(wr->wav) << 16;
|
||||
value |= fgetc(wr->wav) << 24;
|
||||
return value;
|
||||
}
|
||||
|
||||
static uint16_t read_int16(struct wav_reader* wr) {
|
||||
uint16_t value = 0;
|
||||
value |= fgetc(wr->wav) << 0;
|
||||
value |= fgetc(wr->wav) << 8;
|
||||
return value;
|
||||
}
|
||||
|
||||
static void skip(FILE *f, int n) {
|
||||
int i;
|
||||
for (i = 0; i < n; i++)
|
||||
fgetc(f);
|
||||
}
|
||||
|
||||
void* wav_read_open(const char *filename) {
|
||||
struct wav_reader* wr = (struct wav_reader*) malloc(sizeof(*wr));
|
||||
long data_pos = 0;
|
||||
memset(wr, 0, sizeof(*wr));
|
||||
|
||||
if (!strcmp(filename, "-"))
|
||||
wr->wav = stdin;
|
||||
else
|
||||
wr->wav = fopen(filename, "rb");
|
||||
if (wr->wav == NULL) {
|
||||
free(wr);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
while (1) {
|
||||
uint32_t tag, tag2, length;
|
||||
tag = read_tag(wr);
|
||||
if (feof(wr->wav))
|
||||
break;
|
||||
length = read_int32(wr);
|
||||
if (!length || length >= 0x7fff0000) {
|
||||
wr->streamed = 1;
|
||||
length = ~0;
|
||||
}
|
||||
if (tag != TAG('R', 'I', 'F', 'F') || length < 4) {
|
||||
fseek(wr->wav, length, SEEK_CUR);
|
||||
continue;
|
||||
}
|
||||
tag2 = read_tag(wr);
|
||||
length -= 4;
|
||||
if (tag2 != TAG('W', 'A', 'V', 'E')) {
|
||||
fseek(wr->wav, length, SEEK_CUR);
|
||||
continue;
|
||||
}
|
||||
// RIFF chunk found, iterate through it
|
||||
while (length >= 8) {
|
||||
uint32_t subtag, sublength;
|
||||
subtag = read_tag(wr);
|
||||
if (feof(wr->wav))
|
||||
break;
|
||||
sublength = read_int32(wr);
|
||||
length -= 8;
|
||||
if (length < sublength)
|
||||
break;
|
||||
if (subtag == TAG('f', 'm', 't', ' ')) {
|
||||
if (sublength < 16) {
|
||||
// Insufficient data for 'fmt '
|
||||
break;
|
||||
}
|
||||
wr->format = read_int16(wr);
|
||||
wr->channels = read_int16(wr);
|
||||
wr->sample_rate = read_int32(wr);
|
||||
wr->byte_rate = read_int32(wr);
|
||||
wr->block_align = read_int16(wr);
|
||||
wr->bits_per_sample = read_int16(wr);
|
||||
if (wr->format == 0xfffe) {
|
||||
if (sublength < 28) {
|
||||
// Insufficient data for waveformatex
|
||||
break;
|
||||
}
|
||||
skip(wr->wav, 8);
|
||||
wr->format = read_int32(wr);
|
||||
skip(wr->wav, sublength - 28);
|
||||
} else {
|
||||
skip(wr->wav, sublength - 16);
|
||||
}
|
||||
} else if (subtag == TAG('d', 'a', 't', 'a')) {
|
||||
data_pos = ftell(wr->wav);
|
||||
wr->data_length = sublength;
|
||||
if (!wr->data_length || wr->streamed) {
|
||||
wr->streamed = 1;
|
||||
return wr;
|
||||
}
|
||||
fseek(wr->wav, sublength, SEEK_CUR);
|
||||
} else {
|
||||
skip(wr->wav, sublength);
|
||||
}
|
||||
length -= sublength;
|
||||
}
|
||||
if (length > 0) {
|
||||
// Bad chunk?
|
||||
fseek(wr->wav, length, SEEK_CUR);
|
||||
}
|
||||
}
|
||||
fseek(wr->wav, data_pos, SEEK_SET);
|
||||
return wr;
|
||||
}
|
||||
|
||||
void wav_read_close(void* obj) {
|
||||
struct wav_reader* wr = (struct wav_reader*) obj;
|
||||
if (wr->wav != stdin)
|
||||
fclose(wr->wav);
|
||||
free(wr);
|
||||
}
|
||||
|
||||
int wav_get_header(void* obj, int* format, int* channels, int* sample_rate, int* bits_per_sample, unsigned int* data_length) {
|
||||
struct wav_reader* wr = (struct wav_reader*) obj;
|
||||
if (format)
|
||||
*format = wr->format;
|
||||
if (channels)
|
||||
*channels = wr->channels;
|
||||
if (sample_rate)
|
||||
*sample_rate = wr->sample_rate;
|
||||
if (bits_per_sample)
|
||||
*bits_per_sample = wr->bits_per_sample;
|
||||
if (data_length)
|
||||
*data_length = wr->data_length;
|
||||
return wr->format && wr->sample_rate;
|
||||
}
|
||||
|
||||
int wav_read_data(void* obj, unsigned char* data, unsigned int length) {
|
||||
struct wav_reader* wr = (struct wav_reader*) obj;
|
||||
int n;
|
||||
if (wr->wav == NULL)
|
||||
return -1;
|
||||
if (length > wr->data_length && !wr->streamed)
|
||||
length = wr->data_length;
|
||||
n = fread(data, 1, length, wr->wav);
|
||||
wr->data_length -= length;
|
||||
return n;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
/* ------------------------------------------------------------------
|
||||
* Copyright (C) 2009 Martin Storsjo
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
|
||||
* express or implied.
|
||||
* See the License for the specific language governing permissions
|
||||
* and limitations under the License.
|
||||
* -------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
#ifndef WAVREADER_H
|
||||
#define WAVREADER_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
void* wav_read_open(const char *filename);
|
||||
void wav_read_close(void* obj);
|
||||
|
||||
int wav_get_header(void* obj, int* format, int* channels, int* sample_rate, int* bits_per_sample, unsigned int* data_length);
|
||||
int wav_read_data(void* obj, unsigned char* data, unsigned int length);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue