mirror of
https://github.com/nu774/fdkaac.git
synced 2025-06-05 23:29:14 +02:00
Compare commits
130 Commits
Author | SHA1 | Date | |
---|---|---|---|
a7c2411335 | |||
b54538f79e | |||
a7e00a4219 | |||
b667da2b01 | |||
a79a11ef99 | |||
70554c0791 | |||
a854b113ae | |||
f7a24bf87b | |||
5063c6dce1 | |||
57aa91419d | |||
b3dcf08647 | |||
a7c4895534 | |||
209130e887 | |||
b6ab92a9e7 | |||
e18fe91a40 | |||
472e82e42f | |||
ce0833f8e5 | |||
661f883dce | |||
b815f858d0 | |||
5d6ea58e92 | |||
71e4764062 | |||
a26e3cf3e8 | |||
c6e18ebec1 | |||
c1db26327a | |||
1c1d1931cb | |||
2ecae04c89 | |||
30c77dfb6f | |||
ed646ccf79 | |||
8009f87dca | |||
d09acb7283 | |||
8ac221b853 | |||
2c116b15d5 | |||
e1adc17835 | |||
3c0f152d39 | |||
5732f1f6c5 | |||
a3271927b8 | |||
3de0e22dcc | |||
d533c8e002 | |||
c5eec15549 | |||
3b518efd31 | |||
556a3db11b | |||
4d48b091d4 | |||
d11b044131 | |||
6709cf694c | |||
7259767b09 | |||
3aa2787e34 | |||
b159a7b095 | |||
be234dc464 | |||
c9ac59e8d3 | |||
9b8f9915c2 | |||
5ccbfaa710 | |||
8f05e0751b | |||
053279541b | |||
f48bf1294c | |||
8896249ac5 | |||
5f0d784cd3 | |||
6a3b77de8e | |||
1af8624b00 | |||
29a8f73faf | |||
3b666b7546 | |||
8cb6378fca | |||
bd8c9a5d15 | |||
91ef87b610 | |||
29e0948097 | |||
e8e9f79eec | |||
2d744bd56c | |||
2f6fc566cc | |||
0c502d30e5 | |||
b87f2251a4 | |||
afe73f4916 | |||
fe2d3aa3e7 | |||
2f960ef8fd | |||
fb2b36350a | |||
f5363b23c3 | |||
9517c27537 | |||
d317e29d46 | |||
ffc230a83e | |||
70e912edba | |||
bd02d0e753 | |||
d6a8b9652a | |||
229c3ead72 | |||
4d060c0da0 | |||
1184a1f52b | |||
93fb917b75 | |||
cbb23cdbd8 | |||
721d977f59 | |||
e4bbeeb016 | |||
2642af896e | |||
7ce09815f7 | |||
adbd1aac0e | |||
fe4d497877 | |||
bd3b4b343a | |||
406f0e0f44 | |||
1170c9a610 | |||
a56831da9f | |||
aa2ca1e348 | |||
7b1f213618 | |||
5af13f7d79 | |||
5c534696a9 | |||
33e12bc4f5 | |||
bfb6aa3cb8 | |||
360cf7dc8b | |||
43ab433178 | |||
47c164c85a | |||
d52b8bbf13 | |||
f67cfe227e | |||
e476728e77 | |||
dac71de305 | |||
61b6a9e383 | |||
5888fddccf | |||
c5c459082a | |||
00799c5e44 | |||
6887939854 | |||
6854317606 | |||
8960a17764 | |||
34b319e08b | |||
158dc13cc8 | |||
5e1168a4dd | |||
01993d6774 | |||
9ad6264b3c | |||
7db9e2768d | |||
097ef9a838 | |||
e901466335 | |||
eba9a5841e | |||
d5a9697e47 | |||
7222b0b5ac | |||
112fdaf461 | |||
af8fa38d33 | |||
d1ce25369b | |||
bae3489b91 |
3
.gitattributes
vendored
Normal file
3
.gitattributes
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
* text=auto
|
||||
*.sln text eol=crlf
|
||||
*.lib binary
|
22
.gitignore
vendored
Normal file
22
.gitignore
vendored
Normal file
@ -0,0 +1,22 @@
|
||||
*.o
|
||||
*~
|
||||
Makefile
|
||||
Makefile.in
|
||||
aclocal.m4
|
||||
autom4te.cache
|
||||
compile
|
||||
config.guess
|
||||
config.h
|
||||
config.h.in
|
||||
config.log
|
||||
config.status
|
||||
config.sub
|
||||
configure
|
||||
depcomp
|
||||
install-sh
|
||||
missing
|
||||
missings/.deps/
|
||||
src/.deps/
|
||||
src/.dirstamp
|
||||
stamp-h1
|
||||
fdkaac
|
119
COPYING
119
COPYING
@ -1,17 +1,108 @@
|
||||
Copyright (C) 2013 nu774
|
||||
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||
Upstream-Name: fdkaac
|
||||
Upstream-Contact: nu774 <honeycomb77@gmail.com>
|
||||
Source: https://github.com/nu774/fdkaac
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
arising from the use of this software.
|
||||
|
||||
Permission is granted to anyone to use this software for any purpose,
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely, subject to the following restrictions:
|
||||
Files: *
|
||||
Copyright: 2013-2014 nu774 <honeycomb77@gmail.com>
|
||||
License: Zlib
|
||||
|
||||
1. The origin of this software must not be misrepresented; you must not
|
||||
claim that you wrote the original software. If you use this software
|
||||
in a product, an acknowledgment in the product documentation would be
|
||||
appreciated but is not required.
|
||||
2. Altered source versions must be plainly marked as such, and must not be
|
||||
misrepresented as being the original software.
|
||||
3. This notice may not be removed or altered from any source distribution.
|
||||
Files: missings/getopt.c
|
||||
Copyright: 2002 Todd C. Miller <Todd.Miller@courtesan.com>
|
||||
2000 The NetBSD Foundation, Inc.
|
||||
License: BSD-4-clause
|
||||
|
||||
Files: missings/getopt.h
|
||||
Copyright: 2000 The NetBSD Foundation, Inc.
|
||||
License: BSD-4-clause
|
||||
|
||||
Files: src/parson.*
|
||||
Copyright: 2012 Krzysztof Gabis
|
||||
License: MIT
|
||||
|
||||
Files: src/lpc.h
|
||||
Copyright: 1994-2007 the Xiph.Org Foundation
|
||||
License: BSD
|
||||
|
||||
Files: src/lpc.c
|
||||
Copyright: 1994-2007 the Xiph.Org Foundation
|
||||
1992, 1993, 1994 Jutta Degener and Carsten Bormann, Technische Universität Berlin
|
||||
License: BSD-style
|
||||
|
||||
|
||||
License: Zlib
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
arising from the use of this software.
|
||||
.
|
||||
Permission is granted to anyone to use this software for any purpose,
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely, subject to the following restrictions:
|
||||
.
|
||||
1. The origin of this software must not be misrepresented; you must not
|
||||
claim that you wrote the original software. If you use this software
|
||||
in a product, an acknowledgment in the product documentation would be
|
||||
appreciated but is not required.
|
||||
2. Altered source versions must be plainly marked as such, and must not be
|
||||
misrepresented as being the original software.
|
||||
3. This notice may not be removed or altered from any source distribution.
|
||||
|
||||
|
||||
License: MIT
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
.
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
.
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
|
||||
|
||||
License: BSD-4-clause
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions
|
||||
are met:
|
||||
1. Redistributions of source code must retain the above copyright
|
||||
notice, this list of conditions and the following disclaimer.
|
||||
2. Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
3. All advertising materials mentioning features or use of this software
|
||||
must display the following acknowledgement:
|
||||
This product includes software developed by the NetBSD
|
||||
Foundation, Inc. and its contributors.
|
||||
4. Neither the name of The NetBSD Foundation nor the names of its
|
||||
contributors may be used to endorse or promote products derived
|
||||
from this software without specific prior written permission.
|
||||
.
|
||||
THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
|
||||
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
||||
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
|
||||
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
|
||||
License: BSD-style
|
||||
Any use of this software is permitted provided that this notice is not
|
||||
removed and that neither the authors nor the Technische Universita"t
|
||||
Berlin are deemed to have made any representations as to the
|
||||
suitability of this software for any purpose nor are held responsible
|
||||
for any defects of this software. THERE IS ABSOLUTELY NO WARRANTY FOR
|
||||
THIS SOFTWARE.
|
||||
|
362
ChangeLog
362
ChangeLog
@ -0,0 +1,362 @@
|
||||
2014-07-30 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* update ChangeLog [HEAD]
|
||||
|
||||
* win32compat: fix aacenc_printf() not to write junk characters [v0.5.4]
|
||||
|
||||
2014-05-12 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* write INSTALL [origin/master]
|
||||
|
||||
2014-03-14 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* update COPYING (patch from darealshinji)
|
||||
|
||||
2014-02-17 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* update ChangeLog
|
||||
|
||||
* bump version [v0.5.3]
|
||||
|
||||
* fix: CAF chan chunk using channel bitmap was not correctly handled
|
||||
|
||||
2014-01-18 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* update ChangeLog
|
||||
|
||||
* bump version [v0.5.2]
|
||||
|
||||
* fix reading of caf file without chan chunk
|
||||
|
||||
2013-11-17 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* Merge pull request #9 from rbrito/fix-typo
|
||||
|
||||
2013-11-18 Rogério Brito <rbrito@ime.usp.br>
|
||||
|
||||
* man: Regen manpage with hyphens escaped.
|
||||
|
||||
* README: Remove trailing whitespaces that end up in the manpages.
|
||||
|
||||
* README: Fix typo in bandwidth to match CLI options.
|
||||
|
||||
2013-11-08 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* add genman.sh, update fdkaac.1
|
||||
|
||||
* update ChangeLog
|
||||
|
||||
* bump version [v0.5.1]
|
||||
|
||||
* fix to use libFDKAAC signaling mode 1
|
||||
|
||||
2013-11-05 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* fix README
|
||||
|
||||
2013-11-04 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* rename README.md -> README
|
||||
|
||||
* Update README -> README.md, generate groff manpage from README.md
|
||||
|
||||
* update ChangeLog
|
||||
|
||||
* update git2changelog to accept non-ascii output
|
||||
|
||||
* add manpage
|
||||
|
||||
2013-11-03 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* fix gcc warnings
|
||||
|
||||
* Merge pull request #7 from rbrito/misc-fixes
|
||||
|
||||
2013-11-03 Rogério Brito <rbrito@ime.usp.br>
|
||||
|
||||
* gitignore: Add list of files to ignore.
|
||||
|
||||
2013-11-03 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* update ChangeLog
|
||||
|
||||
* bump version [v0.5.0]
|
||||
|
||||
* add --sbr-ratio to support AACENC_SBR_RATIO appeared on libFDK 3.4.12
|
||||
|
||||
* support 7.1 channel mode added on FDK 3.4.12
|
||||
|
||||
2013-10-30 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* update ChangeLog
|
||||
|
||||
* bump version [v0.4.2]
|
||||
|
||||
* use tell() to obtain data chunk offset
|
||||
|
||||
* rename aacenc_result_t -> aacenc_frame_t, simplify write_sample()
|
||||
|
||||
* prepend 1 sample zero padding in case of SBR and enc_delay is odd
|
||||
|
||||
* cleanup interface of aac_encode_frame()
|
||||
|
||||
* add some copyright notice
|
||||
|
||||
2013-10-29 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* smart padding for better gapless playback
|
||||
|
||||
* fix unused variable warning
|
||||
|
||||
* fix warning: cast size_t as sprintf() arg to int
|
||||
|
||||
* fix vcxproj
|
||||
|
||||
* fix pcm_seek() to inline
|
||||
|
||||
2013-10-27 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* bump version [v0.4.1]
|
||||
|
||||
* add --include-sbr-delay
|
||||
|
||||
* fix help message: show -I as shorthand for --ignorelength
|
||||
|
||||
* remove --sbr-signaling
|
||||
|
||||
2013-10-26 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* re-fix #ifdef cond for lrint()
|
||||
|
||||
* tag mapping: add recorded date and tempo, remove performer->artist
|
||||
|
||||
2013-10-25 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* fix MSVC12 build issue
|
||||
|
||||
* fix build issue on platform where fileno is a naive macro
|
||||
|
||||
* update ChangeLog
|
||||
|
||||
* bump version [v0.4.0]
|
||||
|
||||
* update README
|
||||
|
||||
2013-10-24 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* caf input support
|
||||
|
||||
* refactor pcm io routines
|
||||
|
||||
2013-10-23 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* cleanup metadata handling
|
||||
|
||||
* --tag-from-json: properly support number/total format in json track field
|
||||
|
||||
2013-10-22 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* bump version [v0.3.3]
|
||||
|
||||
* fixed bogus sgpd written on --gapless-mode=1 and 2
|
||||
|
||||
2013-10-21 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* bump version [v0.3.2]
|
||||
|
||||
2013-10-20 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* reimplement int16 conversion as pcm_reader
|
||||
|
||||
* add abstraction layer for pcm reading
|
||||
|
||||
* improve handling of avgBitrate
|
||||
|
||||
2013-10-19 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* update ChangeLog and git2changelog.py
|
||||
|
||||
2013-10-18 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* bump version [v0.3.1]
|
||||
|
||||
* update README
|
||||
|
||||
* set avgBitrate field to zero for 14496-1 compliance
|
||||
|
||||
2013-09-07 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* updated ChangeLog with new git2changelog.py
|
||||
|
||||
2013-06-14 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* add --moov-before-mdat [v0.3.0]
|
||||
|
||||
2013-03-04 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* fix an error message
|
||||
|
||||
2013-03-03 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* bump version [v0.2.0]
|
||||
|
||||
* add --gapless-mode
|
||||
|
||||
2013-02-20 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* simplify __timeb64 condition
|
||||
|
||||
* use fseeko64() on i686-pc-mingw32
|
||||
|
||||
2013-02-18 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* fix build issue on i686-pc-mingw (struct __timeb64 is missing)
|
||||
|
||||
2013-02-17 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* bump version [v0.1.9]
|
||||
|
||||
* fix to accept option -C
|
||||
|
||||
2013-02-16 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* bump version [v0.1.8]
|
||||
|
||||
* refine json metadata importing
|
||||
|
||||
* m4af: duplication check on adding tags
|
||||
|
||||
2013-02-15 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* add --tag-from-json [v0.1.7]
|
||||
|
||||
* fix implicit int variable decl.
|
||||
|
||||
* update m4af
|
||||
|
||||
2013-02-03 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* bump version [v0.1.6]
|
||||
|
||||
* win32: change _wfopen() -> wfsopen()
|
||||
|
||||
2013-01-30 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* update README (add note for character encoding)
|
||||
|
||||
2013-01-28 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* bump version [v0.1.5]
|
||||
|
||||
* gracefully shutdown on signals
|
||||
|
||||
2013-01-27 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* fix MSVC project build issue
|
||||
|
||||
2013-01-25 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* bump version [v0.1.4]
|
||||
|
||||
* add --tag-from-file
|
||||
|
||||
2013-01-24 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* add --silent
|
||||
|
||||
2013-01-19 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* retab
|
||||
|
||||
* bump version [v0.1.3]
|
||||
|
||||
* fix crash on wrong long option, rename --ignore-length to --ignorelength
|
||||
|
||||
2013-01-17 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* bump version [v0.1.2]
|
||||
|
||||
* compat_win32: free argv with atexit()
|
||||
|
||||
* take care of COPYRIGHT-SIGN in UTF-8
|
||||
|
||||
2013-01-15 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* bump version [v0.1.1]
|
||||
|
||||
* fix return type of put_type_entry() to void
|
||||
|
||||
* add ADTS header size(7) to output byte length
|
||||
|
||||
2013-01-13 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* fix mp4 duration & version calcuration [v0.1.0]
|
||||
|
||||
2013-01-11 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* add support for xid
|
||||
|
||||
* support for i686-pc-mingw32 (missing _vscprintf)
|
||||
|
||||
2013-01-10 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* bump version [v0.0.9]
|
||||
|
||||
* rename basename() -> aacenc_basename() and move to compat layer
|
||||
|
||||
2013-01-09 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* add --tag and --long-tag
|
||||
|
||||
* fix corner case of progress display
|
||||
|
||||
* calculate length from file size
|
||||
|
||||
* raw input support
|
||||
|
||||
2013-01-08 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* insert a white space in progress message
|
||||
|
||||
2013-01-07 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* fix typo of bitrate-mode option [v0.0.8]
|
||||
|
||||
* more static inlining (missed on the previous commit) [v0.0.7]
|
||||
|
||||
* check error of fread() and fwrite() [v0.0.6]
|
||||
|
||||
* change inline->static inline to follow C99 semantics (for Clang)
|
||||
|
||||
* explicitly add -lfdk-aac to LDADD in Makefile.am
|
||||
|
||||
* add some files to EXTRA_DIST in Makefile.am
|
||||
|
||||
* fixed a typo in usage message [v0.0.5]
|
||||
|
||||
2013-01-06 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* add MSVC projects
|
||||
|
||||
* add .gitattributes
|
||||
|
||||
* more tweak on configure.ac and Makefile.am (take care of getopt_long) [v0.0.4]
|
||||
|
||||
* use fstat() to test seekability of input file
|
||||
|
||||
* retrieve bitrate for tool tag with aacEncoder_GetParam()
|
||||
|
||||
* output to current working directory by default
|
||||
|
||||
2013-01-05 nu774 <honeycomb77@gmail.com>
|
||||
|
||||
* zero clear LIB_INFO before calling aacEncGetLibInfo() [v0.0.3]
|
||||
|
||||
* tweak configure.ac and Makefile.am
|
||||
|
||||
* update version.h [v0.0.2]
|
||||
|
||||
* fixed to clip before converting float to int
|
||||
|
||||
* initial commit [v0.0.1]
|
||||
|
||||
|
386
INSTALL
386
INSTALL
@ -1,370 +1,32 @@
|
||||
Installation Instructions
|
||||
*************************
|
||||
Prerequiste
|
||||
-----------
|
||||
|
||||
Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
|
||||
Inc.
|
||||
To build fdkaac, you need the followings:
|
||||
- libfdk-aac (https://github.com/mstorsjo/fdk-aac)
|
||||
- GNU autoconf, GNU automake
|
||||
- GNU gettext (for iconv.m4)
|
||||
|
||||
Copying and distribution of this file, with or without modification,
|
||||
are permitted in any medium without royalty provided the copyright
|
||||
notice and this notice are preserved. This file is offered as-is,
|
||||
without warranty of any kind.
|
||||
libfdk-aac is always required, and probably you have to build it yourself.
|
||||
Others are required only when you build by configure and make on Unix-like
|
||||
enviromnent (including Cygwin or MinGW), and usually you can install them
|
||||
through package manager of your system if they are not already present.
|
||||
|
||||
Basic Installation
|
||||
==================
|
||||
Unix-like environment
|
||||
---------------------
|
||||
|
||||
Briefly, the shell commands `./configure; make; make install' should
|
||||
configure, build, and install this package. The following
|
||||
more-detailed instructions are generic; see the `README' file for
|
||||
instructions specific to this package. Some packages provide this
|
||||
`INSTALL' file but do not implement all of the features documented
|
||||
below. The lack of an optional feature in a given package is not
|
||||
necessarily a bug. More recommendations for GNU packages can be found
|
||||
in *note Makefile Conventions: (standards)Makefile Conventions.
|
||||
You can build and install libfdkaac and fdkaac in the following step.
|
||||
|
||||
The `configure' shell script attempts to guess correct values for
|
||||
various system-dependent variables used during compilation. It uses
|
||||
those values to create a `Makefile' in each directory of the package.
|
||||
It may also create one or more `.h' files containing system-dependent
|
||||
definitions. Finally, it creates a shell script `config.status' that
|
||||
you can run in the future to recreate the current configuration, and a
|
||||
file `config.log' containing compiler output (useful mainly for
|
||||
debugging `configure').
|
||||
1) extract the source, and cd to the source directory
|
||||
2) autoreconf -i
|
||||
3) ./configure
|
||||
4) make
|
||||
5) sudo make install
|
||||
|
||||
It can also use an optional file (typically called `config.cache'
|
||||
and enabled with `--cache-file=config.cache' or simply `-C') that saves
|
||||
the results of its tests to speed up reconfiguring. Caching is
|
||||
disabled by default to prevent problems with accidental use of stale
|
||||
cache files.
|
||||
Depending on your requirements, you might want to add some extra arguments to
|
||||
configure script.
|
||||
You have to install libfdk-aac first, and do the same for fdkaac.
|
||||
|
||||
If you need to do unusual things to compile the package, please try
|
||||
to figure out how `configure' could check whether to do them, and mail
|
||||
diffs or instructions to the address given in the `README' so they can
|
||||
be considered for the next release. If you are using the cache, and at
|
||||
some point `config.cache' contains results you don't want to keep, you
|
||||
may remove or edit it.
|
||||
|
||||
The file `configure.ac' (or `configure.in') is used to create
|
||||
`configure' by a program called `autoconf'. You need `configure.ac' if
|
||||
you want to change it or regenerate `configure' using a newer version
|
||||
of `autoconf'.
|
||||
|
||||
The simplest way to compile this package is:
|
||||
|
||||
1. `cd' to the directory containing the package's source code and type
|
||||
`./configure' to configure the package for your system.
|
||||
|
||||
Running `configure' might take a while. While running, it prints
|
||||
some messages telling which features it is checking for.
|
||||
|
||||
2. Type `make' to compile the package.
|
||||
|
||||
3. Optionally, type `make check' to run any self-tests that come with
|
||||
the package, generally using the just-built uninstalled binaries.
|
||||
|
||||
4. Type `make install' to install the programs and any data files and
|
||||
documentation. When installing into a prefix owned by root, it is
|
||||
recommended that the package be configured and built as a regular
|
||||
user, and only the `make install' phase executed with root
|
||||
privileges.
|
||||
|
||||
5. Optionally, type `make installcheck' to repeat any self-tests, but
|
||||
this time using the binaries in their final installed location.
|
||||
This target does not install anything. Running this target as a
|
||||
regular user, particularly if the prior `make install' required
|
||||
root privileges, verifies that the installation completed
|
||||
correctly.
|
||||
|
||||
6. You can remove the program binaries and object files from the
|
||||
source code directory by typing `make clean'. To also remove the
|
||||
files that `configure' created (so you can compile the package for
|
||||
a different kind of computer), type `make distclean'. There is
|
||||
also a `make maintainer-clean' target, but that is intended mainly
|
||||
for the package's developers. If you use it, you may have to get
|
||||
all sorts of other programs in order to regenerate files that came
|
||||
with the distribution.
|
||||
|
||||
7. Often, you can also type `make uninstall' to remove the installed
|
||||
files again. In practice, not all packages have tested that
|
||||
uninstallation works correctly, even though it is required by the
|
||||
GNU Coding Standards.
|
||||
|
||||
8. Some packages, particularly those that use Automake, provide `make
|
||||
distcheck', which can by used by developers to test that all other
|
||||
targets like `make install' and `make uninstall' work correctly.
|
||||
This target is generally not run by end users.
|
||||
|
||||
Compilers and Options
|
||||
=====================
|
||||
|
||||
Some systems require unusual options for compilation or linking that
|
||||
the `configure' script does not know about. Run `./configure --help'
|
||||
for details on some of the pertinent environment variables.
|
||||
|
||||
You can give `configure' initial values for configuration parameters
|
||||
by setting variables in the command line or in the environment. Here
|
||||
is an example:
|
||||
|
||||
./configure CC=c99 CFLAGS=-g LIBS=-lposix
|
||||
|
||||
*Note Defining Variables::, for more details.
|
||||
|
||||
Compiling For Multiple Architectures
|
||||
====================================
|
||||
|
||||
You can compile the package for more than one kind of computer at the
|
||||
same time, by placing the object files for each architecture in their
|
||||
own directory. To do this, you can use GNU `make'. `cd' to the
|
||||
directory where you want the object files and executables to go and run
|
||||
the `configure' script. `configure' automatically checks for the
|
||||
source code in the directory that `configure' is in and in `..'. This
|
||||
is known as a "VPATH" build.
|
||||
|
||||
With a non-GNU `make', it is safer to compile the package for one
|
||||
architecture at a time in the source code directory. After you have
|
||||
installed the package for one architecture, use `make distclean' before
|
||||
reconfiguring for another architecture.
|
||||
|
||||
On MacOS X 10.5 and later systems, you can create libraries and
|
||||
executables that work on multiple system types--known as "fat" or
|
||||
"universal" binaries--by specifying multiple `-arch' options to the
|
||||
compiler but only a single `-arch' option to the preprocessor. Like
|
||||
this:
|
||||
|
||||
./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
||||
CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
||||
CPP="gcc -E" CXXCPP="g++ -E"
|
||||
|
||||
This is not guaranteed to produce working output in all cases, you
|
||||
may have to build one architecture at a time and combine the results
|
||||
using the `lipo' tool if you have problems.
|
||||
|
||||
Installation Names
|
||||
==================
|
||||
|
||||
By default, `make install' installs the package's commands under
|
||||
`/usr/local/bin', include files under `/usr/local/include', etc. You
|
||||
can specify an installation prefix other than `/usr/local' by giving
|
||||
`configure' the option `--prefix=PREFIX', where PREFIX must be an
|
||||
absolute file name.
|
||||
|
||||
You can specify separate installation prefixes for
|
||||
architecture-specific files and architecture-independent files. If you
|
||||
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
|
||||
PREFIX as the prefix for installing programs and libraries.
|
||||
Documentation and other data files still use the regular prefix.
|
||||
|
||||
In addition, if you use an unusual directory layout you can give
|
||||
options like `--bindir=DIR' to specify different values for particular
|
||||
kinds of files. Run `configure --help' for a list of the directories
|
||||
you can set and what kinds of files go in them. In general, the
|
||||
default for these options is expressed in terms of `${prefix}', so that
|
||||
specifying just `--prefix' will affect all of the other directory
|
||||
specifications that were not explicitly provided.
|
||||
|
||||
The most portable way to affect installation locations is to pass the
|
||||
correct locations to `configure'; however, many packages provide one or
|
||||
both of the following shortcuts of passing variable assignments to the
|
||||
`make install' command line to change installation locations without
|
||||
having to reconfigure or recompile.
|
||||
|
||||
The first method involves providing an override variable for each
|
||||
affected directory. For example, `make install
|
||||
prefix=/alternate/directory' will choose an alternate location for all
|
||||
directory configuration variables that were expressed in terms of
|
||||
`${prefix}'. Any directories that were specified during `configure',
|
||||
but not in terms of `${prefix}', must each be overridden at install
|
||||
time for the entire installation to be relocated. The approach of
|
||||
makefile variable overrides for each directory variable is required by
|
||||
the GNU Coding Standards, and ideally causes no recompilation.
|
||||
However, some platforms have known limitations with the semantics of
|
||||
shared libraries that end up requiring recompilation when using this
|
||||
method, particularly noticeable in packages that use GNU Libtool.
|
||||
|
||||
The second method involves providing the `DESTDIR' variable. For
|
||||
example, `make install DESTDIR=/alternate/directory' will prepend
|
||||
`/alternate/directory' before all installation names. The approach of
|
||||
`DESTDIR' overrides is not required by the GNU Coding Standards, and
|
||||
does not work on platforms that have drive letters. On the other hand,
|
||||
it does better at avoiding recompilation issues, and works well even
|
||||
when some directory options were not specified in terms of `${prefix}'
|
||||
at `configure' time.
|
||||
|
||||
Optional Features
|
||||
=================
|
||||
|
||||
If the package supports it, you can cause programs to be installed
|
||||
with an extra prefix or suffix on their names by giving `configure' the
|
||||
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
|
||||
|
||||
Some packages pay attention to `--enable-FEATURE' options to
|
||||
`configure', where FEATURE indicates an optional part of the package.
|
||||
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
|
||||
is something like `gnu-as' or `x' (for the X Window System). The
|
||||
`README' should mention any `--enable-' and `--with-' options that the
|
||||
package recognizes.
|
||||
|
||||
For packages that use the X Window System, `configure' can usually
|
||||
find the X include and library files automatically, but if it doesn't,
|
||||
you can use the `configure' options `--x-includes=DIR' and
|
||||
`--x-libraries=DIR' to specify their locations.
|
||||
|
||||
Some packages offer the ability to configure how verbose the
|
||||
execution of `make' will be. For these packages, running `./configure
|
||||
--enable-silent-rules' sets the default to minimal output, which can be
|
||||
overridden with `make V=1'; while running `./configure
|
||||
--disable-silent-rules' sets the default to verbose, which can be
|
||||
overridden with `make V=0'.
|
||||
|
||||
Particular systems
|
||||
==================
|
||||
|
||||
On HP-UX, the default C compiler is not ANSI C compatible. If GNU
|
||||
CC is not installed, it is recommended to use the following options in
|
||||
order to use an ANSI C compiler:
|
||||
|
||||
./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
|
||||
|
||||
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
|
||||
|
||||
HP-UX `make' updates targets which have the same time stamps as
|
||||
their prerequisites, which makes it generally unusable when shipped
|
||||
generated files such as `configure' are involved. Use GNU `make'
|
||||
instead.
|
||||
|
||||
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
|
||||
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
|
||||
a workaround. If GNU CC is not installed, it is therefore recommended
|
||||
to try
|
||||
|
||||
./configure CC="cc"
|
||||
|
||||
and if that doesn't work, try
|
||||
|
||||
./configure CC="cc -nodtk"
|
||||
|
||||
On Solaris, don't put `/usr/ucb' early in your `PATH'. This
|
||||
directory contains several dysfunctional programs; working variants of
|
||||
these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
|
||||
in your `PATH', put it _after_ `/usr/bin'.
|
||||
|
||||
On Haiku, software installed for all users goes in `/boot/common',
|
||||
not `/usr/local'. It is recommended to use the following options:
|
||||
|
||||
./configure --prefix=/boot/common
|
||||
|
||||
Specifying the System Type
|
||||
==========================
|
||||
|
||||
There may be some features `configure' cannot figure out
|
||||
automatically, but needs to determine by the type of machine the package
|
||||
will run on. Usually, assuming the package is built to be run on the
|
||||
_same_ architectures, `configure' can figure that out, but if it prints
|
||||
a message saying it cannot guess the machine type, give it the
|
||||
`--build=TYPE' option. TYPE can either be a short name for the system
|
||||
type, such as `sun4', or a canonical name which has the form:
|
||||
|
||||
CPU-COMPANY-SYSTEM
|
||||
|
||||
where SYSTEM can have one of these forms:
|
||||
|
||||
OS
|
||||
KERNEL-OS
|
||||
|
||||
See the file `config.sub' for the possible values of each field. If
|
||||
`config.sub' isn't included in this package, then this package doesn't
|
||||
need to know the machine type.
|
||||
|
||||
If you are _building_ compiler tools for cross-compiling, you should
|
||||
use the option `--target=TYPE' to select the type of system they will
|
||||
produce code for.
|
||||
|
||||
If you want to _use_ a cross compiler, that generates code for a
|
||||
platform different from the build platform, you should specify the
|
||||
"host" platform (i.e., that on which the generated programs will
|
||||
eventually be run) with `--host=TYPE'.
|
||||
|
||||
Sharing Defaults
|
||||
================
|
||||
|
||||
If you want to set default values for `configure' scripts to share,
|
||||
you can create a site shell script called `config.site' that gives
|
||||
default values for variables like `CC', `cache_file', and `prefix'.
|
||||
`configure' looks for `PREFIX/share/config.site' if it exists, then
|
||||
`PREFIX/etc/config.site' if it exists. Or, you can set the
|
||||
`CONFIG_SITE' environment variable to the location of the site script.
|
||||
A warning: not all `configure' scripts look for a site script.
|
||||
|
||||
Defining Variables
|
||||
==================
|
||||
|
||||
Variables not defined in a site shell script can be set in the
|
||||
environment passed to `configure'. However, some packages may run
|
||||
configure again during the build, and the customized values of these
|
||||
variables may be lost. In order to avoid this problem, you should set
|
||||
them in the `configure' command line, using `VAR=value'. For example:
|
||||
|
||||
./configure CC=/usr/local2/bin/gcc
|
||||
|
||||
causes the specified `gcc' to be used as the C compiler (unless it is
|
||||
overridden in the site shell script).
|
||||
|
||||
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
|
||||
an Autoconf bug. Until the bug is fixed you can use this workaround:
|
||||
|
||||
CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
|
||||
|
||||
`configure' Invocation
|
||||
======================
|
||||
|
||||
`configure' recognizes the following options to control how it
|
||||
operates.
|
||||
|
||||
`--help'
|
||||
`-h'
|
||||
Print a summary of all of the options to `configure', and exit.
|
||||
|
||||
`--help=short'
|
||||
`--help=recursive'
|
||||
Print a summary of the options unique to this package's
|
||||
`configure', and exit. The `short' variant lists options used
|
||||
only in the top level, while the `recursive' variant lists options
|
||||
also present in any nested packages.
|
||||
|
||||
`--version'
|
||||
`-V'
|
||||
Print the version of Autoconf used to generate the `configure'
|
||||
script, and exit.
|
||||
|
||||
`--cache-file=FILE'
|
||||
Enable the cache: use and save the results of the tests in FILE,
|
||||
traditionally `config.cache'. FILE defaults to `/dev/null' to
|
||||
disable caching.
|
||||
|
||||
`--config-cache'
|
||||
`-C'
|
||||
Alias for `--cache-file=config.cache'.
|
||||
|
||||
`--quiet'
|
||||
`--silent'
|
||||
`-q'
|
||||
Do not print messages saying which checks are being made. To
|
||||
suppress all normal output, redirect it to `/dev/null' (any error
|
||||
messages will still be shown).
|
||||
|
||||
`--srcdir=DIR'
|
||||
Look for the package's source code in directory DIR. Usually
|
||||
`configure' can determine that directory automatically.
|
||||
|
||||
`--prefix=DIR'
|
||||
Use DIR as the installation prefix. *note Installation Names::
|
||||
for more details, including other options available for fine-tuning
|
||||
the installation locations.
|
||||
|
||||
`--no-create'
|
||||
`-n'
|
||||
Run the configure checks, but stop before creating any output
|
||||
files.
|
||||
|
||||
`configure' also accepts some other, not widely useful, options. Run
|
||||
`configure --help' for more details.
|
||||
Windows, MSVC
|
||||
-------------
|
||||
|
||||
Extract libfdk-aac under fdkaac directory, and open MSVC/fdkaac.sln.
|
||||
|
264
MSVC/fdk-aac.vcxproj
Normal file
264
MSVC/fdk-aac.vcxproj
Normal file
@ -0,0 +1,264 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{D7D4B982-8B16-4A10-8B1C-9527BD789709}</ProjectGuid>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<RootNamespace>fdkaac</RootNamespace>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<IntDir>$(Configuration)Lib\</IntDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<IntDir>$(Configuration)Lib\</IntDir>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>../fdk-aac/libaacenc/include;../fdk-aac/libFDK/include;../fdk-aac/libMpegTPEnc/include;../fdk-aac/libPCMutils/include;../fdk-aac/libSBRenc/include;../fdk-aac/libSYS/include</AdditionalIncludeDirectories>
|
||||
<StringPooling>true</StringPooling>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>../fdk-aac/libaacenc/include;../fdk-aac/libFDK/include;../fdk-aac/libMpegTPEnc/include;../fdk-aac/libPCMutils/include;../fdk-aac/libSBRenc/include;../fdk-aac/libSYS/include</AdditionalIncludeDirectories>
|
||||
<StringPooling>true</StringPooling>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\aacenc.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\aacenc_hcr.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\aacenc_lib.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\aacenc_pns.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\aacEnc_ram.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\aacEnc_rom.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\aacenc_tns.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\adj_thr.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\bandwidth.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\band_nrg.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\bitenc.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\bit_cnt.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\block_switch.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\channel_map.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\chaosmeasure.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\dyn_bits.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\grp_data.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\intensity.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\line_pe.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\metadata_compressor.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\metadata_main.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\ms_stereo.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\noisedet.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\pnsparam.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\pre_echo_control.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\psy_configuration.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\psy_main.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\qc_main.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\quantize.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\sf_estim.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\spreading.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\tonality.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\transform.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\autocorr2nd.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\dct.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_bitbuffer.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_core.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_crc.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_hybrid.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_tools_rom.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_trigFcts.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\fft.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\fft_rad2.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\fixpoint_math.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\mdct.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\qmf.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\scale.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libMpegTPEnc\src\tpenc_adif.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libMpegTPEnc\src\tpenc_adts.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libMpegTPEnc\src\tpenc_asc.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libMpegTPEnc\src\tpenc_latm.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libMpegTPEnc\src\tpenc_lib.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libPCMutils\src\pcmutils_lib.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\bit_sbr.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\code_env.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\env_bit.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\env_est.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\fram_gen.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\invf_est.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\mh_det.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\nf_est.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\ps_bitenc.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\ps_encode.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\ps_main.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\resampler.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\sbrenc_freq_sca.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\sbr_encoder.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\sbr_misc.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\sbr_ram.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\sbr_rom.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\ton_corr.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\tran_det.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libSYS\src\conv_string.cpp" />
|
||||
<ClCompile Include="..\fdk-aac\libSYS\src\genericStds.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\include\aacenc_lib.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\aacenc.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\aacenc_hcr.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\aacenc_pns.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\aacEnc_ram.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\aacEnc_rom.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\aacenc_tns.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\adj_thr.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\adj_thr_data.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\bandwidth.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\band_nrg.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\bitenc.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\bit_cnt.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\block_switch.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\channel_map.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\chaosmeasure.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\dyn_bits.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\grp_data.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\intensity.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\interface.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\line_pe.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\metadata_compressor.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\metadata_main.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\ms_stereo.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\noisedet.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\pnsparam.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\pns_func.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\pre_echo_control.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\psy_configuration.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\psy_const.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\psy_data.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\psy_main.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\qc_data.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\qc_main.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\quantize.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\sf_estim.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\spreading.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\tns_func.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\tonality.h" />
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\transform.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\abs.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\autocorr2nd.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\clz.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\common_fix.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\cplx_mul.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\dct.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_archdef.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_bitbuffer.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_bitstream.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_core.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_crc.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_hybrid.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_tools_rom.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_trigFcts.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\fft.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\fft_rad2.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\fixmadd.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\fixminmax.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\fixmul.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\fixpoint_math.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\mdct.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\qmf.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\scale.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\scramble.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\x86\abs_x86.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\x86\clz_x86.h" />
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\x86\fixmul_x86.h" />
|
||||
<ClInclude Include="..\fdk-aac\libMpegTPEnc\include\mpegFileWrite.h" />
|
||||
<ClInclude Include="..\fdk-aac\libMpegTPEnc\include\tpenc_lib.h" />
|
||||
<ClInclude Include="..\fdk-aac\libMpegTPEnc\include\tp_data.h" />
|
||||
<ClInclude Include="..\fdk-aac\libMpegTPEnc\src\tpenc_adif.h" />
|
||||
<ClInclude Include="..\fdk-aac\libMpegTPEnc\src\tpenc_adts.h" />
|
||||
<ClInclude Include="..\fdk-aac\libMpegTPEnc\src\tpenc_asc.h" />
|
||||
<ClInclude Include="..\fdk-aac\libMpegTPEnc\src\tpenc_latm.h" />
|
||||
<ClInclude Include="..\fdk-aac\libPCMutils\include\pcmutils_lib.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\include\sbr_encoder.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\bit_sbr.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\cmondata.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\code_env.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\env_bit.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\env_est.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\fram_gen.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\invf_est.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\mh_det.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\nf_est.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\ps_bitenc.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\ps_const.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\ps_encode.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\ps_main.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\resampler.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbr.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbrenc_freq_sca.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbr_def.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbr_misc.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbr_ram.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbr_rom.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\ton_corr.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\tran_det.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSYS\include\audio.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSYS\include\cmdl_parser.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSYS\include\conv_string.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSYS\include\FDK_audio.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSYS\include\genericStds.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSYS\include\machine_type.h" />
|
||||
<ClInclude Include="..\fdk-aac\libSYS\include\wav_file.h" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
558
MSVC/fdk-aac.vcxproj.filters
Normal file
558
MSVC/fdk-aac.vcxproj.filters
Normal file
@ -0,0 +1,558 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<Filter Include="Source Files">
|
||||
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
||||
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Header Files">
|
||||
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
||||
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Resource Files">
|
||||
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
||||
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\aacenc.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\aacenc_hcr.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\aacenc_lib.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\aacenc_pns.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\aacEnc_ram.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\aacEnc_rom.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\aacenc_tns.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\adj_thr.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\bandwidth.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\band_nrg.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\bitenc.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\bit_cnt.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\block_switch.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\channel_map.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\chaosmeasure.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\dyn_bits.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\grp_data.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\intensity.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\line_pe.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\metadata_compressor.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\metadata_main.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\ms_stereo.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\noisedet.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\pnsparam.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\pre_echo_control.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\psy_configuration.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\psy_main.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\qc_main.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\quantize.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\sf_estim.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\spreading.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\tonality.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libAACenc\src\transform.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\autocorr2nd.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\dct.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_bitbuffer.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_core.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_crc.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_hybrid.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_tools_rom.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_trigFcts.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\fft.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\fft_rad2.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\fixpoint_math.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\mdct.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\qmf.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libFDK\src\scale.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libMpegTPEnc\src\tpenc_adif.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libMpegTPEnc\src\tpenc_adts.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libMpegTPEnc\src\tpenc_asc.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libMpegTPEnc\src\tpenc_latm.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libMpegTPEnc\src\tpenc_lib.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libPCMutils\src\pcmutils_lib.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\bit_sbr.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\code_env.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\env_bit.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\env_est.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\fram_gen.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\invf_est.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\mh_det.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\nf_est.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\ps_bitenc.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\ps_encode.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\ps_main.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\resampler.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\sbrenc_freq_sca.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\sbr_encoder.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\sbr_misc.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\sbr_ram.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\sbr_rom.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\ton_corr.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libSBRenc\src\tran_det.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libSYS\src\conv_string.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\fdk-aac\libSYS\src\genericStds.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\include\aacenc_lib.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\aacenc.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\aacenc_hcr.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\aacenc_pns.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\aacEnc_ram.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\aacEnc_rom.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\aacenc_tns.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\adj_thr.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\adj_thr_data.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\bandwidth.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\band_nrg.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\bitenc.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\bit_cnt.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\block_switch.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\channel_map.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\chaosmeasure.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\dyn_bits.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\grp_data.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\intensity.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\interface.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\line_pe.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\metadata_compressor.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\metadata_main.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\ms_stereo.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\noisedet.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\pnsparam.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\pns_func.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\pre_echo_control.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\psy_configuration.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\psy_const.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\psy_data.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\psy_main.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\qc_data.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\qc_main.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\quantize.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\sf_estim.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\spreading.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\tns_func.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\tonality.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libAACenc\src\transform.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\abs.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\autocorr2nd.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\clz.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\common_fix.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\cplx_mul.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\dct.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_archdef.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_bitbuffer.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_bitstream.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_core.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_crc.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_hybrid.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_tools_rom.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_trigFcts.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\fft.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\fft_rad2.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\fixmadd.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\fixminmax.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\fixmul.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\fixpoint_math.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\mdct.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\qmf.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\scale.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\scramble.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\x86\abs_x86.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\x86\clz_x86.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libFDK\include\x86\fixmul_x86.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libMpegTPEnc\include\mpegFileWrite.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libMpegTPEnc\include\tpenc_lib.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libMpegTPEnc\include\tp_data.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libMpegTPEnc\src\tpenc_adif.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libMpegTPEnc\src\tpenc_adts.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libMpegTPEnc\src\tpenc_asc.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libMpegTPEnc\src\tpenc_latm.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libPCMutils\include\pcmutils_lib.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\include\sbr_encoder.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\bit_sbr.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\cmondata.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\code_env.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\env_bit.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\env_est.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\fram_gen.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\invf_est.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\mh_det.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\nf_est.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\ps_bitenc.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\ps_const.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\ps_encode.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\ps_main.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\resampler.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbr.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbrenc_freq_sca.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbr_def.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbr_misc.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbr_ram.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbr_rom.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\ton_corr.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSBRenc\src\tran_det.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSYS\include\audio.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSYS\include\cmdl_parser.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSYS\include\conv_string.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSYS\include\FDK_audio.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSYS\include\genericStds.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSYS\include\machine_type.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\fdk-aac\libSYS\include\wav_file.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
</Project>
|
26
MSVC/fdkaac.sln
Normal file
26
MSVC/fdkaac.sln
Normal file
@ -0,0 +1,26 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 11.00
|
||||
# Visual Studio 2010
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fdkaac", "fdkaac.vcxproj", "{E62D32CF-E308-40BD-9FF0-8266C6CAA9AA}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fdk-aac", "fdk-aac.vcxproj", "{D7D4B982-8B16-4A10-8B1C-9527BD789709}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
Release|Win32 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{E62D32CF-E308-40BD-9FF0-8266C6CAA9AA}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{E62D32CF-E308-40BD-9FF0-8266C6CAA9AA}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{E62D32CF-E308-40BD-9FF0-8266C6CAA9AA}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{E62D32CF-E308-40BD-9FF0-8266C6CAA9AA}.Release|Win32.Build.0 = Release|Win32
|
||||
{D7D4B982-8B16-4A10-8B1C-9527BD789709}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{D7D4B982-8B16-4A10-8B1C-9527BD789709}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{D7D4B982-8B16-4A10-8B1C-9527BD789709}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{D7D4B982-8B16-4A10-8B1C-9527BD789709}.Release|Win32.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
EndGlobal
|
137
MSVC/fdkaac.vcxproj
Normal file
137
MSVC/fdkaac.vcxproj
Normal file
@ -0,0 +1,137 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{E62D32CF-E308-40BD-9FF0-8266C6CAA9AA}</ProjectGuid>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<RootNamespace>fdkaac</RootNamespace>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<IntDir>cli_$(Configuration)\</IntDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<IntDir>$(Configuration)Cli\</IntDir>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>HAVE_STDINT_H;inline=__inline;_CRT_SECURE_NO_WARNINGS;WIN32;_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>./include;../missings;.;..</AdditionalIncludeDirectories>
|
||||
<StringPooling>true</StringPooling>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
<PreBuildEvent>
|
||||
<Command>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\ </Command>
|
||||
</PreBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>HAVE_STDINT_H;inline=__inline;_CRT_SECURE_NO_WARNINGS;WIN32;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>./include;../missings;.;..</AdditionalIncludeDirectories>
|
||||
<StringPooling>true</StringPooling>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
</Link>
|
||||
<PreBuildEvent>
|
||||
<Command>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\ </Command>
|
||||
</PreBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\missings\getopt.c" />
|
||||
<ClCompile Include="..\src\aacenc.c" />
|
||||
<ClCompile Include="..\src\caf_reader.c" />
|
||||
<ClCompile Include="..\src\compat_win32.c" />
|
||||
<ClCompile Include="..\src\extrapolater.c" />
|
||||
<ClCompile Include="..\src\limiter.c" />
|
||||
<ClCompile Include="..\src\lpc.c" />
|
||||
<ClCompile Include="..\src\m4af.c" />
|
||||
<ClCompile Include="..\src\main.c" />
|
||||
<ClCompile Include="..\src\metadata.c" />
|
||||
<ClCompile Include="..\src\parson.c" />
|
||||
<ClCompile Include="..\src\pcm_float_converter.c" />
|
||||
<ClCompile Include="..\src\pcm_native_converter.c" />
|
||||
<ClCompile Include="..\src\pcm_readhelper.c" />
|
||||
<ClCompile Include="..\src\pcm_sint16_converter.c" />
|
||||
<ClCompile Include="..\src\progress.c" />
|
||||
<ClCompile Include="..\src\wav_reader.c" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\missings\getopt.h" />
|
||||
<ClInclude Include="..\src\aacenc.h" />
|
||||
<ClInclude Include="..\src\catypes.h" />
|
||||
<ClInclude Include="..\src\compat.h" />
|
||||
<ClInclude Include="..\src\lpc.h" />
|
||||
<ClInclude Include="..\src\lpcm.h" />
|
||||
<ClInclude Include="..\src\m4af.h" />
|
||||
<ClInclude Include="..\src\m4af_endian.h" />
|
||||
<ClInclude Include="..\src\metadata.h" />
|
||||
<ClInclude Include="..\src\parson.h" />
|
||||
<ClInclude Include="..\src\pcm_reader.h" />
|
||||
<ClInclude Include="..\src\progress.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="fdk-aac.vcxproj">
|
||||
<Project>{d7d4b982-8b16-4a10-8b1c-9527bd789709}</Project>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
96
MSVC/fdkaac.vcxproj.filters
Normal file
96
MSVC/fdkaac.vcxproj.filters
Normal file
@ -0,0 +1,96 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<Filter Include="Source Files">
|
||||
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
||||
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Header Files">
|
||||
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
||||
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Resource Files">
|
||||
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
||||
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\src\aacenc.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\caf_reader.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\compat_win32.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\extrapolater.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\limiter.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\lpc.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\m4af.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\main.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\pcm_float_converter.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\pcm_native_converter.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\pcm_readhelper.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\pcm_sint16_converter.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\progress.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\wav_reader.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\missings\getopt.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\src\aacenc.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\catypes.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\compat.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\lpc.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\lpcm.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\m4af.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\m4af_endian.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\pcm_reader.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\src\progress.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\missings\getopt.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
</Project>
|
0
MSVC/include/fdk-aac/.gitkeep
Normal file
0
MSVC/include/fdk-aac/.gitkeep
Normal file
42
Makefile.am
42
Makefile.am
@ -1,18 +1,29 @@
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
EXTRA_DIST = COPYING
|
||||
AUTOMAKE_OPTIONS = subdir-objects
|
||||
|
||||
bin_PROGRAMS = fdkaac
|
||||
|
||||
fdkaac_SOURCES = \
|
||||
src/aacenc.c \
|
||||
src/lpcm.c \
|
||||
src/m4af.c \
|
||||
src/main.c \
|
||||
src/progress.c \
|
||||
src/wav_reader.c
|
||||
src/aacenc.c \
|
||||
src/caf_reader.c \
|
||||
src/extrapolater.c \
|
||||
src/limiter.c \
|
||||
src/lpc.c \
|
||||
src/m4af.c \
|
||||
src/main.c \
|
||||
src/metadata.c \
|
||||
src/parson.c \
|
||||
src/pcm_float_converter.c \
|
||||
src/pcm_native_converter.c \
|
||||
src/pcm_readhelper.c \
|
||||
src/pcm_sint16_converter.c \
|
||||
src/progress.c \
|
||||
src/wav_reader.c
|
||||
|
||||
dist_man_MANS = man/fdkaac.1
|
||||
|
||||
fdkaac_LDADD = \
|
||||
@LIBICONV@ -lm
|
||||
@LIBICONV@ -lfdk-aac -lm
|
||||
|
||||
if FDK_PLATFORM_POSIX
|
||||
fdkaac_SOURCES += \
|
||||
@ -23,3 +34,18 @@ if FDK_PLATFORM_WIN32
|
||||
fdkaac_SOURCES += \
|
||||
src/compat_win32.c
|
||||
endif
|
||||
|
||||
if FDK_NO_GETOPT_LONG
|
||||
fdkaac_SOURCES += \
|
||||
missings/getopt.c
|
||||
AM_CPPFLAGS = -Imissings
|
||||
endif
|
||||
|
||||
EXTRA_DIST = \
|
||||
m4/.gitkeep \
|
||||
src/*.h \
|
||||
missings/*.c \
|
||||
missings/*.h \
|
||||
MSVC/*.vcxproj \
|
||||
MSVC/*.vcxproj.filters \
|
||||
MSVC/*.sln
|
||||
|
342
README
342
README
@ -1,14 +1,332 @@
|
||||
==========================================================================
|
||||
fdkaac - command line frontend encoder for libfdk-aac
|
||||
==========================================================================
|
||||
% FDKAAC(1)
|
||||
% nu774 <honeycomb77@gmail.com>
|
||||
% November, 2013
|
||||
|
||||
Prerequisites
|
||||
-------------
|
||||
You need libfdk-aac, GNU autoconf and automake, and C compiler.
|
||||
On Posix environment, you will also need GNU gettext (for iconv.m4).
|
||||
NAME
|
||||
====
|
||||
|
||||
fdkaac - command line frontend for libfdk-aac encoder
|
||||
|
||||
SYNOPSIS
|
||||
========
|
||||
|
||||
**fdkaac** [OPTIONS] [FILE]
|
||||
|
||||
DESCRIPTION
|
||||
===========
|
||||
|
||||
**fdkaac** reads linear PCM audio in either WAV, raw PCM, or CAF format,
|
||||
and encodes it into either M4A / AAC file.
|
||||
|
||||
If the input file is "-", data is read from stdin. Likewise, if the
|
||||
output file is "-", data is written to stdout if one of streamable AAC
|
||||
transport formats are selected by **-f**.
|
||||
|
||||
When CAF input and M4A output is used, tags in CAF file are copied into
|
||||
the resulting M4A.
|
||||
|
||||
OPTIONS
|
||||
=======
|
||||
|
||||
-h, --help
|
||||
: Show command help
|
||||
|
||||
-o \<FILE\>
|
||||
: Output filename.
|
||||
|
||||
-p, --profile \<n\>
|
||||
: Target profile (MPEG4 audio object type, AOT)
|
||||
|
||||
2
|
||||
: MPEG-4 AAC LC (default)
|
||||
|
||||
5
|
||||
: MPEG-4 HE-AAC (SBR)
|
||||
|
||||
29
|
||||
: MPEG-4 HE-AAC v2 (SBR+PS)
|
||||
|
||||
23
|
||||
: MPEG-4 AAC LD
|
||||
|
||||
39
|
||||
: MPEG-4 AAC ELD
|
||||
|
||||
129
|
||||
: MPEG-2 AAC LC
|
||||
|
||||
132
|
||||
: MPEG-2 HE-AAC (SBR)
|
||||
|
||||
156
|
||||
: MPEG-2 HE-AAC v2 (SBR+PS)
|
||||
|
||||
-b, --bitrate \<n\>
|
||||
: Target bitrate (for CBR)
|
||||
|
||||
-m, --bitrate-mode \<n\>
|
||||
: Bitrate configuration mode. Available VBR quality value depends on
|
||||
other parameters such as profile, sample rate, or number of
|
||||
channels.
|
||||
|
||||
0
|
||||
: CBR (default)
|
||||
|
||||
1-5
|
||||
: VBR (higher value -\> higher bitrate)
|
||||
|
||||
-w, --bandwidth \<n\>
|
||||
: Frequency bandwidth (lowpass cut-off frequency) in Hz. Available on
|
||||
AAC LC only.
|
||||
|
||||
-a, --afterburner \<n\>
|
||||
: Configure afterburner mode. When enabled, quality is increased at
|
||||
the expense of additional computational workload.
|
||||
|
||||
0
|
||||
: Off
|
||||
|
||||
1
|
||||
: On (default)
|
||||
|
||||
-L, --lowdelay-sbr \<n\>
|
||||
: Configure SBR activity on AAC ELD.
|
||||
|
||||
-1
|
||||
: Use ELD SBR auto configuration
|
||||
|
||||
0
|
||||
: Disable SBR on ELD (default)
|
||||
|
||||
1
|
||||
: Enable SBR on ELD
|
||||
|
||||
-s, --sbr-ratio \<n\>
|
||||
: Controls activation of downsampled SBR.
|
||||
|
||||
0
|
||||
: Use lib default (default)
|
||||
|
||||
1
|
||||
: Use downsampled SBR (default for ELD+SBR)
|
||||
|
||||
2
|
||||
: Use dual-rate SBR (default for HE-AAC)
|
||||
|
||||
Dual-rate SBR is what is normally used for HE-AAC, where AAC is
|
||||
encoded at half the sample rate of SBR, hence "dual rate". On the
|
||||
other hand, downsampled SBR uses same sample rate for both of AAC
|
||||
and SBR (single rate), therefore downsampled SBR typically consumes
|
||||
more bitrate.
|
||||
|
||||
Downsampled SBR is newly introduced feature in FDK encoder library
|
||||
version 3.4.12. When libfdk-aac in the system doesn't support this,
|
||||
dual-rate SBR will be used. When available, dual-rate SBR is the
|
||||
default for HE-AAC and downsampled SBR is the default for ELD+SBR.
|
||||
|
||||
Note that downsampled HE-AAC is not so common as dual-rate one. When
|
||||
downsampled HE-AAC is selected, **fdkaac** is forced to choose
|
||||
explicit hierarchical SBR signaling, which (at least) iTunes doesn't
|
||||
accept.
|
||||
|
||||
-f, --transport-format \<n\>
|
||||
: Transport format. Tagging and gapless playback is only available on
|
||||
M4A. Streaming to stdout is only available on others.
|
||||
|
||||
0
|
||||
: M4A (default)
|
||||
|
||||
1
|
||||
: ADIF
|
||||
|
||||
2
|
||||
: ADTS
|
||||
|
||||
6
|
||||
: LATM MCP=1
|
||||
|
||||
7
|
||||
: LATM MCP=0
|
||||
|
||||
10
|
||||
: LOAS/LATM (LATM within LOAS)
|
||||
|
||||
-C, --adts-crc-check
|
||||
: Add CRC protection on ADTS header.
|
||||
|
||||
-h, --header-period \<n\>
|
||||
: StreamMuxConfig/PCE repetition period in the transport layer.
|
||||
|
||||
-G, --gapless-mode \<n\>
|
||||
: Method to declare amount of encoder delay (and padding) in M4A
|
||||
container. These values are mandatory for proper gapless playback on
|
||||
player side.
|
||||
|
||||
0
|
||||
: iTunSMPB (default)
|
||||
|
||||
1
|
||||
: ISO standard (edts and sgpd)
|
||||
|
||||
2
|
||||
: Both
|
||||
|
||||
--include-sbr-delay
|
||||
: When specified, count SBR decoder delay in encoder delay.
|
||||
|
||||
This is not iTunes compatible and will lead to gapless playback
|
||||
issue on LC only decoder, but this is the default behavior of FDK
|
||||
library.
|
||||
|
||||
Whether counting SBR decoder delay in encoder delay or not result in
|
||||
incompatibility in gapless playback. You should pick which one will
|
||||
work for your favorite player.
|
||||
|
||||
However, it's better not to choose SBR at all if you want gapless
|
||||
playback. LC doesn't have such issues.
|
||||
|
||||
-I, --ignorelength
|
||||
: Ignore length field of data chunk in input WAV file.
|
||||
|
||||
-S, --silent
|
||||
: Don't print progress messages.
|
||||
|
||||
--moov-before-mdat
|
||||
: Place moov box before mdat box in M4A container. This option might
|
||||
be important for some hardware players, that are known to refuse
|
||||
moov box placed after mdat box.
|
||||
|
||||
-R, --raw
|
||||
: Regard input as raw PCM.
|
||||
|
||||
--raw-channels \<n\>
|
||||
: Specify number of channels of raw input (default: 2)
|
||||
|
||||
--raw-rate \<n\>
|
||||
: Specify sample rate of raw input (default: 44100)
|
||||
|
||||
--raw-format \<spec\>
|
||||
: Specify sample format of raw input (default: "S16L"). **Spec** is as
|
||||
the following (case insensitive):
|
||||
|
||||
1st char -- type of sample
|
||||
: **S** (igned) | **U** (nsigned) | **F** (loat)
|
||||
|
||||
2nd part (in digits)
|
||||
: bits per channel
|
||||
|
||||
Last char -- endianness (can be omitted)
|
||||
: **L** (ittle, default) | **B** (ig)
|
||||
|
||||
--title \<string\>
|
||||
: Set title tag.
|
||||
|
||||
--artist \<string\>
|
||||
: Set artist tag.
|
||||
|
||||
--album \<string\>
|
||||
: Set album tag.
|
||||
|
||||
--genre \<string\>
|
||||
: Set genre tag.
|
||||
|
||||
--date \<string\>
|
||||
: Set date tag.
|
||||
|
||||
--composer \<string\>
|
||||
: Set composer tag.
|
||||
|
||||
--grouping \<string\>
|
||||
: Set grouping tag.
|
||||
|
||||
--comment \<string\>
|
||||
: Set comment tag.
|
||||
|
||||
--album-artist \<string\>
|
||||
: Set album artist tag.
|
||||
|
||||
--track \<number[/total]\>
|
||||
: Set track tag, with or without number of total tracks.
|
||||
|
||||
--disk \<number[/total]\>
|
||||
: Set disk tag, with or without number of total discs.
|
||||
|
||||
--tempo \<n\>
|
||||
: Set tempo (BPM) tag.
|
||||
|
||||
--tag \<fcc\>:\<value\>
|
||||
: Set iTunes predefined tag with explicit fourcc key and value. See
|
||||
[https://code.google.com/p/mp4v2/wiki/iTunesMetadata](https://code.google.com/p/mp4v2/wiki/iTunesMetadata)
|
||||
for known predefined keys. You can omit first char of **fcc** when
|
||||
it is the copyright sign.
|
||||
|
||||
--tag-from-file \<fcc\>:\<filename\>
|
||||
: Same as --tag, but set content of file as tag value.
|
||||
|
||||
--long-tag \<name\>:\<value\>
|
||||
: Set arbitrary tag as iTunes custom metadata. Stored in
|
||||
com.apple.iTunes field.
|
||||
|
||||
--tag-from-json \<filename[?dot\_notation]\>
|
||||
: Read tags from JSON. By default, tags are assumed to be direct
|
||||
children of the root object in JSON. Optionally you can specify
|
||||
arbitrary dot notation to locate the object containing tags.
|
||||
|
||||
|
||||
EXAMPLES
|
||||
========
|
||||
|
||||
Encode WAV file into a M4A file. MPEG4 AAC LC, VBR quality 3:
|
||||
|
||||
fdkaac -m3 foo.wav
|
||||
|
||||
Encode WAV file into a M4A file. MPEG4 HE-AAC, bitrate 64kbps:
|
||||
|
||||
fdkaac -p5 -b64 foo.wav
|
||||
|
||||
Piping from **ffmpeg** (you need version supporting CAF output):
|
||||
|
||||
ffmpeg -i foo.flac -f caf - | fdkaac -b128 - -o foo.m4a
|
||||
|
||||
Import tags via json:
|
||||
|
||||
ffprobe -v 0 -of json -show_format foo.flac >foo.json
|
||||
|
||||
flac -dc foo.flac | \
|
||||
fdkaac - -ox.m4a -m2 --import-tag-from-json=foo.json?format.tags
|
||||
|
||||
NOTES
|
||||
=====
|
||||
|
||||
Upto 32bit integer or 64bit floating point format is supported as input.
|
||||
However, FDK library is implemented based on fixed point math and only
|
||||
supports 16bit integer PCM. Therefore, be wary of clipping. You might
|
||||
want to dither/noise shape beforehand when your input has higher
|
||||
resolution.
|
||||
|
||||
Following channel layouts are supported by the encoder.
|
||||
|
||||
1ch
|
||||
: C
|
||||
|
||||
2ch
|
||||
: L R
|
||||
|
||||
3ch
|
||||
: C L R
|
||||
|
||||
4ch
|
||||
: C L R Cs
|
||||
|
||||
5ch
|
||||
: C L R Ls Rs
|
||||
|
||||
5.1ch
|
||||
: C L R Ls Rs LFE
|
||||
|
||||
7.1ch (front)
|
||||
: C Lc Rc L R Ls Rs LFE
|
||||
|
||||
7.1ch (rear)
|
||||
: C L R Ls Rs Rls Rrs LFE
|
||||
|
||||
How to build
|
||||
------------
|
||||
$ autoreconf -i
|
||||
$ ./configure
|
||||
$ make
|
||||
|
10
configure.ac
10
configure.ac
@ -10,8 +10,9 @@ 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([sys/time.h])
|
||||
AC_CHECK_HEADERS([localcharset.h langinfo.h endian.h byteswap.h])
|
||||
AC_CHECK_HEADERS([fdk-aac/aacenc_lib.h], ,
|
||||
AC_MSG_ERROR([libfdk-aac is required]))
|
||||
@ -30,9 +31,12 @@ AC_TYPE_UINT8_T
|
||||
AC_CHECK_TYPES([ptrdiff_t])
|
||||
|
||||
AC_SYS_LARGEFILE
|
||||
AC_CHECK_TYPES([struct __timeb64],[],[],[[#include <sys/timeb.h>]])
|
||||
AC_FUNC_FSEEKO
|
||||
AC_CHECK_FUNCS([gettimeofday nl_langinfo strdup])
|
||||
AC_SEARCH_LIBS([aacEncOpen],[fdk-aac])
|
||||
AC_CHECK_FUNCS([sigaction gettimeofday nl_langinfo _vscprintf fseeko64])
|
||||
AC_CHECK_FUNC(getopt_long)
|
||||
AM_CONDITIONAL([FDK_NO_GETOPT_LONG],[test "$ac_cv_func_getopt_long" != "yes"])
|
||||
AC_SEARCH_LIBS([aacEncOpen],[fdk-aac],[],[],[])
|
||||
|
||||
AC_CANONICAL_HOST
|
||||
|
||||
|
2
genman.sh
Executable file
2
genman.sh
Executable file
@ -0,0 +1,2 @@
|
||||
#!/bin/sh
|
||||
pandoc -s -f markdown -t man README >fdkaac.1 && mv -f fdkaac.1 man/fdkaac.1
|
44
git2changelog.py
Executable file
44
git2changelog.py
Executable file
@ -0,0 +1,44 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
# Copyright (C) 2013 nu774
|
||||
# For conditions of distribution and use, see copyright notice in COPYING
|
||||
|
||||
import sys
|
||||
import re
|
||||
from subprocess import Popen, PIPE
|
||||
from itertools import groupby
|
||||
from collections import namedtuple
|
||||
|
||||
GITLOG_FMT = 'commit %H%nauthor %cn <%ae>%ndate %ad%nsubject %s%nref %d%n%n'
|
||||
GITLOG_CMD = ['git','log','--date=short','--format={0}'.format(GITLOG_FMT)]
|
||||
|
||||
Commit = namedtuple('Commit', 'commit author date subject ref')
|
||||
|
||||
def parse_gitlog(stream):
|
||||
re_decode_ref = re.compile(r'(?<=\()([^,)]+)')
|
||||
re_strip_tag = re.compile(r'^tag: ')
|
||||
commit = dict()
|
||||
for line in stream:
|
||||
fields = line.decode('utf-8').rstrip('\r\n').split(' ', 1)
|
||||
if len(fields) == 2:
|
||||
key, value = fields
|
||||
if key == 'ref':
|
||||
m = re_decode_ref.search(value)
|
||||
if m:
|
||||
value = ' [{0}]'.format(re_strip_tag.sub('', m.group()))
|
||||
else:
|
||||
value = ''
|
||||
commit[key] = value
|
||||
elif commit:
|
||||
yield Commit(**commit)
|
||||
commit = dict()
|
||||
|
||||
output=sys.stdout.write
|
||||
|
||||
with Popen(GITLOG_CMD, shell=False, stdout=PIPE).stdout as pipe:
|
||||
commits = parse_gitlog(pipe)
|
||||
commits_by_date_author = groupby(commits, key=lambda x: (x.date, x.author))
|
||||
for (date, author), commits in commits_by_date_author:
|
||||
output(u'{0} {1}\n\n'.format(date, author).encode('utf-8'))
|
||||
for c in commits:
|
||||
output(u' * {0}{1}\n\n'.format(c.subject, c.ref).encode('utf-8'))
|
493
man/fdkaac.1
Normal file
493
man/fdkaac.1
Normal file
@ -0,0 +1,493 @@
|
||||
.TH FDKAAC 1 "November, 2013"
|
||||
.SH NAME
|
||||
.PP
|
||||
fdkaac \- command line frontend for libfdk\-aac encoder
|
||||
.SH SYNOPSIS
|
||||
.PP
|
||||
\f[B]fdkaac\f[] [OPTIONS][FILE]
|
||||
.SH DESCRIPTION
|
||||
.PP
|
||||
\f[B]fdkaac\f[] reads linear PCM audio in either WAV, raw PCM, or CAF
|
||||
format, and encodes it into either M4A / AAC file.
|
||||
.PP
|
||||
If the input file is "\-", data is read from stdin.
|
||||
Likewise, if the output file is "\-", data is written to stdout if one
|
||||
of streamable AAC transport formats are selected by \f[B]\-f\f[].
|
||||
.PP
|
||||
When CAF input and M4A output is used, tags in CAF file are copied into
|
||||
the resulting M4A.
|
||||
.SH OPTIONS
|
||||
.TP
|
||||
.B \-h, \-\-help
|
||||
Show command help
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-o <FILE>
|
||||
Output filename.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-p, \-\-profile <n>
|
||||
Target profile (MPEG4 audio object type, AOT)
|
||||
.RS
|
||||
.TP
|
||||
.B 2
|
||||
MPEG\-4 AAC LC (default)
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 5
|
||||
MPEG\-4 HE\-AAC (SBR)
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 29
|
||||
MPEG\-4 HE\-AAC v2 (SBR+PS)
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 23
|
||||
MPEG\-4 AAC LD
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 39
|
||||
MPEG\-4 AAC ELD
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 129
|
||||
MPEG\-2 AAC LC
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 132
|
||||
MPEG\-2 HE\-AAC (SBR)
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 156
|
||||
MPEG\-2 HE\-AAC v2 (SBR+PS)
|
||||
.RS
|
||||
.RE
|
||||
.RE
|
||||
.TP
|
||||
.B \-b, \-\-bitrate <n>
|
||||
Target bitrate (for CBR)
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-m, \-\-bitrate\-mode <n>
|
||||
Bitrate configuration mode.
|
||||
Available VBR quality value depends on other parameters such as profile,
|
||||
sample rate, or number of channels.
|
||||
.RS
|
||||
.TP
|
||||
.B 0
|
||||
CBR (default)
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 1\-5
|
||||
VBR (higher value \-> higher bitrate)
|
||||
.RS
|
||||
.RE
|
||||
.RE
|
||||
.TP
|
||||
.B \-w, \-\-bandwidth <n>
|
||||
Frequency bandwidth (lowpass cut\-off frequency) in Hz.
|
||||
Available on AAC LC only.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-a, \-\-afterburner <n>
|
||||
Configure afterburner mode.
|
||||
When enabled, quality is increased at the expense of additional
|
||||
computational workload.
|
||||
.RS
|
||||
.TP
|
||||
.B 0
|
||||
Off
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 1
|
||||
On (default)
|
||||
.RS
|
||||
.RE
|
||||
.RE
|
||||
.TP
|
||||
.B \-L, \-\-lowdelay\-sbr <n>
|
||||
Configure SBR activity on AAC ELD.
|
||||
.RS
|
||||
.TP
|
||||
.B \-1
|
||||
Use ELD SBR auto configuration
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 0
|
||||
Disable SBR on ELD (default)
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 1
|
||||
Enable SBR on ELD
|
||||
.RS
|
||||
.RE
|
||||
.RE
|
||||
.TP
|
||||
.B \-s, \-\-sbr\-ratio <n>
|
||||
Controls activation of downsampled SBR.
|
||||
.RS
|
||||
.TP
|
||||
.B 0
|
||||
Use lib default (default)
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 1
|
||||
Use downsampled SBR (default for ELD+SBR)
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 2
|
||||
Use dual\-rate SBR (default for HE\-AAC)
|
||||
.RS
|
||||
.RE
|
||||
.PP
|
||||
Dual\-rate SBR is what is normally used for HE\-AAC, where AAC is
|
||||
encoded at half the sample rate of SBR, hence "dual rate".
|
||||
On the other hand, downsampled SBR uses same sample rate for both of AAC
|
||||
and SBR (single rate), therefore downsampled SBR typically consumes more
|
||||
bitrate.
|
||||
.PP
|
||||
Downsampled SBR is newly introduced feature in FDK encoder library
|
||||
version 3.4.12.
|
||||
When libfdk\-aac in the system doesn\[aq]t support this, dual\-rate SBR
|
||||
will be used.
|
||||
When available, dual\-rate SBR is the default for HE\-AAC and
|
||||
downsampled SBR is the default for ELD+SBR.
|
||||
.PP
|
||||
Note that downsampled HE\-AAC is not so common as dual\-rate one.
|
||||
When downsampled HE\-AAC is selected, \f[B]fdkaac\f[] is forced to
|
||||
choose explicit hierarchical SBR signaling, which (at least) iTunes
|
||||
doesn\[aq]t accept.
|
||||
.RE
|
||||
.TP
|
||||
.B \-f, \-\-transport\-format <n>
|
||||
Transport format.
|
||||
Tagging and gapless playback is only available on M4A.
|
||||
Streaming to stdout is only available on others.
|
||||
.RS
|
||||
.TP
|
||||
.B 0
|
||||
M4A (default)
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 1
|
||||
ADIF
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 2
|
||||
ADTS
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 6
|
||||
LATM MCP=1
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 7
|
||||
LATM MCP=0
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 10
|
||||
LOAS/LATM (LATM within LOAS)
|
||||
.RS
|
||||
.RE
|
||||
.RE
|
||||
.TP
|
||||
.B \-C, \-\-adts\-crc\-check
|
||||
Add CRC protection on ADTS header.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-h, \-\-header\-period <n>
|
||||
StreamMuxConfig/PCE repetition period in the transport layer.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-G, \-\-gapless\-mode <n>
|
||||
Method to declare amount of encoder delay (and padding) in M4A
|
||||
container.
|
||||
These values are mandatory for proper gapless playback on player side.
|
||||
.RS
|
||||
.TP
|
||||
.B 0
|
||||
iTunSMPB (default)
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 1
|
||||
ISO standard (edts and sgpd)
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 2
|
||||
Both
|
||||
.RS
|
||||
.RE
|
||||
.RE
|
||||
.TP
|
||||
.B \-\-include\-sbr\-delay
|
||||
When specified, count SBR decoder delay in encoder delay.
|
||||
.RS
|
||||
.PP
|
||||
This is not iTunes compatible and will lead to gapless playback issue on
|
||||
LC only decoder, but this is the default behavior of FDK library.
|
||||
.PP
|
||||
Whether counting SBR decoder delay in encoder delay or not result in
|
||||
incompatibility in gapless playback.
|
||||
You should pick which one will work for your favorite player.
|
||||
.PP
|
||||
However, it\[aq]s better not to choose SBR at all if you want gapless
|
||||
playback.
|
||||
LC doesn\[aq]t have such issues.
|
||||
.RE
|
||||
.TP
|
||||
.B \-I, \-\-ignorelength
|
||||
Ignore length field of data chunk in input WAV file.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-S, \-\-silent
|
||||
Don\[aq]t print progress messages.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-\-moov\-before\-mdat
|
||||
Place moov box before mdat box in M4A container.
|
||||
This option might be important for some hardware players, that are known
|
||||
to refuse moov box placed after mdat box.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-R, \-\-raw
|
||||
Regard input as raw PCM.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-\-raw\-channels <n>
|
||||
Specify number of channels of raw input (default: 2)
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-\-raw\-rate <n>
|
||||
Specify sample rate of raw input (default: 44100)
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-\-raw\-format <spec>
|
||||
Specify sample format of raw input (default: "S16L").
|
||||
\f[B]Spec\f[] is as the following (case insensitive):
|
||||
.RS
|
||||
.TP
|
||||
.B 1st char \-\- type of sample
|
||||
\f[B]S\f[] (igned) | \f[B]U\f[] (nsigned) | \f[B]F\f[] (loat)
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 2nd part (in digits)
|
||||
bits per channel
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B Last char \-\- endianness (can be omitted)
|
||||
\f[B]L\f[] (ittle, default) | \f[B]B\f[] (ig)
|
||||
.RS
|
||||
.RE
|
||||
.RE
|
||||
.TP
|
||||
.B \-\-title <string>
|
||||
Set title tag.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-\-artist <string>
|
||||
Set artist tag.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-\-album <string>
|
||||
Set album tag.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-\-genre <string>
|
||||
Set genre tag.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-\-date <string>
|
||||
Set date tag.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-\-composer <string>
|
||||
Set composer tag.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-\-grouping <string>
|
||||
Set grouping tag.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-\-comment <string>
|
||||
Set comment tag.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-\-album\-artist <string>
|
||||
Set album artist tag.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-\-track <number[/total]>
|
||||
Set track tag, with or without number of total tracks.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-\-disk <number[/total]>
|
||||
Set disk tag, with or without number of total discs.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-\-tempo <n>
|
||||
Set tempo (BPM) tag.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-\-tag <fcc>:<value>
|
||||
Set iTunes predefined tag with explicit fourcc key and value.
|
||||
See <https://code.google.com/p/mp4v2/wiki/iTunesMetadata> for known
|
||||
predefined keys.
|
||||
You can omit first char of \f[B]fcc\f[] when it is the copyright sign.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-\-tag\-from\-file <fcc>:<filename>
|
||||
Same as \-\-tag, but set content of file as tag value.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-\-long\-tag <name>:<value>
|
||||
Set arbitrary tag as iTunes custom metadata.
|
||||
Stored in com.apple.iTunes field.
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B \-\-tag\-from\-json <filename[?dot_notation]>
|
||||
Read tags from JSON.
|
||||
By default, tags are assumed to be direct children of the root object in
|
||||
JSON.
|
||||
Optionally you can specify arbitrary dot notation to locate the object
|
||||
containing tags.
|
||||
.RS
|
||||
.RE
|
||||
.SH EXAMPLES
|
||||
.PP
|
||||
Encode WAV file into a M4A file.
|
||||
MPEG4 AAC LC, VBR quality 3:
|
||||
.IP
|
||||
.nf
|
||||
\f[C]
|
||||
fdkaac\ \-m3\ foo.wav
|
||||
\f[]
|
||||
.fi
|
||||
.PP
|
||||
Encode WAV file into a M4A file.
|
||||
MPEG4 HE\-AAC, bitrate 64kbps:
|
||||
.IP
|
||||
.nf
|
||||
\f[C]
|
||||
fdkaac\ \-p5\ \-b64\ foo.wav
|
||||
\f[]
|
||||
.fi
|
||||
.PP
|
||||
Piping from \f[B]ffmpeg\f[] (you need version supporting CAF output):
|
||||
.IP
|
||||
.nf
|
||||
\f[C]
|
||||
ffmpeg\ \-i\ foo.flac\ \-f\ caf\ \-\ |\ fdkaac\ \-b128\ \-\ \-o\ foo.m4a
|
||||
\f[]
|
||||
.fi
|
||||
.PP
|
||||
Import tags via json:
|
||||
.IP
|
||||
.nf
|
||||
\f[C]
|
||||
ffprobe\ \-v\ 0\ \-of\ json\ \-show_format\ foo.flac\ >foo.json
|
||||
|
||||
flac\ \-dc\ foo.flac\ |\ \\
|
||||
fdkaac\ \-\ \-ox.m4a\ \-m2\ \-\-import\-tag\-from\-json=foo.json?format.tags
|
||||
\f[]
|
||||
.fi
|
||||
.SH NOTES
|
||||
.PP
|
||||
Upto 32bit integer or 64bit floating point format is supported as input.
|
||||
However, FDK library is implemented based on fixed point math and only
|
||||
supports 16bit integer PCM.
|
||||
Therefore, be wary of clipping.
|
||||
You might want to dither/noise shape beforehand when your input has
|
||||
higher resolution.
|
||||
.PP
|
||||
Following channel layouts are supported by the encoder.
|
||||
.TP
|
||||
.B 1ch
|
||||
C
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 2ch
|
||||
L R
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 3ch
|
||||
C L R
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 4ch
|
||||
C L R Cs
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 5ch
|
||||
C L R Ls Rs
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 5.1ch
|
||||
C L R Ls Rs LFE
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 7.1ch (front)
|
||||
C Lc Rc L R Ls Rs LFE
|
||||
.RS
|
||||
.RE
|
||||
.TP
|
||||
.B 7.1ch (rear)
|
||||
C L R Ls Rs Rls Rrs LFE
|
||||
.RS
|
||||
.RE
|
||||
.SH AUTHORS
|
||||
nu774 <honeycomb77@gmail.com>.
|
82
src/aacenc.c
82
src/aacenc.c
@ -10,8 +10,20 @@
|
||||
#endif
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include "aacenc.h"
|
||||
|
||||
int aacenc_is_sbr_ratio_available()
|
||||
{
|
||||
#if AACENCODER_LIB_VL0 < 3 || (AACENCODER_LIB_VL0==3 && AACENCODER_LIB_VL1<4)
|
||||
return 0;
|
||||
#else
|
||||
LIB_INFO lib_info;
|
||||
aacenc_get_lib_info(&lib_info);
|
||||
return lib_info.version > 0x03040000;
|
||||
#endif
|
||||
}
|
||||
|
||||
int aacenc_is_sbr_active(const aacenc_param_t *params)
|
||||
{
|
||||
switch (params->profile) {
|
||||
@ -25,15 +37,42 @@ int aacenc_is_sbr_active(const aacenc_param_t *params)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int aacenc_is_dual_rate_sbr(const aacenc_param_t *params)
|
||||
{
|
||||
if (params->profile == AOT_PS || params->profile == AOT_MP2_PS)
|
||||
return 1;
|
||||
else if (params->profile == AOT_SBR || params->profile == AOT_MP2_SBR)
|
||||
return params->sbr_ratio == 0 || params->sbr_ratio == 2;
|
||||
else if (params->profile == AOT_ER_AAC_ELD && params->lowdelay_sbr)
|
||||
return params->sbr_ratio == 2;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void aacenc_get_lib_info(LIB_INFO *info)
|
||||
{
|
||||
LIB_INFO *lib_info = 0;
|
||||
lib_info = calloc(FDK_MODULE_LAST, sizeof(LIB_INFO));
|
||||
if (aacEncGetLibInfo(lib_info) == AACENC_OK) {
|
||||
int i;
|
||||
for (i = 0; i < FDK_MODULE_LAST; ++i) {
|
||||
if (lib_info[i].module_id == FDK_AACENC) {
|
||||
memcpy(info, &lib_info[i], sizeof(LIB_INFO));
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
free(lib_info);
|
||||
}
|
||||
|
||||
static
|
||||
int aacenc_channel_mode(const pcm_sample_description_t *format)
|
||||
{
|
||||
uint32_t chanmask = format->channel_mask;
|
||||
|
||||
if (format->channels_per_frame > 6)
|
||||
if (format->channels_per_frame > 8)
|
||||
return 0;
|
||||
if (!chanmask) {
|
||||
static uint32_t defaults[] = { 0x4, 0x3, 0x7, 0, 0x37, 0x3f };
|
||||
static uint32_t defaults[] = { 0x4, 0x3, 0x7, 0, 0x37, 0x3f, 0, 0x63f };
|
||||
chanmask = defaults[format->channels_per_frame - 1];
|
||||
}
|
||||
switch (chanmask) {
|
||||
@ -45,6 +84,10 @@ int aacenc_channel_mode(const pcm_sample_description_t *format)
|
||||
case 0x107: return MODE_1_2_1;
|
||||
case 0x607: return MODE_1_2_2;
|
||||
case 0x60f: return MODE_1_2_2_1;
|
||||
#if AACENCODER_LIB_VL0 > 3 || (AACENCODER_LIB_VL0==3 && AACENCODER_LIB_VL1>=4)
|
||||
case 0xff: return MODE_1_2_2_2_1;
|
||||
case 0x63f: return MODE_7_1_REAR_SURROUND;
|
||||
#endif
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@ -55,8 +98,11 @@ int aacenc_init(HANDLE_AACENCODER *encoder, const aacenc_param_t *params,
|
||||
{
|
||||
int channel_mode;
|
||||
int aot;
|
||||
LIB_INFO lib_info;
|
||||
|
||||
*encoder = 0;
|
||||
aacenc_get_lib_info(&lib_info);
|
||||
|
||||
if ((channel_mode = aacenc_channel_mode(format)) == 0) {
|
||||
fprintf(stderr, "ERROR: unsupported channel layout\n");
|
||||
goto FAIL;
|
||||
@ -82,13 +128,21 @@ int aacenc_init(HANDLE_AACENCODER *encoder, const aacenc_param_t *params,
|
||||
fprintf(stderr, "ERROR: unsupported sample rate\n");
|
||||
goto FAIL;
|
||||
}
|
||||
aacEncoder_SetParam(*encoder, AACENC_CHANNELMODE, channel_mode);
|
||||
if (aacEncoder_SetParam(*encoder, AACENC_CHANNELMODE,
|
||||
channel_mode) != AACENC_OK) {
|
||||
fprintf(stderr, "ERROR: unsupported channel mode\n");
|
||||
goto FAIL;
|
||||
}
|
||||
aacEncoder_SetParam(*encoder, AACENC_BANDWIDTH, params->bandwidth);
|
||||
aacEncoder_SetParam(*encoder, AACENC_CHANNELORDER, 1);
|
||||
aacEncoder_SetParam(*encoder, AACENC_AFTERBURNER, !!params->afterburner);
|
||||
|
||||
if (aot == AOT_ER_AAC_ELD && params->lowdelay_sbr)
|
||||
aacEncoder_SetParam(*encoder, AACENC_SBR_MODE, 1);
|
||||
aacEncoder_SetParam(*encoder, AACENC_SBR_MODE, params->lowdelay_sbr);
|
||||
|
||||
#if AACENCODER_LIB_VL0 > 3 || (AACENCODER_LIB_VL0==3 && AACENCODER_LIB_VL1>=4)
|
||||
if (lib_info.version > 0x03040000)
|
||||
aacEncoder_SetParam(*encoder, AACENC_SBR_RATIO, params->sbr_ratio);
|
||||
#endif
|
||||
|
||||
if (aacEncoder_SetParam(*encoder, AACENC_TRANSMUX,
|
||||
params->transport_format) != AACENC_OK) {
|
||||
@ -97,7 +151,7 @@ int aacenc_init(HANDLE_AACENCODER *encoder, const aacenc_param_t *params,
|
||||
}
|
||||
if (aacEncoder_SetParam(*encoder, AACENC_SIGNALING_MODE,
|
||||
params->sbr_signaling) != AACENC_OK) {
|
||||
fprintf(stderr, "ERROR: unsupported transport format\n");
|
||||
fprintf(stderr, "ERROR: failed to set SBR signaling mode\n");
|
||||
goto FAIL;
|
||||
}
|
||||
if (params->adts_crc_check)
|
||||
@ -124,7 +178,7 @@ FAIL:
|
||||
int aac_encode_frame(HANDLE_AACENCODER encoder,
|
||||
const pcm_sample_description_t *format,
|
||||
const int16_t *input, unsigned iframes,
|
||||
uint8_t **output, uint32_t *olen, uint32_t *osize)
|
||||
aacenc_frame_t *output)
|
||||
{
|
||||
uint32_t ilen = iframes * format->channels_per_frame;
|
||||
AACENC_BufDesc ibdesc = { 0 }, obdesc = { 0 };
|
||||
@ -143,11 +197,13 @@ int aac_encode_frame(HANDLE_AACENCODER encoder,
|
||||
|
||||
channel_mode = aacEncoder_GetParam(encoder, AACENC_CHANNELMODE);
|
||||
obytes = 6144 / 8 * channel_mode;
|
||||
if (!*output || *osize < obytes) {
|
||||
*osize = obytes;
|
||||
*output = realloc(*output, obytes);
|
||||
if (!output->data || output->capacity < obytes) {
|
||||
uint8_t *p = realloc(output->data, obytes);
|
||||
if (!p) return -1;
|
||||
output->capacity = obytes;
|
||||
output->data = p;
|
||||
}
|
||||
obufs[0] = *output;
|
||||
obufs[0] = output->data;
|
||||
obuf_sizes[0] = obytes;
|
||||
|
||||
iargs.numInSamples = ilen ? ilen : -1; /* -1 for signaling EOF */
|
||||
@ -167,6 +223,6 @@ int aac_encode_frame(HANDLE_AACENCODER encoder,
|
||||
fprintf(stderr, "ERROR: aacEncEncode() failed\n");
|
||||
return -1;
|
||||
}
|
||||
*olen = oargs.numOutBytes;
|
||||
return oargs.numInSamples;
|
||||
output->size = oargs.numOutBytes;
|
||||
return oargs.numInSamples / format->channels_per_frame;
|
||||
}
|
||||
|
14
src/aacenc.h
14
src/aacenc.h
@ -15,6 +15,7 @@
|
||||
unsigned bandwidth; \
|
||||
unsigned afterburner; \
|
||||
unsigned lowdelay_sbr; \
|
||||
unsigned sbr_ratio; \
|
||||
unsigned sbr_signaling; \
|
||||
unsigned transport_format; \
|
||||
unsigned adts_crc_check; \
|
||||
@ -24,8 +25,19 @@ typedef struct aacenc_param_t {
|
||||
AACENC_PARAMS
|
||||
} aacenc_param_t;
|
||||
|
||||
typedef struct aacenc_frame_t {
|
||||
uint8_t *data;
|
||||
uint32_t size, capacity;
|
||||
} aacenc_frame_t;
|
||||
|
||||
int aacenc_is_sbr_ratio_available();
|
||||
|
||||
int aacenc_is_sbr_active(const aacenc_param_t *params);
|
||||
|
||||
int aacenc_is_dual_rate_sbr(const aacenc_param_t *params);
|
||||
|
||||
void aacenc_get_lib_info(LIB_INFO *info);
|
||||
|
||||
int aacenc_init(HANDLE_AACENCODER *encoder, const aacenc_param_t *params,
|
||||
const pcm_sample_description_t *format,
|
||||
AACENC_InfoStruct *info);
|
||||
@ -33,6 +45,6 @@ int aacenc_init(HANDLE_AACENCODER *encoder, const aacenc_param_t *params,
|
||||
int aac_encode_frame(HANDLE_AACENCODER encoder,
|
||||
const pcm_sample_description_t *format,
|
||||
const int16_t *input, unsigned iframes,
|
||||
uint8_t **output, uint32_t *olen, uint32_t *osize);
|
||||
aacenc_frame_t *output);
|
||||
|
||||
#endif
|
||||
|
252
src/caf_reader.c
Normal file
252
src/caf_reader.c
Normal file
@ -0,0 +1,252 @@
|
||||
/*
|
||||
* Copyright (C) 2013 nu774
|
||||
* For conditions of distribution and use, see copyright notice in COPYING
|
||||
*/
|
||||
#if HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#if HAVE_STDINT_H
|
||||
# include <stdint.h>
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
#include "pcm_reader.h"
|
||||
#include "m4af.h"
|
||||
|
||||
typedef struct caf_reader_t {
|
||||
pcm_reader_vtbl_t *vtbl;
|
||||
pcm_sample_description_t sample_format;
|
||||
int64_t length;
|
||||
int64_t position;
|
||||
int64_t data_offset;
|
||||
pcm_io_context_t io;
|
||||
aacenc_tag_callback_t tag_callback;
|
||||
void *tag_ctx;
|
||||
uint8_t chanmap[8];
|
||||
} caf_reader_t;
|
||||
|
||||
static const pcm_sample_description_t *caf_get_format(pcm_reader_t *reader)
|
||||
{
|
||||
return &((caf_reader_t *)reader)->sample_format;
|
||||
}
|
||||
|
||||
static int64_t caf_get_length(pcm_reader_t *reader)
|
||||
{
|
||||
return ((caf_reader_t *)reader)->length;
|
||||
}
|
||||
|
||||
static int64_t caf_get_position(pcm_reader_t *reader)
|
||||
{
|
||||
return ((caf_reader_t *)reader)->position;
|
||||
}
|
||||
|
||||
static void caf_teardown(pcm_reader_t **reader)
|
||||
{
|
||||
free(*reader);
|
||||
*reader = 0;
|
||||
}
|
||||
|
||||
static
|
||||
uint32_t caf_next_chunk(caf_reader_t *reader, int64_t *chunk_size)
|
||||
{
|
||||
uint32_t fcc;
|
||||
if (pcm_scanb(&reader->io, "LQ", &fcc, chunk_size) == 2)
|
||||
return fcc;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static
|
||||
int caf_desc(caf_reader_t *reader, int64_t chunk_size)
|
||||
{
|
||||
double mSampleRate;
|
||||
uint32_t mFormatID, mFormatFlags, mBytesPerPacket, mFramesPerPacket,
|
||||
mChannelsPerFrame, mBitsPerChannel;
|
||||
pcm_sample_description_t *desc = &reader->sample_format;
|
||||
|
||||
ENSURE(chunk_size >= 32);
|
||||
TRY_IO(pcm_scanb(&reader->io, "QLLLLLL", &mSampleRate, &mFormatID,
|
||||
&mFormatFlags, &mBytesPerPacket, &mFramesPerPacket,
|
||||
&mChannelsPerFrame, &mBitsPerChannel) != 7);
|
||||
|
||||
ENSURE(mFormatID == M4AF_FOURCC('l','p','c','m'));
|
||||
ENSURE(mSampleRate && mBytesPerPacket &&
|
||||
mChannelsPerFrame >= 1 && mChannelsPerFrame <= 8 &&
|
||||
mBitsPerChannel && mFramesPerPacket == 1 &&
|
||||
mBytesPerPacket % mChannelsPerFrame == 0 &&
|
||||
mBytesPerPacket >= mChannelsPerFrame * ((mBitsPerChannel + 7) / 8));
|
||||
|
||||
desc->sample_rate = mSampleRate;
|
||||
desc->bits_per_channel = mBitsPerChannel;
|
||||
desc->bytes_per_frame = mBytesPerPacket;
|
||||
desc->channels_per_frame = mChannelsPerFrame;
|
||||
|
||||
switch (mFormatFlags) {
|
||||
case 0: desc->sample_type = PCM_TYPE_SINT_BE; break;
|
||||
case 1: desc->sample_type = PCM_TYPE_FLOAT_BE; break;
|
||||
case 2: desc->sample_type = PCM_TYPE_SINT; break;
|
||||
case 3: desc->sample_type = PCM_TYPE_FLOAT; break;
|
||||
default: goto FAIL;
|
||||
}
|
||||
|
||||
TRY_IO(pcm_skip(&reader->io, chunk_size - 32));
|
||||
return 0;
|
||||
FAIL:
|
||||
return -1;
|
||||
}
|
||||
|
||||
static
|
||||
int caf_info(caf_reader_t *reader, int64_t chunk_size)
|
||||
{
|
||||
char *buf, *key, *val, *end;
|
||||
size_t len;
|
||||
|
||||
if (chunk_size < 4 || (buf = malloc(chunk_size)) == 0)
|
||||
return -1;
|
||||
pcm_read(&reader->io, buf, chunk_size);
|
||||
key = buf + 4;
|
||||
end = buf + chunk_size;
|
||||
do {
|
||||
if ((val = key + strlen(key) + 1) < end) {
|
||||
len = strlen(val);
|
||||
if (reader->tag_callback)
|
||||
reader->tag_callback(reader->tag_ctx, key, val, len);
|
||||
key = val + len + 1;
|
||||
}
|
||||
} while (key < end && val < end);
|
||||
|
||||
if (reader->tag_callback)
|
||||
reader->tag_callback(reader->tag_ctx, 0, 0, 0);
|
||||
free(buf);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static
|
||||
int caf_read_frames(pcm_reader_t *preader, void *buffer, unsigned nframes)
|
||||
{
|
||||
int rc;
|
||||
unsigned i, j, nbytes;
|
||||
caf_reader_t *reader = (caf_reader_t *)preader;
|
||||
unsigned bpf = reader->sample_format.bytes_per_frame;
|
||||
unsigned nchannels = reader->sample_format.channels_per_frame;
|
||||
unsigned bpc = bpf / nchannels;
|
||||
uint8_t tmp[64]; /* enough room for maximum bpf: 8ch float64 */
|
||||
uint8_t *bp;
|
||||
uint8_t *chanmap = reader->chanmap;
|
||||
|
||||
if (nframes > reader->length - reader->position)
|
||||
nframes = reader->length - reader->position;
|
||||
nbytes = nframes * bpf;
|
||||
if (nbytes) {
|
||||
if ((rc = pcm_read(&reader->io, buffer, nbytes)) < 0)
|
||||
return -1;
|
||||
nframes = rc / bpf;
|
||||
for (bp = buffer, i = 0; i < nframes; ++i, bp += bpf) {
|
||||
memcpy(tmp, bp, bpf);
|
||||
for (j = 0; j < nchannels; ++j)
|
||||
memcpy(bp + bpc * j, tmp + bpc * chanmap[j], bpc);
|
||||
}
|
||||
reader->position += nframes;
|
||||
}
|
||||
if (nframes == 0) {
|
||||
/* fetch info after data chunk */
|
||||
uint32_t fcc;
|
||||
int64_t chunk_size;
|
||||
while ((fcc = caf_next_chunk(reader, &chunk_size)) != 0) {
|
||||
if (fcc == M4AF_FOURCC('i','n','f','o'))
|
||||
TRY_IO(caf_info(reader, chunk_size));
|
||||
else
|
||||
TRY_IO(pcm_skip(&reader->io, chunk_size));
|
||||
}
|
||||
}
|
||||
return nframes;
|
||||
FAIL:
|
||||
return 0;
|
||||
}
|
||||
|
||||
static
|
||||
int caf_parse(caf_reader_t *reader, int64_t *data_length)
|
||||
{
|
||||
uint32_t fcc;
|
||||
int64_t chunk_size;
|
||||
|
||||
*data_length = 0;
|
||||
|
||||
/* CAFFileHeader */
|
||||
TRY_IO(pcm_read32be(&reader->io, &fcc));
|
||||
ENSURE(fcc == M4AF_FOURCC('c','a','f','f'));
|
||||
TRY_IO(pcm_skip(&reader->io, 4)); /* mFileVersion, mFileFlags */
|
||||
|
||||
while ((fcc = caf_next_chunk(reader, &chunk_size)) != 0) {
|
||||
if (fcc == M4AF_FOURCC('d','e','s','c'))
|
||||
TRY_IO(caf_desc(reader, chunk_size));
|
||||
else if (fcc == M4AF_FOURCC('i','n','f','o'))
|
||||
TRY_IO(caf_info(reader, chunk_size));
|
||||
else if (fcc == M4AF_FOURCC('c','h','a','n')) {
|
||||
ENSURE(reader->sample_format.channels_per_frame);
|
||||
if (apple_chan_chunk(&reader->io, chunk_size,
|
||||
&reader->sample_format, reader->chanmap) < 0)
|
||||
goto FAIL;
|
||||
} else if (fcc == M4AF_FOURCC('d','a','t','a')) {
|
||||
TRY_IO(pcm_skip(&reader->io, 4)); /* mEditCount */
|
||||
*data_length = (chunk_size == ~0ULL) ? chunk_size : chunk_size - 4;
|
||||
reader->data_offset = pcm_tell(&reader->io);
|
||||
break;
|
||||
} else
|
||||
TRY_IO(pcm_skip(&reader->io, chunk_size));
|
||||
}
|
||||
ENSURE(reader->sample_format.channels_per_frame);
|
||||
ENSURE(fcc == M4AF_FOURCC('d','a','t','a'));
|
||||
return 0;
|
||||
FAIL:
|
||||
return -1;
|
||||
}
|
||||
|
||||
static pcm_reader_vtbl_t caf_vtable = {
|
||||
caf_get_format,
|
||||
caf_get_length,
|
||||
caf_get_position,
|
||||
caf_read_frames,
|
||||
caf_teardown
|
||||
};
|
||||
|
||||
pcm_reader_t *caf_open(pcm_io_context_t *io,
|
||||
aacenc_tag_callback_t tag_callback, void *tag_ctx)
|
||||
{
|
||||
caf_reader_t *reader = 0;
|
||||
int64_t data_length;
|
||||
unsigned bpf;
|
||||
|
||||
if ((reader = calloc(1, sizeof(caf_reader_t))) == 0)
|
||||
return 0;
|
||||
memcpy(&reader->io, io, sizeof(pcm_io_context_t));
|
||||
reader->tag_callback = tag_callback;
|
||||
reader->tag_ctx = tag_ctx;
|
||||
memcpy(reader->chanmap, "\000\001\002\003\004\005\006\007", 8);
|
||||
|
||||
if (caf_parse(reader, &data_length) < 0) {
|
||||
free(reader);
|
||||
return 0;
|
||||
}
|
||||
bpf = reader->sample_format.bytes_per_frame;
|
||||
|
||||
/* CAF uses -1 to indicate "unknown size" */
|
||||
if (data_length < 0 || data_length % bpf)
|
||||
reader->length = INT64_MAX;
|
||||
else
|
||||
reader->length = data_length / bpf;
|
||||
|
||||
if (reader->length == INT64_MAX) {
|
||||
if (pcm_seek(&reader->io, 0, SEEK_END) >= 0) {
|
||||
int64_t size = pcm_tell(&reader->io);
|
||||
if (size > 0)
|
||||
reader->length = (size - reader->data_offset) / bpf;
|
||||
pcm_seek(&reader->io, reader->data_offset, SEEK_SET);
|
||||
}
|
||||
}
|
||||
reader->vtbl = &caf_vtable;
|
||||
return (pcm_reader_t *)reader;
|
||||
}
|
241
src/catypes.h
Normal file
241
src/catypes.h
Normal file
@ -0,0 +1,241 @@
|
||||
#if !defined(__CoreAudioTypes_h__)
|
||||
#define __CoreAudioTypes_h__
|
||||
|
||||
enum { kVariableLengthArray = 1 };
|
||||
|
||||
typedef uint32_t AudioChannelLabel;
|
||||
typedef uint32_t AudioChannelLayoutTag;
|
||||
|
||||
struct AudioChannelDescription
|
||||
{
|
||||
AudioChannelLabel mChannelLabel;
|
||||
uint32_t mChannelFlags;
|
||||
float mCoordinates[3];
|
||||
};
|
||||
typedef struct AudioChannelDescription AudioChannelDescription;
|
||||
|
||||
struct AudioChannelLayout
|
||||
{
|
||||
AudioChannelLayoutTag mChannelLayoutTag;
|
||||
uint32_t mChannelBitmap;
|
||||
uint32_t mNumberChannelDescriptions;
|
||||
AudioChannelDescription mChannelDescriptions[kVariableLengthArray];
|
||||
};
|
||||
typedef struct AudioChannelLayout AudioChannelLayout;
|
||||
|
||||
enum
|
||||
{
|
||||
kAudioChannelLabel_Unknown = 0xFFFFFFFF, // unknown or unspecified other use
|
||||
kAudioChannelLabel_Unused = 0, // channel is present, but has no intended use or destination
|
||||
kAudioChannelLabel_UseCoordinates = 100, // channel is described by the mCoordinates fields.
|
||||
|
||||
kAudioChannelLabel_Left = 1,
|
||||
kAudioChannelLabel_Right = 2,
|
||||
kAudioChannelLabel_Center = 3,
|
||||
kAudioChannelLabel_LFEScreen = 4,
|
||||
kAudioChannelLabel_LeftSurround = 5, // WAVE: "Back Left"
|
||||
kAudioChannelLabel_RightSurround = 6, // WAVE: "Back Right"
|
||||
kAudioChannelLabel_LeftCenter = 7,
|
||||
kAudioChannelLabel_RightCenter = 8,
|
||||
kAudioChannelLabel_CenterSurround = 9, // WAVE: "Back Center" or plain "Rear Surround"
|
||||
kAudioChannelLabel_LeftSurroundDirect = 10, // WAVE: "Side Left"
|
||||
kAudioChannelLabel_RightSurroundDirect = 11, // WAVE: "Side Right"
|
||||
kAudioChannelLabel_TopCenterSurround = 12,
|
||||
kAudioChannelLabel_VerticalHeightLeft = 13, // WAVE: "Top Front Left"
|
||||
kAudioChannelLabel_VerticalHeightCenter = 14, // WAVE: "Top Front Center"
|
||||
kAudioChannelLabel_VerticalHeightRight = 15, // WAVE: "Top Front Right"
|
||||
|
||||
kAudioChannelLabel_TopBackLeft = 16,
|
||||
kAudioChannelLabel_TopBackCenter = 17,
|
||||
kAudioChannelLabel_TopBackRight = 18,
|
||||
|
||||
kAudioChannelLabel_RearSurroundLeft = 33,
|
||||
kAudioChannelLabel_RearSurroundRight = 34,
|
||||
kAudioChannelLabel_LeftWide = 35,
|
||||
kAudioChannelLabel_RightWide = 36,
|
||||
kAudioChannelLabel_LFE2 = 37,
|
||||
kAudioChannelLabel_LeftTotal = 38, // matrix encoded 4 channels
|
||||
kAudioChannelLabel_RightTotal = 39, // matrix encoded 4 channels
|
||||
kAudioChannelLabel_HearingImpaired = 40,
|
||||
kAudioChannelLabel_Narration = 41,
|
||||
kAudioChannelLabel_Mono = 42,
|
||||
kAudioChannelLabel_DialogCentricMix = 43,
|
||||
|
||||
kAudioChannelLabel_CenterSurroundDirect = 44, // back center, non diffuse
|
||||
|
||||
kAudioChannelLabel_Haptic = 45,
|
||||
|
||||
// first order ambisonic channels
|
||||
kAudioChannelLabel_Ambisonic_W = 200,
|
||||
kAudioChannelLabel_Ambisonic_X = 201,
|
||||
kAudioChannelLabel_Ambisonic_Y = 202,
|
||||
kAudioChannelLabel_Ambisonic_Z = 203,
|
||||
|
||||
// Mid/Side Recording
|
||||
kAudioChannelLabel_MS_Mid = 204,
|
||||
kAudioChannelLabel_MS_Side = 205,
|
||||
|
||||
// X-Y Recording
|
||||
kAudioChannelLabel_XY_X = 206,
|
||||
kAudioChannelLabel_XY_Y = 207,
|
||||
|
||||
// other
|
||||
kAudioChannelLabel_HeadphonesLeft = 301,
|
||||
kAudioChannelLabel_HeadphonesRight = 302,
|
||||
kAudioChannelLabel_ClickTrack = 304,
|
||||
kAudioChannelLabel_ForeignLanguage = 305,
|
||||
|
||||
// generic discrete channel
|
||||
kAudioChannelLabel_Discrete = 400,
|
||||
|
||||
// numbered discrete channel
|
||||
kAudioChannelLabel_Discrete_0 = (1L<<16) | 0,
|
||||
kAudioChannelLabel_Discrete_1 = (1L<<16) | 1,
|
||||
kAudioChannelLabel_Discrete_2 = (1L<<16) | 2,
|
||||
kAudioChannelLabel_Discrete_3 = (1L<<16) | 3,
|
||||
kAudioChannelLabel_Discrete_4 = (1L<<16) | 4,
|
||||
kAudioChannelLabel_Discrete_5 = (1L<<16) | 5,
|
||||
kAudioChannelLabel_Discrete_6 = (1L<<16) | 6,
|
||||
kAudioChannelLabel_Discrete_7 = (1L<<16) | 7,
|
||||
kAudioChannelLabel_Discrete_8 = (1L<<16) | 8,
|
||||
kAudioChannelLabel_Discrete_9 = (1L<<16) | 9,
|
||||
kAudioChannelLabel_Discrete_10 = (1L<<16) | 10,
|
||||
kAudioChannelLabel_Discrete_11 = (1L<<16) | 11,
|
||||
kAudioChannelLabel_Discrete_12 = (1L<<16) | 12,
|
||||
kAudioChannelLabel_Discrete_13 = (1L<<16) | 13,
|
||||
kAudioChannelLabel_Discrete_14 = (1L<<16) | 14,
|
||||
kAudioChannelLabel_Discrete_15 = (1L<<16) | 15,
|
||||
kAudioChannelLabel_Discrete_65535 = (1L<<16) | 65535
|
||||
};
|
||||
|
||||
#define AudioChannelLayoutTag_GetNumberOfChannels(layoutTag) \
|
||||
((uint32_t)((layoutTag) & 0x0000FFFF))
|
||||
|
||||
enum
|
||||
{
|
||||
kAudioChannelLayoutTag_UseChannelDescriptions = (0L<<16) | 0, // use the array of AudioChannelDescriptions to define the mapping.
|
||||
kAudioChannelLayoutTag_UseChannelBitmap = (1L<<16) | 0, // use the bitmap to define the mapping.
|
||||
|
||||
kAudioChannelLayoutTag_Mono = (100L<<16) | 1, // a standard mono stream
|
||||
kAudioChannelLayoutTag_Stereo = (101L<<16) | 2, // a standard stereo stream (L R) - implied playback
|
||||
kAudioChannelLayoutTag_StereoHeadphones = (102L<<16) | 2, // a standard stereo stream (L R) - implied headphone playbac
|
||||
kAudioChannelLayoutTag_MatrixStereo = (103L<<16) | 2, // a matrix encoded stereo stream (Lt, Rt)
|
||||
kAudioChannelLayoutTag_MidSide = (104L<<16) | 2, // mid/side recording
|
||||
kAudioChannelLayoutTag_XY = (105L<<16) | 2, // coincident mic pair (often 2 figure 8's)
|
||||
kAudioChannelLayoutTag_Binaural = (106L<<16) | 2, // binaural stereo (left, right)
|
||||
kAudioChannelLayoutTag_Ambisonic_B_Format = (107L<<16) | 4, // W, X, Y, Z
|
||||
|
||||
kAudioChannelLayoutTag_Quadraphonic = (108L<<16) | 4, // front left, front right, back left, back right
|
||||
|
||||
kAudioChannelLayoutTag_Pentagonal = (109L<<16) | 5, // left, right, rear left, rear right, center
|
||||
|
||||
kAudioChannelLayoutTag_Hexagonal = (110L<<16) | 6, // left, right, rear left, rear right, center, rear
|
||||
|
||||
kAudioChannelLayoutTag_Octagonal = (111L<<16) | 8, // front left, front right, rear left, rear right,
|
||||
// front center, rear center, side left, side right
|
||||
|
||||
kAudioChannelLayoutTag_Cube = (112L<<16) | 8, // left, right, rear left, rear right
|
||||
// top left, top right, top rear left, top rear right
|
||||
|
||||
// MPEG defined layouts
|
||||
kAudioChannelLayoutTag_MPEG_1_0 = kAudioChannelLayoutTag_Mono, // C
|
||||
kAudioChannelLayoutTag_MPEG_2_0 = kAudioChannelLayoutTag_Stereo, // L R
|
||||
kAudioChannelLayoutTag_MPEG_3_0_A = (113L<<16) | 3, // L R C
|
||||
kAudioChannelLayoutTag_MPEG_3_0_B = (114L<<16) | 3, // C L R
|
||||
kAudioChannelLayoutTag_MPEG_4_0_A = (115L<<16) | 4, // L R C Cs
|
||||
kAudioChannelLayoutTag_MPEG_4_0_B = (116L<<16) | 4, // C L R Cs
|
||||
kAudioChannelLayoutTag_MPEG_5_0_A = (117L<<16) | 5, // L R C Ls Rs
|
||||
kAudioChannelLayoutTag_MPEG_5_0_B = (118L<<16) | 5, // L R Ls Rs C
|
||||
kAudioChannelLayoutTag_MPEG_5_0_C = (119L<<16) | 5, // L C R Ls Rs
|
||||
kAudioChannelLayoutTag_MPEG_5_0_D = (120L<<16) | 5, // C L R Ls Rs
|
||||
kAudioChannelLayoutTag_MPEG_5_1_A = (121L<<16) | 6, // L R C LFE Ls Rs
|
||||
kAudioChannelLayoutTag_MPEG_5_1_B = (122L<<16) | 6, // L R Ls Rs C LFE
|
||||
kAudioChannelLayoutTag_MPEG_5_1_C = (123L<<16) | 6, // L C R Ls Rs LFE
|
||||
kAudioChannelLayoutTag_MPEG_5_1_D = (124L<<16) | 6, // C L R Ls Rs LFE
|
||||
kAudioChannelLayoutTag_MPEG_6_1_A = (125L<<16) | 7, // L R C LFE Ls Rs Cs
|
||||
kAudioChannelLayoutTag_MPEG_7_1_A = (126L<<16) | 8, // L R C LFE Ls Rs Lc Rc
|
||||
kAudioChannelLayoutTag_MPEG_7_1_B = (127L<<16) | 8, // C Lc Rc L R Ls Rs LFE (doc: IS-13818-7 MPEG2-AAC Table 3.1)
|
||||
kAudioChannelLayoutTag_MPEG_7_1_C = (128L<<16) | 8, // L R C LFE Ls Rs Rls Rrs
|
||||
kAudioChannelLayoutTag_Emagic_Default_7_1 = (129L<<16) | 8, // L R Ls Rs C LFE Lc Rc
|
||||
kAudioChannelLayoutTag_SMPTE_DTV = (130L<<16) | 8, // L R C LFE Ls Rs Lt Rt
|
||||
// (kAudioChannelLayoutTag_ITU_5_1 plus a matrix encoded stereo mix)
|
||||
|
||||
// ITU defined layouts
|
||||
kAudioChannelLayoutTag_ITU_1_0 = kAudioChannelLayoutTag_Mono, // C
|
||||
kAudioChannelLayoutTag_ITU_2_0 = kAudioChannelLayoutTag_Stereo, // L R
|
||||
|
||||
kAudioChannelLayoutTag_ITU_2_1 = (131L<<16) | 3, // L R Cs
|
||||
kAudioChannelLayoutTag_ITU_2_2 = (132L<<16) | 4, // L R Ls Rs
|
||||
kAudioChannelLayoutTag_ITU_3_0 = kAudioChannelLayoutTag_MPEG_3_0_A, // L R C
|
||||
kAudioChannelLayoutTag_ITU_3_1 = kAudioChannelLayoutTag_MPEG_4_0_A, // L R C Cs
|
||||
|
||||
kAudioChannelLayoutTag_ITU_3_2 = kAudioChannelLayoutTag_MPEG_5_0_A, // L R C Ls Rs
|
||||
kAudioChannelLayoutTag_ITU_3_2_1 = kAudioChannelLayoutTag_MPEG_5_1_A, // L R C LFE Ls Rs
|
||||
kAudioChannelLayoutTag_ITU_3_4_1 = kAudioChannelLayoutTag_MPEG_7_1_C, // L R C LFE Ls Rs Rls Rrs
|
||||
|
||||
// DVD defined layouts
|
||||
kAudioChannelLayoutTag_DVD_0 = kAudioChannelLayoutTag_Mono, // C (mono)
|
||||
kAudioChannelLayoutTag_DVD_1 = kAudioChannelLayoutTag_Stereo, // L R
|
||||
kAudioChannelLayoutTag_DVD_2 = kAudioChannelLayoutTag_ITU_2_1, // L R Cs
|
||||
kAudioChannelLayoutTag_DVD_3 = kAudioChannelLayoutTag_ITU_2_2, // L R Ls Rs
|
||||
kAudioChannelLayoutTag_DVD_4 = (133L<<16) | 3, // L R LFE
|
||||
kAudioChannelLayoutTag_DVD_5 = (134L<<16) | 4, // L R LFE Cs
|
||||
kAudioChannelLayoutTag_DVD_6 = (135L<<16) | 5, // L R LFE Ls Rs
|
||||
kAudioChannelLayoutTag_DVD_7 = kAudioChannelLayoutTag_MPEG_3_0_A, // L R C
|
||||
kAudioChannelLayoutTag_DVD_8 = kAudioChannelLayoutTag_MPEG_4_0_A, // L R C Cs
|
||||
kAudioChannelLayoutTag_DVD_9 = kAudioChannelLayoutTag_MPEG_5_0_A, // L R C Ls Rs
|
||||
kAudioChannelLayoutTag_DVD_10 = (136L<<16) | 4, // L R C LFE
|
||||
kAudioChannelLayoutTag_DVD_11 = (137L<<16) | 5, // L R C LFE Cs
|
||||
kAudioChannelLayoutTag_DVD_12 = kAudioChannelLayoutTag_MPEG_5_1_A, // L R C LFE Ls Rs
|
||||
// 13 through 17 are duplicates of 8 through 12.
|
||||
kAudioChannelLayoutTag_DVD_13 = kAudioChannelLayoutTag_DVD_8, // L R C Cs
|
||||
kAudioChannelLayoutTag_DVD_14 = kAudioChannelLayoutTag_DVD_9, // L R C Ls Rs
|
||||
kAudioChannelLayoutTag_DVD_15 = kAudioChannelLayoutTag_DVD_10, // L R C LFE
|
||||
kAudioChannelLayoutTag_DVD_16 = kAudioChannelLayoutTag_DVD_11, // L R C LFE Cs
|
||||
kAudioChannelLayoutTag_DVD_17 = kAudioChannelLayoutTag_DVD_12, // L R C LFE Ls Rs
|
||||
kAudioChannelLayoutTag_DVD_18 = (138L<<16) | 5, // L R Ls Rs LFE
|
||||
kAudioChannelLayoutTag_DVD_19 = kAudioChannelLayoutTag_MPEG_5_0_B, // L R Ls Rs C
|
||||
kAudioChannelLayoutTag_DVD_20 = kAudioChannelLayoutTag_MPEG_5_1_B, // L R Ls Rs C LFE
|
||||
|
||||
// These layouts are recommended for AudioUnit usage
|
||||
// These are the symmetrical layouts
|
||||
kAudioChannelLayoutTag_AudioUnit_4 = kAudioChannelLayoutTag_Quadraphonic,
|
||||
kAudioChannelLayoutTag_AudioUnit_5 = kAudioChannelLayoutTag_Pentagonal,
|
||||
kAudioChannelLayoutTag_AudioUnit_6 = kAudioChannelLayoutTag_Hexagonal,
|
||||
kAudioChannelLayoutTag_AudioUnit_8 = kAudioChannelLayoutTag_Octagonal,
|
||||
// These are the surround-based layouts
|
||||
kAudioChannelLayoutTag_AudioUnit_5_0 = kAudioChannelLayoutTag_MPEG_5_0_B, // L R Ls Rs C
|
||||
kAudioChannelLayoutTag_AudioUnit_6_0 = (139L<<16) | 6, // L R Ls Rs C Cs
|
||||
kAudioChannelLayoutTag_AudioUnit_7_0 = (140L<<16) | 7, // L R Ls Rs C Rls Rrs
|
||||
kAudioChannelLayoutTag_AudioUnit_7_0_Front = (148L<<16) | 7, // L R Ls Rs C Lc Rc
|
||||
kAudioChannelLayoutTag_AudioUnit_5_1 = kAudioChannelLayoutTag_MPEG_5_1_A, // L R C LFE Ls Rs
|
||||
kAudioChannelLayoutTag_AudioUnit_6_1 = kAudioChannelLayoutTag_MPEG_6_1_A, // L R C LFE Ls Rs Cs
|
||||
kAudioChannelLayoutTag_AudioUnit_7_1 = kAudioChannelLayoutTag_MPEG_7_1_C, // L R C LFE Ls Rs Rls Rrs
|
||||
kAudioChannelLayoutTag_AudioUnit_7_1_Front = kAudioChannelLayoutTag_MPEG_7_1_A, // L R C LFE Ls Rs Lc Rc
|
||||
|
||||
kAudioChannelLayoutTag_AAC_3_0 = kAudioChannelLayoutTag_MPEG_3_0_B, // C L R
|
||||
kAudioChannelLayoutTag_AAC_Quadraphonic = kAudioChannelLayoutTag_Quadraphonic, // L R Ls Rs
|
||||
kAudioChannelLayoutTag_AAC_4_0 = kAudioChannelLayoutTag_MPEG_4_0_B, // C L R Cs
|
||||
kAudioChannelLayoutTag_AAC_5_0 = kAudioChannelLayoutTag_MPEG_5_0_D, // C L R Ls Rs
|
||||
kAudioChannelLayoutTag_AAC_5_1 = kAudioChannelLayoutTag_MPEG_5_1_D, // C L R Ls Rs Lfe
|
||||
kAudioChannelLayoutTag_AAC_6_0 = (141L<<16) | 6, // C L R Ls Rs Cs
|
||||
kAudioChannelLayoutTag_AAC_6_1 = (142L<<16) | 7, // C L R Ls Rs Cs Lfe
|
||||
kAudioChannelLayoutTag_AAC_7_0 = (143L<<16) | 7, // C L R Ls Rs Rls Rrs
|
||||
kAudioChannelLayoutTag_AAC_7_1 = kAudioChannelLayoutTag_MPEG_7_1_B, // C Lc Rc L R Ls Rs Lfe
|
||||
kAudioChannelLayoutTag_AAC_Octagonal = (144L<<16) | 8, // C L R Ls Rs Rls Rrs Cs
|
||||
|
||||
kAudioChannelLayoutTag_TMH_10_2_std = (145L<<16) | 16, // L R C Vhc Lsd Rsd Ls Rs Vhl Vhr Lw Rw Csd Cs LFE1 LFE2
|
||||
kAudioChannelLayoutTag_TMH_10_2_full = (146L<<16) | 21, // TMH_10_2_std plus: Lc Rc HI VI Haptic
|
||||
|
||||
kAudioChannelLayoutTag_AC3_1_0_1 = (149L<<16) | 2, // C LFE
|
||||
kAudioChannelLayoutTag_AC3_3_0 = (150L<<16) | 3, // L C R
|
||||
kAudioChannelLayoutTag_AC3_3_1 = (151L<<16) | 4, // L C R Cs
|
||||
kAudioChannelLayoutTag_AC3_3_0_1 = (152L<<16) | 4, // L C R LFE
|
||||
kAudioChannelLayoutTag_AC3_2_1_1 = (153L<<16) | 4, // L R Cs LFE
|
||||
kAudioChannelLayoutTag_AC3_3_1_1 = (154L<<16) | 5, // L C R Cs LFE
|
||||
|
||||
kAudioChannelLayoutTag_DiscreteInOrder = (147L<<16) | 0, // needs to be ORed with the actual number of channels
|
||||
kAudioChannelLayoutTag_Unknown = 0xFFFF0000 // needs to be ORed with the actual number of channels
|
||||
};
|
||||
|
||||
#endif
|
@ -6,7 +6,10 @@
|
||||
#define COMPAT_H
|
||||
|
||||
#ifndef HAVE_FSEEKO
|
||||
# if _MSC_VER >= 1400
|
||||
# if HAVE_FSEEKO64
|
||||
# define fseeko fseeko64
|
||||
# define ftello ftello64
|
||||
# elif _MSC_VER >= 1400
|
||||
# define fseeko _fseeki64
|
||||
# define ftello _ftelli64
|
||||
# else
|
||||
@ -20,5 +23,6 @@ FILE *aacenc_fopen(const char *name, const char *mode);
|
||||
void aacenc_getmainargs(int *argc, char ***argv);
|
||||
char *aacenc_to_utf8(const char *s);
|
||||
int aacenc_fprintf(FILE *fp, const char *fmt, ...);
|
||||
const char *aacenc_basename(const char *path);
|
||||
|
||||
#endif
|
||||
|
@ -48,6 +48,16 @@ int aacenc_fprintf(FILE *fp, const char *fmt, ...)
|
||||
return cnt;
|
||||
}
|
||||
|
||||
/*
|
||||
* Different from POSIX basename() when path ends with /.
|
||||
* Since we use this only for a regular file, the difference doesn't matter.
|
||||
*/
|
||||
const char *aacenc_basename(const char *path)
|
||||
{
|
||||
const char *p = strrchr(path, '/');
|
||||
return p ? p + 1: path;
|
||||
}
|
||||
|
||||
#ifndef HAVE_ICONV
|
||||
char *aacenc_to_utf8(const char *s)
|
||||
{
|
||||
|
@ -12,8 +12,10 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
#include <assert.h>
|
||||
#include <io.h>
|
||||
#include <fcntl.h>
|
||||
#include <share.h>
|
||||
#include <sys/timeb.h>
|
||||
#include "compat.h"
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
@ -29,8 +31,13 @@ int __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, _startupinfo *);
|
||||
|
||||
int64_t aacenc_timer(void)
|
||||
{
|
||||
#if HAVE_STRUCT___TIMEB64
|
||||
struct __timeb64 tv;
|
||||
_ftime64(&tv);
|
||||
#else
|
||||
struct timeb tv;
|
||||
ftime(&tv);
|
||||
#endif
|
||||
return (int64_t)tv.time * 1000 + tv.millitm;
|
||||
}
|
||||
|
||||
@ -65,15 +72,29 @@ FILE *aacenc_fopen(const char *name, const char *mode)
|
||||
fp = (mode[0] == 'r') ? stdin : stdout;
|
||||
_setmode(_fileno(fp), _O_BINARY);
|
||||
} else {
|
||||
int share = _SH_DENYRW;
|
||||
if (strchr(mode, 'r') && !strchr(mode, '+'))
|
||||
share = _SH_DENYWR;
|
||||
codepage_decode_wchar(CP_UTF8, name, &wname);
|
||||
codepage_decode_wchar(CP_UTF8, mode, &wmode);
|
||||
fp = _wfopen(wname, wmode);
|
||||
fp = _wfsopen(wname, wmode, share);
|
||||
free(wname);
|
||||
free(wmode);
|
||||
}
|
||||
return fp;
|
||||
}
|
||||
|
||||
static char **__aacenc_argv__;
|
||||
|
||||
static
|
||||
void aacenc_free_mainargs(void)
|
||||
{
|
||||
char **p = __aacenc_argv__;
|
||||
for (; *p; ++p)
|
||||
free(*p);
|
||||
free(__aacenc_argv__);
|
||||
}
|
||||
|
||||
void aacenc_getmainargs(int *argc, char ***argv)
|
||||
{
|
||||
int i;
|
||||
@ -85,6 +106,8 @@ void aacenc_getmainargs(int *argc, char ***argv)
|
||||
for (i = 0; i < *argc; ++i)
|
||||
codepage_encode_wchar(CP_UTF8, wargv[i], &(*argv)[i]);
|
||||
(*argv)[*argc] = 0;
|
||||
__aacenc_argv__ = *argv;
|
||||
atexit(aacenc_free_mainargs);
|
||||
}
|
||||
|
||||
char *aacenc_to_utf8(const char *s)
|
||||
@ -92,6 +115,20 @@ char *aacenc_to_utf8(const char *s)
|
||||
return _strdup(s);
|
||||
}
|
||||
|
||||
#if defined(__MINGW32__) && !defined(HAVE__VSCPRINTF)
|
||||
int _vscprintf(const char *fmt, va_list ap)
|
||||
{
|
||||
static int (*fp_vscprintf)(const char *, va_list) = 0;
|
||||
if (!fp_vscprintf) {
|
||||
HANDLE h = GetModuleHandleA("msvcrt.dll");
|
||||
FARPROC fp = GetProcAddress(h, "_vscprintf");
|
||||
InterlockedCompareExchangePointer(&fp_vscprintf, fp, 0);
|
||||
}
|
||||
assert(fp_vscprintf);
|
||||
return fp_vscprintf(fmt, ap);
|
||||
}
|
||||
#endif
|
||||
|
||||
int aacenc_fprintf(FILE *fp, const char *fmt, ...)
|
||||
{
|
||||
va_list ap;
|
||||
@ -120,9 +157,21 @@ int aacenc_fprintf(FILE *fp, const char *fmt, ...)
|
||||
codepage_decode_wchar(CP_UTF8, s, &ws);
|
||||
free(s);
|
||||
fflush(fp);
|
||||
WriteConsoleW(fh, ws, cnt, &nw, 0);
|
||||
WriteConsoleW(fh, ws, wcslen(ws), &nw, 0);
|
||||
free(ws);
|
||||
}
|
||||
return cnt;
|
||||
}
|
||||
|
||||
const char *aacenc_basename(const char *path)
|
||||
{
|
||||
/*
|
||||
* Since path is encoded with UTF-8, naive usage of strrchr() shoule be safe.
|
||||
*/
|
||||
const char *p = strrchr(path, '/');
|
||||
const char *q = strrchr(path, '\\');
|
||||
const char *r = strrchr(path, ':');
|
||||
if (q > p) p = q;
|
||||
if (r > p) p = r;
|
||||
return p ? p + 1 : path;
|
||||
}
|
||||
|
221
src/extrapolater.c
Normal file
221
src/extrapolater.c
Normal file
@ -0,0 +1,221 @@
|
||||
/*
|
||||
* Copyright (C) 2013 nu774
|
||||
* For conditions of distribution and use, see copyright notice in COPYING
|
||||
*/
|
||||
#if HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
#if HAVE_STDINT_H
|
||||
# include <stdint.h>
|
||||
#endif
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
#include "pcm_reader.h"
|
||||
#include "lpc.h"
|
||||
|
||||
typedef int16_t sample_t;
|
||||
|
||||
typedef struct buffer_t {
|
||||
sample_t *data;
|
||||
unsigned count; /* count in frames */
|
||||
unsigned capacity; /* size in bytes */
|
||||
} buffer_t;
|
||||
|
||||
typedef struct extrapolater_t {
|
||||
pcm_reader_vtbl_t *vtbl;
|
||||
pcm_reader_t *src;
|
||||
pcm_sample_description_t format;
|
||||
buffer_t buffer[2];
|
||||
unsigned nbuffer;
|
||||
int (*process)(struct extrapolater_t *, void *, unsigned);
|
||||
} extrapolater_t;
|
||||
|
||||
#define LPC_ORDER 32
|
||||
|
||||
static inline pcm_reader_t *get_source(pcm_reader_t *reader)
|
||||
{
|
||||
return ((extrapolater_t *)reader)->src;
|
||||
}
|
||||
|
||||
static const
|
||||
pcm_sample_description_t *get_format(pcm_reader_t *reader)
|
||||
{
|
||||
return pcm_get_format(get_source(reader));
|
||||
}
|
||||
|
||||
static int64_t get_length(pcm_reader_t *reader)
|
||||
{
|
||||
return pcm_get_length(get_source(reader));
|
||||
}
|
||||
|
||||
static int64_t get_position(pcm_reader_t *reader)
|
||||
{
|
||||
return pcm_get_position(get_source(reader));
|
||||
}
|
||||
|
||||
static int realloc_buffer(buffer_t *bp, size_t size)
|
||||
{
|
||||
if (bp->capacity < size) {
|
||||
void *p = realloc(bp->data, size);
|
||||
if (!p) return -1;
|
||||
bp->data = p;
|
||||
bp->capacity = size;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void reverse_buffer(sample_t *data, unsigned nframes, unsigned nchannels)
|
||||
{
|
||||
unsigned i = 0, j = nchannels * (nframes - 1), n;
|
||||
|
||||
for (; i < j; i += nchannels, j -= nchannels) {
|
||||
for (n = 0; n < nchannels; ++n) {
|
||||
sample_t tmp = data[i + n];
|
||||
data[i + n] = data[j + n];
|
||||
data[j + n] = tmp;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static int fetch(extrapolater_t *self, unsigned nframes)
|
||||
{
|
||||
const pcm_sample_description_t *sfmt = pcm_get_format(self->src);
|
||||
buffer_t *bp = &self->buffer[self->nbuffer];
|
||||
int rc = 0;
|
||||
|
||||
if (realloc_buffer(bp, nframes * sfmt->bytes_per_frame) == 0) {
|
||||
rc = pcm_read_frames(self->src, bp->data, nframes);
|
||||
if (rc > 0) bp->count = rc;
|
||||
}
|
||||
if (rc > 0)
|
||||
self->nbuffer ^= 1;
|
||||
return rc <= 0 ? 0 : bp->count;
|
||||
}
|
||||
|
||||
static int extrapolate(extrapolater_t *self, const buffer_t *bp,
|
||||
void *dst, unsigned nframes)
|
||||
{
|
||||
const pcm_sample_description_t *sfmt = pcm_get_format(self->src);
|
||||
unsigned i, n = sfmt->channels_per_frame;
|
||||
float lpc[LPC_ORDER];
|
||||
|
||||
for (i = 0; i < n; ++i) {
|
||||
vorbis_lpc_from_data(bp->data + i, lpc, bp->count, LPC_ORDER, n);
|
||||
vorbis_lpc_predict(lpc, &bp->data[i + n * (bp->count - LPC_ORDER)],
|
||||
LPC_ORDER, (sample_t*)dst + i, nframes, n);
|
||||
}
|
||||
return nframes;
|
||||
}
|
||||
|
||||
static int process1(extrapolater_t *self, void *buffer, unsigned nframes);
|
||||
static int process2(extrapolater_t *self, void *buffer, unsigned nframes);
|
||||
static int process3(extrapolater_t *self, void *buffer, unsigned nframes);
|
||||
|
||||
static int process0(extrapolater_t *self, void *buffer, unsigned nframes)
|
||||
{
|
||||
const pcm_sample_description_t *sfmt = pcm_get_format(self->src);
|
||||
unsigned nchannels = sfmt->channels_per_frame;
|
||||
buffer_t *bp = &self->buffer[self->nbuffer];
|
||||
|
||||
if (fetch(self, nframes) < 2 * LPC_ORDER)
|
||||
memset(buffer, 0, nframes * sfmt->bytes_per_frame);
|
||||
else {
|
||||
reverse_buffer(bp->data, bp->count, nchannels);
|
||||
extrapolate(self, bp, buffer, nframes);
|
||||
reverse_buffer(buffer, nframes, nchannels);
|
||||
reverse_buffer(bp->data, bp->count, nchannels);
|
||||
}
|
||||
if (bp->count)
|
||||
self->process = process1;
|
||||
else {
|
||||
memset(bp->data, 0, nframes * sfmt->bytes_per_frame);
|
||||
bp->count = nframes;
|
||||
self->process = process2;
|
||||
}
|
||||
return nframes;
|
||||
}
|
||||
|
||||
static int process1(extrapolater_t *self, void *buffer, unsigned nframes)
|
||||
{
|
||||
const pcm_sample_description_t *sfmt = pcm_get_format(self->src);
|
||||
buffer_t *bp = &self->buffer[self->nbuffer ^ 1];
|
||||
|
||||
assert(bp->count <= nframes);
|
||||
memcpy(buffer, bp->data, bp->count * sfmt->bytes_per_frame);
|
||||
if (!fetch(self, nframes)) {
|
||||
buffer_t *bbp = &self->buffer[self->nbuffer];
|
||||
if (bp->count < 2 * LPC_ORDER) {
|
||||
size_t total = bp->count + bbp->count;
|
||||
if (bbp->count &&
|
||||
realloc_buffer(bbp, total * sfmt->bytes_per_frame) == 0 &&
|
||||
realloc_buffer(bp, total * sfmt->bytes_per_frame) == 0)
|
||||
{
|
||||
memcpy(bbp->data + bbp->count * sfmt->channels_per_frame,
|
||||
bp->data, bp->count * sfmt->bytes_per_frame);
|
||||
memcpy(bp->data, bbp->data, total * sfmt->bytes_per_frame);
|
||||
bp->count = total;
|
||||
}
|
||||
}
|
||||
if (bp->count >= 2 * LPC_ORDER)
|
||||
extrapolate(self, bp, bbp->data, nframes);
|
||||
else
|
||||
memset(bbp->data, 0, nframes * sfmt->bytes_per_frame);
|
||||
bbp->count = nframes;
|
||||
self->process = process2;
|
||||
}
|
||||
return bp->count;
|
||||
}
|
||||
|
||||
static int process2(extrapolater_t *self, void *buffer, unsigned nframes)
|
||||
{
|
||||
const pcm_sample_description_t *sfmt = pcm_get_format(self->src);
|
||||
buffer_t *bp = &self->buffer[self->nbuffer];
|
||||
if (bp->count < nframes)
|
||||
nframes = bp->count;
|
||||
memcpy(buffer, bp->data, nframes * sfmt->bytes_per_frame);
|
||||
if (bp->count > nframes)
|
||||
memmove(bp->data, bp->data + nframes * sfmt->channels_per_frame,
|
||||
(bp->count - nframes) * sfmt->bytes_per_frame);
|
||||
bp->count -= nframes;
|
||||
if (bp->count == 0)
|
||||
self->process = process3;
|
||||
return nframes;
|
||||
}
|
||||
|
||||
static int process3(extrapolater_t *self, void *buffer, unsigned nframes)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int read_frames(pcm_reader_t *reader, void *buffer, unsigned nframes)
|
||||
{
|
||||
extrapolater_t *self = (extrapolater_t *)reader;
|
||||
return self->process(self, buffer, nframes);
|
||||
}
|
||||
|
||||
static void teardown(pcm_reader_t **reader)
|
||||
{
|
||||
extrapolater_t *self = (extrapolater_t *)*reader;
|
||||
pcm_teardown(&self->src);
|
||||
free(self->buffer[0].data);
|
||||
free(self->buffer[1].data);
|
||||
free(self);
|
||||
*reader = 0;
|
||||
}
|
||||
|
||||
static pcm_reader_vtbl_t my_vtable = {
|
||||
get_format, get_length, get_position, read_frames, teardown
|
||||
};
|
||||
|
||||
pcm_reader_t *extrapolater_open(pcm_reader_t *reader)
|
||||
{
|
||||
extrapolater_t *self = 0;
|
||||
|
||||
if ((self = calloc(1, sizeof(extrapolater_t))) == 0)
|
||||
return 0;
|
||||
self->src = reader;
|
||||
self->vtbl = &my_vtable;
|
||||
self->process = process0;
|
||||
return (pcm_reader_t *)self;
|
||||
}
|
186
src/limiter.c
Normal file
186
src/limiter.c
Normal file
@ -0,0 +1,186 @@
|
||||
/*
|
||||
* Copyright (C) 2013 nu774
|
||||
* For conditions of distribution and use, see copyright notice in COPYING
|
||||
*/
|
||||
#if HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
#if HAVE_STDINT_H
|
||||
# include <stdint.h>
|
||||
#endif
|
||||
#include <stddef.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
#include <assert.h>
|
||||
#include "pcm_reader.h"
|
||||
#include "lpc.h"
|
||||
|
||||
typedef struct buffer_t {
|
||||
void *data;
|
||||
unsigned count;
|
||||
unsigned capacity;
|
||||
unsigned head;
|
||||
} buffer_t;
|
||||
|
||||
typedef struct limiter_t {
|
||||
pcm_reader_vtbl_t *vtbl;
|
||||
pcm_reader_t *src;
|
||||
pcm_sample_description_t format;
|
||||
int64_t position;
|
||||
buffer_t buffers[1];
|
||||
} limiter_t;
|
||||
|
||||
static inline pcm_reader_t *get_source(pcm_reader_t *reader)
|
||||
{
|
||||
return ((limiter_t *)reader)->src;
|
||||
}
|
||||
|
||||
static const
|
||||
pcm_sample_description_t *get_format(pcm_reader_t *reader)
|
||||
{
|
||||
return pcm_get_format(get_source(reader));
|
||||
}
|
||||
|
||||
static int64_t get_length(pcm_reader_t *reader)
|
||||
{
|
||||
return pcm_get_length(get_source(reader));
|
||||
}
|
||||
|
||||
static int64_t get_position(pcm_reader_t *reader)
|
||||
{
|
||||
return ((limiter_t *)reader)->position;
|
||||
}
|
||||
|
||||
static int reserve_buffer(buffer_t *bp, size_t required, unsigned unit)
|
||||
{
|
||||
if (bp->capacity < required) {
|
||||
unsigned newsize = 1;
|
||||
void *p;
|
||||
while (newsize < required)
|
||||
newsize <<= 1;
|
||||
p = realloc(bp->data, newsize * unit);
|
||||
if (!p) return -1;
|
||||
bp->data = p;
|
||||
bp->capacity = newsize;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int read_frames(pcm_reader_t *reader, void *buffer, unsigned nframes)
|
||||
{
|
||||
limiter_t *self = (limiter_t *)reader;
|
||||
unsigned i, n, res, nch = self->format.channels_per_frame;
|
||||
size_t bytes = nframes * pcm_get_format(self->src)->bytes_per_frame;
|
||||
buffer_t *ibp = &self->buffers[nch];
|
||||
float *obp = buffer;
|
||||
|
||||
do {
|
||||
if (reserve_buffer(ibp, bytes, 1) < 0)
|
||||
return -1;
|
||||
res = pcm_read_frames(self->src, ibp->data, nframes);
|
||||
for (n = 0; n < nch; ++n) {
|
||||
float *ip = (float *)ibp->data, *x;
|
||||
buffer_t *bp = &self->buffers[n];
|
||||
unsigned end, limit;
|
||||
if (reserve_buffer(bp, bp->count + res, sizeof(float)) < 0)
|
||||
return -1;
|
||||
x = bp->data;
|
||||
for (i = 0; i < res; ++i)
|
||||
x[bp->count++] = pcm_clip(ip[i * nch + n], -3.0, 3.0);
|
||||
limit = bp->count;
|
||||
if (limit > 0 && res > 0) {
|
||||
float last = x[limit - 1];
|
||||
for (; limit > 0 && x[limit-1] * last > 0; --limit)
|
||||
;
|
||||
}
|
||||
end = bp->head;
|
||||
while (end < limit) {
|
||||
unsigned start, peak_pos;
|
||||
float peak;
|
||||
for (peak_pos = end; peak_pos < limit; ++peak_pos)
|
||||
if (x[peak_pos] > 1.0f || x[peak_pos] < -1.0f)
|
||||
break;
|
||||
if (peak_pos == limit)
|
||||
break;
|
||||
start = peak_pos;
|
||||
peak = fabs(x[peak_pos]);
|
||||
while (start > bp->head && x[peak_pos] * x[start] >= 0.0f)
|
||||
--start;
|
||||
++start;
|
||||
for (end = peak_pos + 1; end < limit; ++end) {
|
||||
float y;
|
||||
if (x[peak_pos] * x[end] < 0.0f)
|
||||
break;
|
||||
y = fabs(x[end]);
|
||||
if (y > peak) {
|
||||
peak = y;
|
||||
peak_pos = end;
|
||||
}
|
||||
}
|
||||
if (peak < 2.0f) {
|
||||
float a = (peak - 1.0f) / (peak * peak);
|
||||
if (x[peak_pos] > 0.0f) a = -a;
|
||||
for (i = start; i < end; ++i)
|
||||
x[i] = x[i] + a * x[i] * x[i];
|
||||
} else {
|
||||
float u = peak, v = 1.0f;
|
||||
float a = (u - 2.0f * v) / (u * u * u);
|
||||
float b = (3.0f * v - 2.0f * u) / (u * u);
|
||||
if (x[peak_pos] < 0.0f) b = -b;
|
||||
for (i = start; i < end; ++i)
|
||||
x[i] = x[i] + b * x[i] * x[i] + a * x[i] * x[i] * x[i];
|
||||
}
|
||||
}
|
||||
bp->head = limit;
|
||||
}
|
||||
res = nframes;
|
||||
for (n = 0; n < nch; ++n)
|
||||
if (self->buffers[n].head < res)
|
||||
res = self->buffers[n].head;
|
||||
for (i = 0; i < res; ++i)
|
||||
for (n = 0; n < nch; ++n)
|
||||
*obp++ = ((float *)self->buffers[n].data)[i];
|
||||
if (res) {
|
||||
for (n = 0; n < nch; ++n) {
|
||||
buffer_t *bp = &self->buffers[n];
|
||||
float *p = bp->data;
|
||||
memmove(p, p + res, (bp->count - res) * sizeof(float));
|
||||
bp->count -= res;
|
||||
bp->head -= res;
|
||||
}
|
||||
}
|
||||
} while (res == 0 && self->buffers[0].count);
|
||||
self->position += res;
|
||||
return res;
|
||||
}
|
||||
|
||||
static void teardown(pcm_reader_t **reader)
|
||||
{
|
||||
int i;
|
||||
limiter_t *self = (limiter_t *)*reader;
|
||||
pcm_teardown(&self->src);
|
||||
for (i = 0; i < self->format.channels_per_frame + 1; ++i)
|
||||
free(self->buffers[i].data);
|
||||
free(self);
|
||||
*reader = 0;
|
||||
}
|
||||
|
||||
static pcm_reader_vtbl_t my_vtable = {
|
||||
get_format, get_length, get_position, read_frames, teardown
|
||||
};
|
||||
|
||||
pcm_reader_t *limiter_open(pcm_reader_t *reader)
|
||||
{
|
||||
limiter_t *self;
|
||||
int n = pcm_get_format(reader)->channels_per_frame;
|
||||
size_t size = sizeof(limiter_t) + offsetof(limiter_t, buffers[n + 1]);
|
||||
|
||||
if ((self = calloc(1, size)) == 0)
|
||||
return 0;
|
||||
self->src = reader;
|
||||
self->vtbl = &my_vtable;
|
||||
self->format = *pcm_get_format(reader);
|
||||
self->format.bits_per_channel = 32;
|
||||
return (pcm_reader_t *)self;
|
||||
}
|
169
src/lpc.c
Normal file
169
src/lpc.c
Normal file
@ -0,0 +1,169 @@
|
||||
/********************************************************************
|
||||
* *
|
||||
* THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
|
||||
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
|
||||
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
|
||||
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
|
||||
* *
|
||||
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009 *
|
||||
* by the Xiph.Org Foundation http://www.xiph.org/ *
|
||||
* *
|
||||
********************************************************************
|
||||
|
||||
function: LPC low level routines
|
||||
last mod: $Id: lpc.c 16227 2009-07-08 06:58:46Z xiphmont $
|
||||
|
||||
********************************************************************/
|
||||
|
||||
/* Some of these routines (autocorrelator, LPC coefficient estimator)
|
||||
are derived from code written by Jutta Degener and Carsten Bormann;
|
||||
thus we include their copyright below. The entirety of this file
|
||||
is freely redistributable on the condition that both of these
|
||||
copyright notices are preserved without modification. */
|
||||
|
||||
/* Preserved Copyright: *********************************************/
|
||||
|
||||
/* Copyright 1992, 1993, 1994 by Jutta Degener and Carsten Bormann,
|
||||
Technische Universita"t Berlin
|
||||
|
||||
Any use of this software is permitted provided that this notice is not
|
||||
removed and that neither the authors nor the Technische Universita"t
|
||||
Berlin are deemed to have made any representations as to the
|
||||
suitability of this software for any purpose nor are held responsible
|
||||
for any defects of this software. THERE IS ABSOLUTELY NO WARRANTY FOR
|
||||
THIS SOFTWARE.
|
||||
|
||||
As a matter of courtesy, the authors request to be informed about uses
|
||||
this software has found, about bugs in this software, and about any
|
||||
improvements that may be of general interest.
|
||||
|
||||
Berlin, 28.11.1994
|
||||
Jutta Degener
|
||||
Carsten Bormann
|
||||
|
||||
*********************************************************************/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#if HAVE_STDINT_H
|
||||
# include <stdint.h>
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
#include "lpc.h"
|
||||
#include "lpcm.h"
|
||||
|
||||
/* Autocorrelation LPC coeff generation algorithm invented by
|
||||
N. Levinson in 1947, modified by J. Durbin in 1959. */
|
||||
|
||||
/* Input : n elements of time doamin data
|
||||
Output: m lpc coefficients, excitation energy */
|
||||
|
||||
float vorbis_lpc_from_data(short *data,float *lpci,int n,int m,int stride){
|
||||
double *aut=malloc(sizeof(*aut)*(m+1));
|
||||
double *lpc=malloc(sizeof(*lpc)*(m));
|
||||
double error;
|
||||
double epsilon;
|
||||
int i,j;
|
||||
|
||||
/* autocorrelation, p+1 lag coefficients */
|
||||
j=m+1;
|
||||
while(j--){
|
||||
double d=0; /* double needed for accumulator depth */
|
||||
for(i=j;i<n;i++)d+=(double)data[i*stride]*data[(i-j)*stride]/1073741824.0;
|
||||
aut[j]=d;
|
||||
}
|
||||
|
||||
/* Generate lpc coefficients from autocorr values */
|
||||
|
||||
/* set our noise floor to about -100dB */
|
||||
error=aut[0] * (1. + 1e-10);
|
||||
epsilon=1e-9*aut[0]+1e-10;
|
||||
|
||||
for(i=0;i<m;i++){
|
||||
double r= -aut[i+1];
|
||||
|
||||
if(error<epsilon){
|
||||
memset(lpc+i,0,(m-i)*sizeof(*lpc));
|
||||
goto done;
|
||||
}
|
||||
|
||||
/* Sum up this iteration's reflection coefficient; note that in
|
||||
Vorbis we don't save it. If anyone wants to recycle this code
|
||||
and needs reflection coefficients, save the results of 'r' from
|
||||
each iteration. */
|
||||
|
||||
for(j=0;j<i;j++)r-=lpc[j]*aut[i-j];
|
||||
r/=error;
|
||||
|
||||
/* Update LPC coefficients and total error */
|
||||
|
||||
lpc[i]=r;
|
||||
for(j=0;j<i/2;j++){
|
||||
double tmp=lpc[j];
|
||||
|
||||
lpc[j]+=r*lpc[i-1-j];
|
||||
lpc[i-1-j]+=r*tmp;
|
||||
}
|
||||
if(i&1)lpc[j]+=lpc[j]*r;
|
||||
|
||||
error*=1.-r*r;
|
||||
|
||||
}
|
||||
|
||||
done:
|
||||
|
||||
/* slightly damp the filter */
|
||||
{
|
||||
double g = .99;
|
||||
double damp = g;
|
||||
for(j=0;j<m;j++){
|
||||
lpc[j]*=damp;
|
||||
damp*=g;
|
||||
}
|
||||
}
|
||||
|
||||
for(j=0;j<m;j++)lpci[j]=(float)lpc[j];
|
||||
|
||||
/* we need the error value to know how big an impulse to hit the
|
||||
filter with later */
|
||||
|
||||
free(aut);
|
||||
free(lpc);
|
||||
return error;
|
||||
}
|
||||
|
||||
void vorbis_lpc_predict(float *coeff,short *prime,int m,
|
||||
short *data,long n,int stride){
|
||||
|
||||
/* in: coeff[0...m-1] LPC coefficients
|
||||
prime[0...m-1] initial values (allocated size of n+m-1)
|
||||
out: data[0...n-1] data samples */
|
||||
|
||||
long i,j,o,p;
|
||||
float y;
|
||||
float *work=malloc(sizeof(*work)*(m+n));
|
||||
|
||||
if(!prime)
|
||||
for(i=0;i<m;i++)
|
||||
work[i]=0.f;
|
||||
else
|
||||
for(i=0;i<m;i++)
|
||||
work[i]=prime[i*stride]/32768.0f;
|
||||
|
||||
for(i=0;i<n;i++){
|
||||
y=0;
|
||||
o=i;
|
||||
p=m;
|
||||
for(j=0;j<m;j++)
|
||||
y-=work[o++]*coeff[--p];
|
||||
|
||||
work[o]=y;
|
||||
data[i*stride]=lrint(pcm_clip(y*32768.0,-32768.0,32767.0));
|
||||
}
|
||||
free(work);
|
||||
}
|
27
src/lpc.h
Normal file
27
src/lpc.h
Normal file
@ -0,0 +1,27 @@
|
||||
/********************************************************************
|
||||
* *
|
||||
* THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
|
||||
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
|
||||
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
|
||||
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
|
||||
* *
|
||||
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007 *
|
||||
* by the Xiph.Org Foundation http://www.xiph.org/ *
|
||||
* *
|
||||
********************************************************************
|
||||
|
||||
function: LPC low level routines
|
||||
last mod: $Id: lpc.h 16037 2009-05-26 21:10:58Z xiphmont $
|
||||
|
||||
********************************************************************/
|
||||
|
||||
#ifndef _V_LPC_H_
|
||||
#define _V_LPC_H_
|
||||
|
||||
/* simple linear scale LPC code */
|
||||
extern float vorbis_lpc_from_data(short *data,float *lpc,int n,int m,int stride);
|
||||
|
||||
extern void vorbis_lpc_predict(float *coeff,short *prime,int m,
|
||||
short *data,long n,int stride);
|
||||
|
||||
#endif
|
234
src/lpcm.c
234
src/lpcm.c
@ -1,234 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2013 nu774
|
||||
* For conditions of distribution and use, see copyright notice in COPYING
|
||||
*/
|
||||
#if HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
#if HAVE_STDINT_H
|
||||
# include <stdint.h>
|
||||
#endif
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
#include "lpcm.h"
|
||||
#include "m4af_endian.h"
|
||||
|
||||
#ifdef _MSC_VER
|
||||
# define inline __inline
|
||||
# ifdef _M_IX86
|
||||
inline int lrint(double x)
|
||||
{
|
||||
int n;
|
||||
_asm {
|
||||
fld x
|
||||
fistp n
|
||||
}
|
||||
return n;
|
||||
}
|
||||
# else
|
||||
# include <emmintrin.h>
|
||||
inline int lrint(double x)
|
||||
{
|
||||
return _mm_cvtsd_si32(_mm_load_sd(&x));
|
||||
}
|
||||
# endif
|
||||
#endif
|
||||
|
||||
inline double pcm_clip(double n, double min_value, double max_value)
|
||||
{
|
||||
if (n < min_value)
|
||||
return min_value;
|
||||
else if (n > max_value)
|
||||
return max_value;
|
||||
return n;
|
||||
}
|
||||
inline float pcm_i2f(int32_t n)
|
||||
{
|
||||
union {
|
||||
int32_t ivalue;
|
||||
float fvalue;
|
||||
} u;
|
||||
u.ivalue = n;
|
||||
return u.fvalue;
|
||||
}
|
||||
inline double pcm_i2d(int64_t n)
|
||||
{
|
||||
union {
|
||||
int64_t ivalue;
|
||||
double fvalue;
|
||||
} u;
|
||||
u.ivalue = n;
|
||||
return u.fvalue;
|
||||
}
|
||||
inline int16_t pcm_quantize_s32(int32_t n)
|
||||
{
|
||||
n = ((n >> 15) + 1) >> 1;
|
||||
return (n == 0x8000) ? 0x7fff : n;
|
||||
}
|
||||
inline int16_t pcm_quantize_f64(double v)
|
||||
{
|
||||
return (int16_t)lrint(pcm_clip(v * 32768.0, -32768.0, 32767.0));
|
||||
}
|
||||
inline int16_t pcm_s8_to_s16(int8_t n)
|
||||
{
|
||||
return n << 8;
|
||||
}
|
||||
inline int16_t pcm_u8_to_s16(uint8_t n)
|
||||
{
|
||||
return (n << 8) ^ 0x8000;
|
||||
}
|
||||
inline int16_t pcm_s16le_to_s16(int16_t n)
|
||||
{
|
||||
return m4af_ltoh16(n);
|
||||
}
|
||||
inline int16_t pcm_s16be_to_s16(int16_t n)
|
||||
{
|
||||
return m4af_btoh16(n);
|
||||
}
|
||||
inline int16_t pcm_u16le_to_s16(uint16_t n)
|
||||
{
|
||||
return m4af_ltoh16(n) ^ 0x8000;
|
||||
}
|
||||
inline int16_t pcm_u16be_to_s16(uint16_t n)
|
||||
{
|
||||
return m4af_btoh16(n) ^ 0x8000;
|
||||
}
|
||||
inline int32_t pcm_s24le_to_s32(uint8_t *p)
|
||||
{
|
||||
return p[0]<<8 | p[1]<<16 | p[2]<<24;
|
||||
}
|
||||
inline int32_t pcm_s24be_to_s32(uint8_t *p)
|
||||
{
|
||||
return p[0]<<24 | p[1]<<16 | p[2]<<8;
|
||||
}
|
||||
inline int32_t pcm_u24le_to_s32(uint8_t *p)
|
||||
{
|
||||
return pcm_s24le_to_s32(p) ^ 0x80000000;
|
||||
}
|
||||
inline int32_t pcm_u24be_to_s32(uint8_t *p)
|
||||
{
|
||||
return pcm_s24be_to_s32(p) ^ 0x80000000;
|
||||
}
|
||||
inline int16_t pcm_s24le_to_s16(uint8_t *p)
|
||||
{
|
||||
return pcm_quantize_s32(pcm_s24le_to_s32(p));
|
||||
}
|
||||
inline int16_t pcm_s24be_to_s16(uint8_t *p)
|
||||
{
|
||||
return pcm_quantize_s32(pcm_s24be_to_s32(p));
|
||||
}
|
||||
inline int16_t pcm_u24le_to_s16(uint8_t *p)
|
||||
{
|
||||
return pcm_quantize_s32(pcm_u24le_to_s32(p));
|
||||
}
|
||||
inline int16_t pcm_u24be_to_s16(uint8_t *p)
|
||||
{
|
||||
return pcm_quantize_s32(pcm_u24be_to_s32(p));
|
||||
}
|
||||
inline int16_t pcm_s32le_to_s16(int32_t n)
|
||||
{
|
||||
return pcm_quantize_s32(m4af_ltoh32(n));
|
||||
}
|
||||
inline int16_t pcm_s32be_to_s16(int32_t n)
|
||||
{
|
||||
return pcm_quantize_s32(m4af_btoh32(n));
|
||||
}
|
||||
inline int16_t pcm_u32le_to_s16(int32_t n)
|
||||
{
|
||||
return pcm_quantize_s32(m4af_ltoh32(n) ^ 0x80000000);
|
||||
}
|
||||
inline int16_t pcm_u32be_to_s16(int32_t n)
|
||||
{
|
||||
return pcm_quantize_s32(m4af_btoh32(n) ^ 0x80000000);
|
||||
}
|
||||
inline int16_t pcm_f32le_to_s16(int32_t n)
|
||||
{
|
||||
return pcm_quantize_f64(pcm_i2f(m4af_ltoh32(n)));
|
||||
}
|
||||
inline int16_t pcm_f32be_to_s16(int32_t n)
|
||||
{
|
||||
return pcm_quantize_f64(pcm_i2f(m4af_btoh32(n)));
|
||||
}
|
||||
inline int16_t pcm_f64le_to_s16(int64_t n)
|
||||
{
|
||||
return pcm_quantize_f64(pcm_i2d(m4af_ltoh64(n)));
|
||||
}
|
||||
inline int16_t pcm_f64be_to_s16(int64_t n)
|
||||
{
|
||||
return pcm_quantize_f64(pcm_i2d(m4af_btoh64(n)));
|
||||
}
|
||||
|
||||
int pcm_convert_to_native_sint16(const pcm_sample_description_t *format,
|
||||
const void *input, uint32_t nframes,
|
||||
int16_t **result, uint32_t *osize)
|
||||
{
|
||||
#define CONVERT(type, conv) \
|
||||
do { \
|
||||
unsigned i; \
|
||||
type *ip = (type *)input; \
|
||||
for (i = 0; i < count; ++i) { \
|
||||
(*result)[i] = conv(ip[i]); \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
#define CONVERT_BYTES(conv) \
|
||||
do { \
|
||||
unsigned i, bytes_per_channel; \
|
||||
uint8_t *ip = (uint8_t *)input; \
|
||||
bytes_per_channel = PCM_BYTES_PER_CHANNEL(format); \
|
||||
for (i = 0; i < count; ++i) { \
|
||||
(*result)[i] = conv(ip); \
|
||||
ip += bytes_per_channel; \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
uint32_t count = nframes * format->channels_per_frame;
|
||||
if (!count)
|
||||
return 0;
|
||||
if (!*result || *osize < count) {
|
||||
*osize = count;
|
||||
*result = realloc(*result, count * sizeof(int16_t));
|
||||
}
|
||||
|
||||
switch (PCM_BYTES_PER_CHANNEL(format) | format->sample_type<<4) {
|
||||
case 1 | PCM_TYPE_SINT<<4:
|
||||
CONVERT(int8_t, pcm_s8_to_s16); break;
|
||||
case 1 | PCM_TYPE_UINT<<4:
|
||||
CONVERT(uint8_t, pcm_u8_to_s16); break;
|
||||
case 2 | PCM_TYPE_SINT<<4:
|
||||
CONVERT(int16_t, pcm_s16le_to_s16); break;
|
||||
case 2 | PCM_TYPE_UINT<<4:
|
||||
CONVERT(uint16_t, pcm_u16le_to_s16); break;
|
||||
case 2 | PCM_TYPE_SINT_BE<<4:
|
||||
CONVERT(int16_t, pcm_s16be_to_s16); break;
|
||||
case 2 | PCM_TYPE_UINT_BE<<4:
|
||||
CONVERT(int16_t, pcm_u16be_to_s16); break;
|
||||
case 3 | PCM_TYPE_SINT<<4:
|
||||
CONVERT_BYTES(pcm_s24le_to_s16); break;
|
||||
case 3 | PCM_TYPE_UINT<<4:
|
||||
CONVERT_BYTES(pcm_u24le_to_s16); break;
|
||||
case 3 | PCM_TYPE_SINT_BE<<4:
|
||||
CONVERT_BYTES(pcm_s24be_to_s16); break;
|
||||
case 3 | PCM_TYPE_UINT_BE<<4:
|
||||
CONVERT_BYTES(pcm_u24be_to_s16); break;
|
||||
case 4 | PCM_TYPE_SINT<<4:
|
||||
CONVERT(int32_t, pcm_s32le_to_s16); break;
|
||||
case 4 | PCM_TYPE_UINT<<4:
|
||||
CONVERT(uint32_t, pcm_u32le_to_s16); break;
|
||||
case 4 | PCM_TYPE_FLOAT<<4:
|
||||
CONVERT(int32_t, pcm_f32le_to_s16); break;
|
||||
case 4 | PCM_TYPE_SINT_BE<<4:
|
||||
CONVERT(int32_t, pcm_s32be_to_s16); break;
|
||||
case 4 | PCM_TYPE_UINT_BE<<4:
|
||||
CONVERT(uint32_t, pcm_u32be_to_s16); break;
|
||||
case 4 | PCM_TYPE_FLOAT_BE<<4:
|
||||
CONVERT(int32_t, pcm_f32be_to_s16); break;
|
||||
case 8 | PCM_TYPE_FLOAT<<4:
|
||||
CONVERT(int64_t, pcm_f64le_to_s16); break;
|
||||
case 8 | PCM_TYPE_FLOAT_BE<<4:
|
||||
CONVERT(int64_t, pcm_f64be_to_s16); break;
|
||||
default:
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
33
src/lpcm.h
33
src/lpcm.h
@ -31,7 +31,34 @@ typedef struct pcm_sample_description_t {
|
||||
#define PCM_BYTES_PER_CHANNEL(desc) \
|
||||
((desc)->bytes_per_frame / (desc)->channels_per_frame)
|
||||
|
||||
int pcm_convert_to_native_sint16(const pcm_sample_description_t *format,
|
||||
const void *input, uint32_t nframes,
|
||||
int16_t **result, uint32_t *osize);
|
||||
#if defined(_MSC_VER) && _MSC_VER < 1800
|
||||
# ifdef _M_IX86
|
||||
static inline int lrint(double x)
|
||||
{
|
||||
int n;
|
||||
_asm {
|
||||
fld x
|
||||
fistp n
|
||||
}
|
||||
return n;
|
||||
}
|
||||
# else
|
||||
# include <emmintrin.h>
|
||||
static inline int lrint(double x)
|
||||
{
|
||||
return _mm_cvtsd_si32(_mm_load_sd(&x));
|
||||
}
|
||||
# endif
|
||||
#endif
|
||||
|
||||
static
|
||||
inline double pcm_clip(double n, double min_value, double max_value)
|
||||
{
|
||||
if (n < min_value)
|
||||
return min_value;
|
||||
else if (n > max_value)
|
||||
return max_value;
|
||||
return n;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
689
src/m4af.c
689
src/m4af.c
File diff suppressed because it is too large
Load Diff
77
src/m4af.h
77
src/m4af.h
@ -8,8 +8,10 @@
|
||||
#define M4AF_FOURCC(a,b,c,d) (((a)<<24)|((b)<<16)|((c)<<8)|(d))
|
||||
|
||||
enum m4af_error_code {
|
||||
M4AF_IO_ERROR = 1,
|
||||
M4AF_NO_MEMORY,
|
||||
M4AF_IO_ERROR = -1,
|
||||
M4AF_NO_MEMORY = -2,
|
||||
M4AF_FORMAT_ERROR = -3,
|
||||
M4AF_NOT_SUPPORTED = -4,
|
||||
};
|
||||
|
||||
enum m4af_itmf_tag {
|
||||
@ -50,65 +52,80 @@ enum m4af_codec_type {
|
||||
M4AF_CODEC_TEXT = M4AF_FOURCC('t','e','x','t'),
|
||||
};
|
||||
|
||||
enum m4af_priming_mode {
|
||||
M4AF_PRIMING_MODE_ITUNSMPB = 1,
|
||||
M4AF_PRIMING_MODE_EDTS = 2,
|
||||
M4AF_PRIMING_MODE_BOTH = 3
|
||||
};
|
||||
|
||||
typedef int (*m4af_read_callback)(void *cookie, void *buffer, uint32_t size);
|
||||
typedef int (*m4af_write_callback)(void *cookie, const void *data,
|
||||
uint32_t size);
|
||||
typedef int (*m4af_seek_callback)(void *cookie, int64_t off, int whence);
|
||||
typedef int64_t (*m4af_tell_callback)(void *cookie);
|
||||
|
||||
typedef struct m4af_io_callbacks_t {
|
||||
m4af_read_callback read;
|
||||
m4af_write_callback write;
|
||||
m4af_seek_callback seek;
|
||||
m4af_tell_callback tell;
|
||||
} m4af_io_callbacks_t;
|
||||
|
||||
typedef struct m4af_writer_t m4af_writer_t;
|
||||
typedef struct m4af_itmf_entry_t {
|
||||
uint32_t fcc;
|
||||
char *name;
|
||||
uint32_t type_code;
|
||||
char *data;
|
||||
uint32_t data_size;
|
||||
} m4af_itmf_entry_t;
|
||||
|
||||
m4af_writer_t *m4af_create(uint32_t codec, uint32_t timescale,
|
||||
m4af_io_callbacks_t *io, void *io_cookie);
|
||||
typedef struct m4af_ctx_t m4af_ctx_t;
|
||||
|
||||
void m4af_teardown(m4af_writer_t **ctx);
|
||||
|
||||
int m4af_begin_write(m4af_writer_t *ctx);
|
||||
m4af_ctx_t *m4af_create(uint32_t codec, uint32_t timescale,
|
||||
m4af_io_callbacks_t *io, void *io_cookie);
|
||||
|
||||
int m4af_finalize(m4af_writer_t *ctx);
|
||||
int m4af_begin_write(m4af_ctx_t *ctx);
|
||||
|
||||
/* can be called before m4af_write_sample() */
|
||||
void m4af_set_fixed_frame_duration(m4af_writer_t *ctx, int track_idx,
|
||||
uint32_t length);
|
||||
int m4af_finalize(m4af_ctx_t *ctx, int optimize);
|
||||
|
||||
/* can be called between mfa4_begin_write() and m4af_finalize() */
|
||||
int m4af_write_sample(m4af_writer_t *ctx, int track_idx, const void *data,
|
||||
void m4af_teardown(m4af_ctx_t **ctx);
|
||||
|
||||
int m4af_write_sample(m4af_ctx_t *ctx, uint32_t track_idx, const void *data,
|
||||
uint32_t size, uint32_t duration);
|
||||
|
||||
int m4af_set_decoder_specific_info(m4af_ctx_t *ctx, uint32_t track_idx,
|
||||
uint8_t *data, uint32_t size);
|
||||
|
||||
/* the following can be called at anytime before m4af_finalize() */
|
||||
void m4af_set_vbr_mode(m4af_ctx_t *ctx, uint32_t track_idx, int is_vbr);
|
||||
|
||||
int m4af_decoder_specific_info(m4af_writer_t *ctx, int track_idx,
|
||||
uint8_t *data, uint32_t size);
|
||||
|
||||
void m4af_set_priming(m4af_writer_t *ctx, int track_idx,
|
||||
void m4af_set_priming(m4af_ctx_t *ctx, uint32_t track_idx,
|
||||
uint32_t encoder_delay, uint32_t padding);
|
||||
|
||||
int m4af_add_itmf_long_tag(m4af_writer_t *ctx, const char *name,
|
||||
void m4af_set_priming_mode(m4af_ctx_t *ctx, int mode);
|
||||
|
||||
void m4af_set_fixed_frame_duration(m4af_ctx_t *ctx, uint32_t track_idx,
|
||||
uint32_t length);
|
||||
|
||||
int m4af_add_itmf_long_tag(m4af_ctx_t *ctx, const char *name,
|
||||
const char *data);
|
||||
|
||||
int m4af_add_itmf_short_tag(m4af_writer_t *ctx, uint32_t type,
|
||||
uint32_t type_code, const void *data,
|
||||
uint32_t data_size);
|
||||
int m4af_add_itmf_short_tag(m4af_ctx_t *ctx, uint32_t fcc, uint32_t type_code,
|
||||
const void *data, uint32_t data_size);
|
||||
|
||||
int m4af_add_itmf_string_tag(m4af_writer_t *ctx, uint32_t type,
|
||||
const char *data);
|
||||
int m4af_add_itmf_string_tag(m4af_ctx_t *ctx, uint32_t fcc, const char *data);
|
||||
|
||||
int m4af_add_itmf_int8_tag(m4af_writer_t *ctx, uint32_t type, int value);
|
||||
int m4af_add_itmf_int8_tag(m4af_ctx_t *ctx, uint32_t fcc, int value);
|
||||
|
||||
int m4af_add_itmf_int16_tag(m4af_writer_t *ctx, uint32_t type, int value);
|
||||
int m4af_add_itmf_int16_tag(m4af_ctx_t *ctx, uint32_t fcc, int value);
|
||||
|
||||
int m4af_add_itmf_int32_tag(m4af_writer_t *ctx, uint32_t type, int value);
|
||||
int m4af_add_itmf_int32_tag(m4af_ctx_t *ctx, uint32_t fcc, uint32_t value);
|
||||
|
||||
int m4af_add_itmf_track_tag(m4af_writer_t *ctx, int track, int total);
|
||||
int m4af_add_itmf_int64_tag(m4af_ctx_t *ctx, uint32_t fcc, uint64_t value);
|
||||
|
||||
int m4af_add_itmf_disk_tag(m4af_writer_t *ctx, int disk, int total);
|
||||
int m4af_add_itmf_track_tag(m4af_ctx_t *ctx, int track, int total);
|
||||
|
||||
int m4af_add_itmf_genre_tag(m4af_writer_t *ctx, int genre);
|
||||
int m4af_add_itmf_disk_tag(m4af_ctx_t *ctx, int disk, int total);
|
||||
|
||||
int m4af_add_itmf_genre_tag(m4af_ctx_t *ctx, int genre);
|
||||
#endif
|
||||
|
734
src/main.c
734
src/main.c
@ -8,31 +8,87 @@
|
||||
#if HAVE_STDINT_H
|
||||
# include <stdint.h>
|
||||
#endif
|
||||
#if HAVE_INTTYPES_H
|
||||
# include <inttypes.h>
|
||||
#elif defined(_MSC_VER)
|
||||
# define SCNd64 "I64d"
|
||||
#endif
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include <locale.h>
|
||||
#include <errno.h>
|
||||
#include <sys/stat.h>
|
||||
#include <getopt.h>
|
||||
#if HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#if HAVE_SIGACTION
|
||||
#include <signal.h>
|
||||
#endif
|
||||
#ifdef _WIN32
|
||||
#include <io.h>
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
#endif
|
||||
#include "compat.h"
|
||||
#include "wav_reader.h"
|
||||
#include "pcm_reader.h"
|
||||
#include "aacenc.h"
|
||||
#include "m4af.h"
|
||||
#include "progress.h"
|
||||
#include "version.h"
|
||||
#include "metadata.h"
|
||||
|
||||
#define PROGNAME "fdkaac"
|
||||
|
||||
static volatile int g_interrupted = 0;
|
||||
|
||||
#if HAVE_SIGACTION
|
||||
static void signal_handler(int signum)
|
||||
{
|
||||
g_interrupted = 1;
|
||||
}
|
||||
static void handle_signals(void)
|
||||
{
|
||||
int i, sigs[] = { SIGINT, SIGHUP, SIGTERM };
|
||||
for (i = 0; i < sizeof(sigs)/sizeof(sigs[0]); ++i) {
|
||||
struct sigaction sa;
|
||||
memset(&sa, 0, sizeof sa);
|
||||
sa.sa_handler = signal_handler;
|
||||
sa.sa_flags |= SA_RESTART;
|
||||
sigaction(sigs[i], &sa, 0);
|
||||
}
|
||||
}
|
||||
#elif defined(_WIN32)
|
||||
static BOOL WINAPI signal_handler(DWORD type)
|
||||
{
|
||||
g_interrupted = 1;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void handle_signals(void)
|
||||
{
|
||||
SetConsoleCtrlHandler(signal_handler, TRUE);
|
||||
}
|
||||
#else
|
||||
static void handle_signals(void)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
static
|
||||
int read_callback(void *cookie, void *data, uint32_t size)
|
||||
{
|
||||
return fread(data, 1, size, (FILE*)cookie);
|
||||
size_t rc = fread(data, 1, size, (FILE*)cookie);
|
||||
return ferror((FILE*)cookie) ? -1 : (int)rc;
|
||||
}
|
||||
|
||||
static
|
||||
int write_callback(void *cookie, const void *data, uint32_t size)
|
||||
{
|
||||
return fwrite(data, 1, size, (FILE*)cookie);
|
||||
size_t rc = fwrite(data, 1, size, (FILE*)cookie);
|
||||
return ferror((FILE*)cookie) ? -1 : (int)rc;
|
||||
}
|
||||
|
||||
static
|
||||
@ -73,14 +129,17 @@ PROGNAME " %s\n"
|
||||
" parameter settings, sample rate, and\n"
|
||||
" channel configuration)\n"
|
||||
" -w, --bandwidth <n> Frequency bandwidth in Hz (AAC LC only)\n"
|
||||
" -a, --afterurner <n> Afterburner\n"
|
||||
" -a, --afterburner <n> Afterburner\n"
|
||||
" 0: Off\n"
|
||||
" 1: On(default)\n"
|
||||
" -L, --lowdelay-sbr Enable ELD-SBR (AAC ELD only)\n"
|
||||
" -s, --sbr-signaling <n> SBR signaling mode\n"
|
||||
" 0: Implicit, backward compatible(default)\n"
|
||||
" 1: Explicit SBR and implicit PS\n"
|
||||
" 2: Explicit hierarchical signaling\n"
|
||||
" -L, --lowdelay-sbr <-1|0|1> Configure SBR activity on AAC ELD\n"
|
||||
" -1: Use ELD SBR auto configurator\n"
|
||||
" 0: Disable SBR on ELD (default)\n"
|
||||
" 1: Enable SBR on ELD\n"
|
||||
" -s, --sbr-ratio <0|1|2> Controls activation of downsampled SBR\n"
|
||||
" 0: Use lib default (default)\n"
|
||||
" 1: downsampled SBR (default for ELD+SBR)\n"
|
||||
" 2: dual-rate SBR (default for HE-AAC)\n"
|
||||
" -f, --transport-format <n> Transport format\n"
|
||||
" 0: RAW (default, muxed into M4A)\n"
|
||||
" 1: ADIF\n"
|
||||
@ -88,12 +147,35 @@ PROGNAME " %s\n"
|
||||
" 6: LATM MCP=1\n"
|
||||
" 7: LATM MCP=0\n"
|
||||
" 10: LOAS/LATM (LATM within LOAS)\n"
|
||||
" -c, --adts-crc-check Add CRC protection on ADTS header\n"
|
||||
" -C, --adts-crc-check Add CRC protection on ADTS header\n"
|
||||
" -h, --header-period <n> StreamMuxConfig/PCE repetition period in\n"
|
||||
" transport layer\n"
|
||||
"\n"
|
||||
" -o <filename> Output filename\n"
|
||||
" --ignore-length Ignore length of WAV header\n"
|
||||
" -G, --gapless-mode <n> Encoder delay signaling for gapless playback\n"
|
||||
" 0: iTunSMPB (default)\n"
|
||||
" 1: ISO standard (edts + sgpd)\n"
|
||||
" 2: Both\n"
|
||||
" --include-sbr-delay Count SBR decoder delay in encoder delay\n"
|
||||
" This is not iTunes compatible, but is default\n"
|
||||
" behavior of FDK library.\n"
|
||||
" -I, --ignorelength Ignore length of WAV header\n"
|
||||
" -S, --silent Don't print progress messages\n"
|
||||
" --moov-before-mdat Place moov box before mdat box on m4a output\n"
|
||||
"\n"
|
||||
"Options for raw (headerless) input:\n"
|
||||
" -R, --raw Treat input as raw (by default WAV is\n"
|
||||
" assumed)\n"
|
||||
" --raw-channels <n> Number of channels (default: 2)\n"
|
||||
" --raw-rate <n> Sample rate (default: 44100)\n"
|
||||
" --raw-format <spec> Sample format, default is \"S16L\".\n"
|
||||
" Spec is as follows:\n"
|
||||
" 1st char: S(igned)|U(nsigned)|F(loat)\n"
|
||||
" 2nd part: bits per channel\n"
|
||||
" Last char: L(ittle)|B(ig)\n"
|
||||
" Last char can be omitted, in which case L is\n"
|
||||
" assumed. Spec is case insensitive, therefore\n"
|
||||
" \"u16b\" is same as \"U16B\".\n"
|
||||
"\n"
|
||||
"Tagging options:\n"
|
||||
" --title <string>\n"
|
||||
@ -108,65 +190,109 @@ PROGNAME " %s\n"
|
||||
" --track <number[/total]>\n"
|
||||
" --disk <number[/total]>\n"
|
||||
" --tempo <n>\n"
|
||||
" --tag <fcc>:<value> Set iTunes predefined tag with four char code.\n"
|
||||
" --tag-from-file <fcc>:<filename>\n"
|
||||
" Same as above, but value is read from file.\n"
|
||||
" --long-tag <name>:<value> Set arbitrary tag as iTunes custom metadata.\n"
|
||||
" --tag-from-json <filename[?dot_notation]>\n"
|
||||
" Read tags from JSON. By default, tags are\n"
|
||||
" assumed to be direct children of the root\n"
|
||||
" object(dictionary).\n"
|
||||
" Optionally, position of the dictionary\n"
|
||||
" that contains tags can be specified with\n"
|
||||
" dotted notation.\n"
|
||||
" Example:\n"
|
||||
" --tag-from-json /path/to/json?format.tags\n"
|
||||
, fdkaac_version);
|
||||
}
|
||||
|
||||
typedef struct aacenc_tag_entry_t {
|
||||
uint32_t tag;
|
||||
const char *data;
|
||||
} aacenc_tag_entry_t;
|
||||
|
||||
typedef struct aacenc_param_ex_t {
|
||||
AACENC_PARAMS
|
||||
|
||||
char *input_filename;
|
||||
FILE *input_fp;
|
||||
char *output_filename;
|
||||
FILE *output_fp;
|
||||
unsigned gapless_mode;
|
||||
unsigned include_sbr_delay;
|
||||
unsigned ignore_length;
|
||||
int silent;
|
||||
int moov_before_mdat;
|
||||
|
||||
aacenc_tag_entry_t *tag_table;
|
||||
unsigned tag_count;
|
||||
unsigned tag_table_capacity;
|
||||
int is_raw;
|
||||
unsigned raw_channels;
|
||||
unsigned raw_rate;
|
||||
const char *raw_format;
|
||||
|
||||
aacenc_tag_store_t tags;
|
||||
aacenc_tag_store_t source_tags;
|
||||
aacenc_translate_generic_text_tag_ctx_t source_tag_ctx;
|
||||
|
||||
char *json_filename;
|
||||
} aacenc_param_ex_t;
|
||||
|
||||
static
|
||||
int parse_options(int argc, char **argv, aacenc_param_ex_t *params)
|
||||
{
|
||||
int ch;
|
||||
unsigned n;
|
||||
aacenc_tag_entry_t *tag;
|
||||
int n;
|
||||
|
||||
#define OPT_INCLUDE_SBR_DELAY M4AF_FOURCC('s','d','l','y')
|
||||
#define OPT_MOOV_BEFORE_MDAT M4AF_FOURCC('m','o','o','v')
|
||||
#define OPT_RAW_CHANNELS M4AF_FOURCC('r','c','h','n')
|
||||
#define OPT_RAW_RATE M4AF_FOURCC('r','r','a','t')
|
||||
#define OPT_RAW_FORMAT M4AF_FOURCC('r','f','m','t')
|
||||
#define OPT_SHORT_TAG M4AF_FOURCC('s','t','a','g')
|
||||
#define OPT_SHORT_TAG_FILE M4AF_FOURCC('s','t','g','f')
|
||||
#define OPT_LONG_TAG M4AF_FOURCC('l','t','a','g')
|
||||
#define OPT_TAG_FROM_JSON M4AF_FOURCC('t','f','j','s')
|
||||
|
||||
static struct option long_options[] = {
|
||||
{ "help", no_argument, 0, 'h' },
|
||||
{ "profile", required_argument, 0, 'p' },
|
||||
{ "bitrate", required_argument, 0, 'b' },
|
||||
{ "biterate-mode", required_argument, 0, 'm' },
|
||||
{ "bitrate-mode", required_argument, 0, 'm' },
|
||||
{ "bandwidth", required_argument, 0, 'w' },
|
||||
{ "afterburner", required_argument, 0, 'a' },
|
||||
{ "lowdelay-sbr", no_argument, 0, 'L' },
|
||||
{ "sbr-signaling", required_argument, 0, 's' },
|
||||
{ "lowdelay-sbr", required_argument, 0, 'L' },
|
||||
{ "sbr-ratio", required_argument, 0, 's' },
|
||||
{ "transport-format", required_argument, 0, 'f' },
|
||||
{ "adts-crc-check", no_argument, 0, 'c' },
|
||||
{ "adts-crc-check", no_argument, 0, 'C' },
|
||||
{ "header-period", required_argument, 0, 'P' },
|
||||
|
||||
{ "ignore-length", no_argument, 0, 'I' },
|
||||
{ "gapless-mode", required_argument, 0, 'G' },
|
||||
{ "include-sbr-delay", no_argument, 0, OPT_INCLUDE_SBR_DELAY },
|
||||
{ "ignorelength", no_argument, 0, 'I' },
|
||||
{ "silent", no_argument, 0, 'S' },
|
||||
{ "moov-before-mdat", no_argument, 0, OPT_MOOV_BEFORE_MDAT },
|
||||
|
||||
{ "title", required_argument, 0, M4AF_TAG_TITLE },
|
||||
{ "artist", required_argument, 0, M4AF_TAG_ARTIST },
|
||||
{ "album", required_argument, 0, M4AF_TAG_ALBUM },
|
||||
{ "genre", required_argument, 0, M4AF_TAG_GENRE },
|
||||
{ "date", required_argument, 0, M4AF_TAG_DATE },
|
||||
{ "composer", required_argument, 0, M4AF_TAG_COMPOSER },
|
||||
{ "grouping", required_argument, 0, M4AF_TAG_GROUPING },
|
||||
{ "comment", required_argument, 0, M4AF_TAG_COMMENT },
|
||||
{ "album-artist", required_argument, 0, M4AF_TAG_ALBUM_ARTIST },
|
||||
{ "track", required_argument, 0, M4AF_TAG_TRACK },
|
||||
{ "disk", required_argument, 0, M4AF_TAG_DISK },
|
||||
{ "tempo", required_argument, 0, M4AF_TAG_TEMPO },
|
||||
{ "raw", no_argument, 0, 'R' },
|
||||
{ "raw-channels", required_argument, 0, OPT_RAW_CHANNELS },
|
||||
{ "raw-rate", required_argument, 0, OPT_RAW_RATE },
|
||||
{ "raw-format", required_argument, 0, OPT_RAW_FORMAT },
|
||||
|
||||
{ "title", required_argument, 0, M4AF_TAG_TITLE },
|
||||
{ "artist", required_argument, 0, M4AF_TAG_ARTIST },
|
||||
{ "album", required_argument, 0, M4AF_TAG_ALBUM },
|
||||
{ "genre", required_argument, 0, M4AF_TAG_GENRE },
|
||||
{ "date", required_argument, 0, M4AF_TAG_DATE },
|
||||
{ "composer", required_argument, 0, M4AF_TAG_COMPOSER },
|
||||
{ "grouping", required_argument, 0, M4AF_TAG_GROUPING },
|
||||
{ "comment", required_argument, 0, M4AF_TAG_COMMENT },
|
||||
{ "album-artist", required_argument, 0, M4AF_TAG_ALBUM_ARTIST },
|
||||
{ "track", required_argument, 0, M4AF_TAG_TRACK },
|
||||
{ "disk", required_argument, 0, M4AF_TAG_DISK },
|
||||
{ "tempo", required_argument, 0, M4AF_TAG_TEMPO },
|
||||
{ "tag", required_argument, 0, OPT_SHORT_TAG },
|
||||
{ "tag-from-file", required_argument, 0, OPT_SHORT_TAG_FILE },
|
||||
{ "long-tag", required_argument, 0, OPT_LONG_TAG },
|
||||
{ "tag-from-json", required_argument, 0, OPT_TAG_FROM_JSON },
|
||||
{ 0, 0, 0, 0 },
|
||||
};
|
||||
params->afterburner = 1;
|
||||
|
||||
aacenc_getmainargs(&argc, &argv);
|
||||
while ((ch = getopt_long(argc, argv, "hp:b:m:w:a:Ls:f:cP:Io:",
|
||||
while ((ch = getopt_long(argc, argv, "hp:b:m:w:a:Ls:f:CP:G:Io:SR",
|
||||
long_options, 0)) != EOF) {
|
||||
switch (ch) {
|
||||
case 'h':
|
||||
@ -207,14 +333,18 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params)
|
||||
params->afterburner = n;
|
||||
break;
|
||||
case 'L':
|
||||
params->lowdelay_sbr = 1;
|
||||
if (sscanf(optarg, "%d", &n) != 1 || n < -1 || n > 1) {
|
||||
fprintf(stderr, "invalid arg for lowdelay-sbr\n");
|
||||
return -1;
|
||||
}
|
||||
params->lowdelay_sbr = n;
|
||||
break;
|
||||
case 's':
|
||||
if (sscanf(optarg, "%u", &n) != 1 || n > 2) {
|
||||
fprintf(stderr, "invalid arg for sbr-signaling\n");
|
||||
fprintf(stderr, "invalid arg for sbr-ratio\n");
|
||||
return -1;
|
||||
}
|
||||
params->sbr_signaling = n;
|
||||
params->sbr_ratio = n;
|
||||
break;
|
||||
case 'f':
|
||||
if (sscanf(optarg, "%u", &n) != 1) {
|
||||
@ -223,7 +353,7 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params)
|
||||
}
|
||||
params->transport_format = n;
|
||||
break;
|
||||
case 'c':
|
||||
case 'C':
|
||||
params->adts_crc_check = 1;
|
||||
break;
|
||||
case 'P':
|
||||
@ -236,9 +366,45 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params)
|
||||
case 'o':
|
||||
params->output_filename = optarg;
|
||||
break;
|
||||
case 'G':
|
||||
if (sscanf(optarg, "%u", &n) != 1 || n > 2) {
|
||||
fprintf(stderr, "invalid arg for gapless-mode\n");
|
||||
return -1;
|
||||
}
|
||||
params->gapless_mode = n;
|
||||
break;
|
||||
case OPT_INCLUDE_SBR_DELAY:
|
||||
params->include_sbr_delay = 1;
|
||||
break;
|
||||
case 'I':
|
||||
params->ignore_length = 1;
|
||||
break;
|
||||
case 'S':
|
||||
params->silent = 1;
|
||||
break;
|
||||
case OPT_MOOV_BEFORE_MDAT:
|
||||
params->moov_before_mdat = 1;
|
||||
break;
|
||||
case 'R':
|
||||
params->is_raw = 1;
|
||||
break;
|
||||
case OPT_RAW_CHANNELS:
|
||||
if (sscanf(optarg, "%u", &n) != 1) {
|
||||
fprintf(stderr, "invalid arg for raw-channels\n");
|
||||
return -1;
|
||||
}
|
||||
params->raw_channels = n;
|
||||
break;
|
||||
case OPT_RAW_RATE:
|
||||
if (sscanf(optarg, "%u", &n) != 1) {
|
||||
fprintf(stderr, "invalid arg for raw-rate\n");
|
||||
return -1;
|
||||
}
|
||||
params->raw_rate = n;
|
||||
break;
|
||||
case OPT_RAW_FORMAT:
|
||||
params->raw_format = optarg;
|
||||
break;
|
||||
case M4AF_TAG_TITLE:
|
||||
case M4AF_TAG_ARTIST:
|
||||
case M4AF_TAG_ALBUM:
|
||||
@ -251,18 +417,47 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params)
|
||||
case M4AF_TAG_TRACK:
|
||||
case M4AF_TAG_DISK:
|
||||
case M4AF_TAG_TEMPO:
|
||||
if (params->tag_count == params->tag_table_capacity) {
|
||||
unsigned newsize = params->tag_table_capacity;
|
||||
newsize = newsize ? newsize * 2 : 1;
|
||||
params->tag_table =
|
||||
realloc(params->tag_table,
|
||||
newsize * sizeof(aacenc_tag_entry_t));
|
||||
params->tag_table_capacity = newsize;
|
||||
aacenc_add_tag_to_store(¶ms->tags, ch, 0, optarg,
|
||||
strlen(optarg), 0);
|
||||
break;
|
||||
case OPT_SHORT_TAG:
|
||||
case OPT_SHORT_TAG_FILE:
|
||||
case OPT_LONG_TAG:
|
||||
{
|
||||
char *val;
|
||||
size_t klen;
|
||||
unsigned fcc = M4AF_FOURCC('-','-','-','-');
|
||||
|
||||
if ((val = strchr(optarg, ':')) == 0) {
|
||||
fprintf(stderr, "invalid arg for tag\n");
|
||||
return -1;
|
||||
}
|
||||
*val++ = '\0';
|
||||
if (ch == OPT_SHORT_TAG || ch == OPT_SHORT_TAG_FILE) {
|
||||
/*
|
||||
* take care of U+00A9(COPYRIGHT SIGN).
|
||||
* 1) if length of fcc is 3, we prepend '\xa9'.
|
||||
* 2) U+00A9 becomes "\xc2\xa9" in UTF-8. Therefore
|
||||
* we remove first '\xc2'.
|
||||
*/
|
||||
if (optarg[0] == '\xc2')
|
||||
++optarg;
|
||||
if ((klen = strlen(optarg))== 3)
|
||||
fcc = 0xa9;
|
||||
else if (klen != 4) {
|
||||
fprintf(stderr, "invalid arg for tag\n");
|
||||
return -1;
|
||||
}
|
||||
for (; *optarg; ++optarg)
|
||||
fcc = ((fcc << 8) | (*optarg & 0xff));
|
||||
}
|
||||
aacenc_add_tag_to_store(¶ms->tags, fcc, optarg,
|
||||
val, strlen(val),
|
||||
ch == OPT_SHORT_TAG_FILE);
|
||||
}
|
||||
tag = params->tag_table + params->tag_count;
|
||||
tag->tag = ch;
|
||||
tag->data = optarg;
|
||||
params->tag_count++;
|
||||
break;
|
||||
case OPT_TAG_FROM_JSON:
|
||||
params->json_filename = optarg;
|
||||
break;
|
||||
default:
|
||||
return usage(), -1;
|
||||
@ -270,6 +465,7 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params)
|
||||
}
|
||||
if (argc == optind)
|
||||
return usage(), -1;
|
||||
|
||||
if (!params->bitrate && !params->bitrate_mode) {
|
||||
fprintf(stderr, "bitrate or bitrate-mode is mandatory\n");
|
||||
return -1;
|
||||
@ -281,20 +477,29 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params)
|
||||
}
|
||||
if (params->bitrate && params->bitrate < 10000)
|
||||
params->bitrate *= 1000;
|
||||
|
||||
if (params->is_raw) {
|
||||
if (!params->raw_channels)
|
||||
params->raw_channels = 2;
|
||||
if (!params->raw_rate)
|
||||
params->raw_rate = 44100;
|
||||
if (!params->raw_format)
|
||||
params->raw_format = "S16L";
|
||||
}
|
||||
params->input_filename = argv[optind];
|
||||
return 0;
|
||||
};
|
||||
|
||||
static
|
||||
int write_sample(FILE *ofp, m4af_writer_t *m4af,
|
||||
const void *data, uint32_t size, uint32_t duration)
|
||||
int write_sample(FILE *ofp, m4af_ctx_t *m4af, aacenc_frame_t *frame)
|
||||
{
|
||||
if (!m4af) {
|
||||
if (fwrite(data, 1, size, ofp) < 0) {
|
||||
fwrite(frame->data, 1, frame->size, ofp);
|
||||
if (ferror(ofp)) {
|
||||
fprintf(stderr, "ERROR: fwrite(): %s\n", strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
} else if (m4af_write_sample(m4af, 0, data, size, duration) < 0) {
|
||||
} else if (m4af_write_sample(m4af, 0, frame->data, frame->size, 0) < 0) {
|
||||
fprintf(stderr, "ERROR: failed to write m4a sample\n");
|
||||
return -1;
|
||||
}
|
||||
@ -302,143 +507,274 @@ int write_sample(FILE *ofp, m4af_writer_t *m4af,
|
||||
}
|
||||
|
||||
static
|
||||
int encode(wav_reader_t *wavf, HANDLE_AACENCODER encoder,
|
||||
uint32_t frame_length, FILE *ofp, m4af_writer_t *m4af)
|
||||
int encode(aacenc_param_ex_t *params, pcm_reader_t *reader,
|
||||
HANDLE_AACENCODER encoder, uint32_t frame_length,
|
||||
m4af_ctx_t *m4af)
|
||||
{
|
||||
uint8_t *ibuf = 0;
|
||||
int16_t *pcmbuf = 0;
|
||||
uint32_t pcmsize = 0;
|
||||
uint8_t *obuf = 0;
|
||||
uint32_t olen;
|
||||
uint32_t osize = 0;
|
||||
int16_t *ibuf = 0, *ip;
|
||||
aacenc_frame_t obuf[2] = {{ 0 }}, *obp;
|
||||
unsigned flip = 0;
|
||||
int nread = 1;
|
||||
int consumed;
|
||||
int rc = -1;
|
||||
int frames_written = 0;
|
||||
int remaining, consumed;
|
||||
int frames_written = 0, encoded = 0;
|
||||
aacenc_progress_t progress = { 0 };
|
||||
const pcm_sample_description_t *format = wav_get_format(wavf);
|
||||
const pcm_sample_description_t *fmt = pcm_get_format(reader);
|
||||
|
||||
ibuf = malloc(frame_length * format->bytes_per_frame);
|
||||
aacenc_progress_init(&progress, wav_get_length(wavf), format->sample_rate);
|
||||
do {
|
||||
if (nread) {
|
||||
if ((nread = wav_read_frames(wavf, ibuf, frame_length)) < 0) {
|
||||
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) {
|
||||
if ((nread = pcm_read_frames(reader, ibuf, frame_length)) < 0) {
|
||||
fprintf(stderr, "ERROR: read failed\n");
|
||||
goto END;
|
||||
} else if (nread > 0) {
|
||||
if (pcm_convert_to_native_sint16(format, ibuf, nread,
|
||||
&pcmbuf, &pcmsize) < 0) {
|
||||
fprintf(stderr, "ERROR: unsupported sample format\n");
|
||||
goto END;
|
||||
}
|
||||
}
|
||||
aacenc_progress_update(&progress, wav_get_position(wavf),
|
||||
format->sample_rate * 2);
|
||||
if (!params->silent)
|
||||
aacenc_progress_update(&progress, pcm_get_position(reader),
|
||||
fmt->sample_rate * 2);
|
||||
}
|
||||
if ((consumed = aac_encode_frame(encoder, format, pcmbuf, nread,
|
||||
&obuf, &olen, &osize)) < 0)
|
||||
goto END;
|
||||
if (olen > 0) {
|
||||
if (write_sample(ofp, m4af, obuf, olen, frame_length) < 0)
|
||||
ip = ibuf;
|
||||
remaining = nread;
|
||||
do {
|
||||
obp = &obuf[flip];
|
||||
consumed = aac_encode_frame(encoder, fmt, ip, remaining, obp);
|
||||
if (consumed < 0) goto END;
|
||||
if (consumed == 0 && obp->size == 0) goto DONE;
|
||||
if (obp->size == 0) break;
|
||||
|
||||
remaining -= consumed;
|
||||
ip += consumed * fmt->channels_per_frame;
|
||||
flip ^= 1;
|
||||
/*
|
||||
* As we pad 1 frame at beginning and ending by our extrapolator,
|
||||
* we want to drop them.
|
||||
* We delay output by 1 frame by double buffering, and discard
|
||||
* second frame and final frame from the encoder.
|
||||
* 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;
|
||||
obp = &obuf[flip];
|
||||
if (write_sample(params->output_fp, m4af, obp) < 0)
|
||||
goto END;
|
||||
++frames_written;
|
||||
}
|
||||
} while (nread > 0 || olen > 0);
|
||||
aacenc_progress_finish(&progress, wav_get_position(wavf));
|
||||
} while (remaining > 0);
|
||||
}
|
||||
DONE:
|
||||
if (!params->silent)
|
||||
aacenc_progress_finish(&progress, pcm_get_position(reader));
|
||||
rc = frames_written;
|
||||
END:
|
||||
if (ibuf) free(ibuf);
|
||||
if (pcmbuf) free(pcmbuf);
|
||||
if (obuf) free(obuf);
|
||||
if (obuf[0].data) free(obuf[0].data);
|
||||
if (obuf[1].data) free(obuf[1].data);
|
||||
return rc;
|
||||
}
|
||||
|
||||
static
|
||||
int finalize_m4a(m4af_writer_t *m4af, const aacenc_param_ex_t *params,
|
||||
void put_tool_tag(m4af_ctx_t *m4af, const aacenc_param_ex_t *params,
|
||||
HANDLE_AACENCODER encoder)
|
||||
{
|
||||
char tool_info[256];
|
||||
char *p = tool_info;
|
||||
LIB_INFO lib_info;
|
||||
|
||||
p += sprintf(p, PROGNAME " %s, ", fdkaac_version);
|
||||
aacenc_get_lib_info(&lib_info);
|
||||
p += sprintf(p, "libfdk-aac %s, ", lib_info.versionStr);
|
||||
if (params->bitrate_mode)
|
||||
sprintf(p, "VBR mode %d", params->bitrate_mode);
|
||||
else
|
||||
sprintf(p, "CBR %dkbps",
|
||||
aacEncoder_GetParam(encoder, AACENC_BITRATE) / 1000);
|
||||
|
||||
m4af_add_itmf_string_tag(m4af, M4AF_TAG_TOOL, tool_info);
|
||||
}
|
||||
|
||||
static
|
||||
int finalize_m4a(m4af_ctx_t *m4af, const aacenc_param_ex_t *params,
|
||||
HANDLE_AACENCODER encoder)
|
||||
{
|
||||
unsigned i;
|
||||
aacenc_tag_entry_t *tag = params->tag_table;
|
||||
aacenc_tag_entry_t *tag;
|
||||
|
||||
tag = params->source_tags.tag_table;
|
||||
for (i = 0; i < params->source_tags.tag_count; ++i, ++tag)
|
||||
aacenc_write_tag_entry(m4af, tag);
|
||||
|
||||
for (i = 0; i < params->tag_count; ++i, ++tag) {
|
||||
switch (tag->tag) {
|
||||
case M4AF_TAG_TRACK:
|
||||
{
|
||||
unsigned m, n = 0;
|
||||
if (sscanf(tag->data, "%u/%u", &m, &n) >= 1)
|
||||
m4af_add_itmf_track_tag(m4af, m, n);
|
||||
break;
|
||||
}
|
||||
case M4AF_TAG_DISK:
|
||||
{
|
||||
unsigned m, n = 0;
|
||||
if (sscanf(tag->data, "%u/%u", &m, &n) >= 1)
|
||||
m4af_add_itmf_disk_tag(m4af, m, n);
|
||||
break;
|
||||
}
|
||||
case M4AF_TAG_TEMPO:
|
||||
{
|
||||
unsigned n;
|
||||
if (sscanf(tag->data, "%u", &n) == 1)
|
||||
m4af_add_itmf_int16_tag(m4af, tag->tag, n);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
char *u8 = aacenc_to_utf8(tag->data);
|
||||
m4af_add_itmf_string_tag(m4af, tag->tag, u8);
|
||||
free(u8);
|
||||
}
|
||||
}
|
||||
}
|
||||
{
|
||||
char tool_info[256];
|
||||
char *p = tool_info;
|
||||
LIB_INFO *lib_info = 0;
|
||||
if (params->json_filename)
|
||||
aacenc_write_tags_from_json(m4af, params->json_filename);
|
||||
|
||||
p += sprintf(p, PROGNAME " %s, ", fdkaac_version);
|
||||
tag = params->tags.tag_table;
|
||||
for (i = 0; i < params->tags.tag_count; ++i, ++tag)
|
||||
aacenc_write_tag_entry(m4af, tag);
|
||||
|
||||
lib_info = malloc(FDK_MODULE_LAST * sizeof(LIB_INFO));
|
||||
/* XXX: aacEncGetLibInfo() seems buggy and sometimes fails */
|
||||
if (aacEncGetLibInfo(lib_info) == AACENC_OK) {
|
||||
for (i = 0; i < FDK_MODULE_LAST; ++i)
|
||||
if (lib_info[i].module_id == FDK_AACENC)
|
||||
break;
|
||||
p += sprintf(p, "libfdk-aac %s, ", lib_info[i].versionStr);
|
||||
}
|
||||
free(lib_info);
|
||||
if (params->bitrate_mode)
|
||||
sprintf(p, "VBR mode %d", params->bitrate_mode);
|
||||
else
|
||||
sprintf(p, "CBR %dkbps", params->bitrate / 1000);
|
||||
put_tool_tag(m4af, params, encoder);
|
||||
|
||||
m4af_add_itmf_string_tag(m4af, M4AF_TAG_TOOL, tool_info);
|
||||
}
|
||||
if (m4af_finalize(m4af) < 0) {
|
||||
if (m4af_finalize(m4af, params->moov_before_mdat) < 0) {
|
||||
fprintf(stderr, "ERROR: failed to finalize m4a\n");
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static
|
||||
char *generate_output_filename(const char *filename, const char *ext)
|
||||
{
|
||||
char *p = 0;
|
||||
size_t ext_len = strlen(ext);
|
||||
|
||||
if (strcmp(filename, "-") == 0) {
|
||||
p = malloc(ext_len + 6);
|
||||
sprintf(p, "stdin%s", ext);
|
||||
} else {
|
||||
const char *base = aacenc_basename(filename);
|
||||
size_t ilen = strlen(base);
|
||||
const char *ext_org = strrchr(base, '.');
|
||||
if (ext_org) ilen = ext_org - base;
|
||||
p = malloc(ilen + ext_len + 1);
|
||||
sprintf(p, "%.*s%s", (int)ilen, base, ext);
|
||||
}
|
||||
return p;
|
||||
}
|
||||
|
||||
static
|
||||
int parse_raw_spec(const char *spec, pcm_sample_description_t *desc)
|
||||
{
|
||||
unsigned bits;
|
||||
unsigned char c_type, c_endian = 'L';
|
||||
int type;
|
||||
|
||||
if (sscanf(spec, "%c%u%c", &c_type, &bits, &c_endian) < 2)
|
||||
return -1;
|
||||
c_type = toupper(c_type);
|
||||
c_endian = toupper(c_endian);
|
||||
|
||||
if (c_type == 'S')
|
||||
type = 1;
|
||||
else if (c_type == 'U')
|
||||
type = 2;
|
||||
else if (c_type == 'F')
|
||||
type = 4;
|
||||
else
|
||||
return -1;
|
||||
|
||||
if (c_endian == 'B')
|
||||
type |= 8;
|
||||
else if (c_endian != 'L')
|
||||
return -1;
|
||||
|
||||
if (c_type == 'F' && bits != 32 && bits != 64)
|
||||
return -1;
|
||||
if (c_type != 'F' && (bits < 8 || bits > 32))
|
||||
return -1;
|
||||
|
||||
desc->sample_type = type;
|
||||
desc->bits_per_channel = bits;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static pcm_io_vtbl_t pcm_io_vtbl = {
|
||||
read_callback, seek_callback, tell_callback
|
||||
};
|
||||
static pcm_io_vtbl_t pcm_io_vtbl_noseek = { read_callback, 0, tell_callback };
|
||||
|
||||
static
|
||||
pcm_reader_t *open_input(aacenc_param_ex_t *params)
|
||||
{
|
||||
pcm_io_context_t io = { 0 };
|
||||
pcm_reader_t *reader = 0;
|
||||
struct stat stb = { 0 };
|
||||
|
||||
if ((params->input_fp = aacenc_fopen(params->input_filename, "rb")) == 0) {
|
||||
aacenc_fprintf(stderr, "ERROR: %s: %s\n", params->input_filename,
|
||||
strerror(errno));
|
||||
goto FAIL;
|
||||
}
|
||||
io.cookie = params->input_fp;
|
||||
if (fstat(fileno(params->input_fp), &stb) == 0
|
||||
&& (stb.st_mode & S_IFMT) == S_IFREG)
|
||||
io.vtbl = &pcm_io_vtbl;
|
||||
else
|
||||
io.vtbl = &pcm_io_vtbl_noseek;
|
||||
|
||||
if (params->is_raw) {
|
||||
int bytes_per_channel;
|
||||
pcm_sample_description_t desc = { 0 };
|
||||
if (parse_raw_spec(params->raw_format, &desc) < 0) {
|
||||
fprintf(stderr, "ERROR: invalid raw-format spec\n");
|
||||
goto FAIL;
|
||||
}
|
||||
desc.sample_rate = params->raw_rate;
|
||||
desc.channels_per_frame = params->raw_channels;
|
||||
bytes_per_channel = (desc.bits_per_channel + 7) / 8;
|
||||
desc.bytes_per_frame = params->raw_channels * bytes_per_channel;
|
||||
if ((reader = raw_open(&io, &desc)) == 0) {
|
||||
fprintf(stderr, "ERROR: failed to open raw input\n");
|
||||
goto FAIL;
|
||||
}
|
||||
} else {
|
||||
int c;
|
||||
ungetc(c = getc(params->input_fp), params->input_fp);
|
||||
|
||||
switch (c) {
|
||||
case 'R':
|
||||
if ((reader = wav_open(&io, params->ignore_length)) == 0) {
|
||||
fprintf(stderr, "ERROR: broken / unsupported input file\n");
|
||||
goto FAIL;
|
||||
}
|
||||
break;
|
||||
case 'c':
|
||||
params->source_tag_ctx.add = aacenc_add_tag_entry_to_store;
|
||||
params->source_tag_ctx.add_ctx = ¶ms->source_tags;
|
||||
if ((reader = caf_open(&io,
|
||||
aacenc_translate_generic_text_tag,
|
||||
¶ms->source_tag_ctx)) == 0) {
|
||||
fprintf(stderr, "ERROR: broken / unsupported input file\n");
|
||||
goto FAIL;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
fprintf(stderr, "ERROR: unsupported input file\n");
|
||||
goto FAIL;
|
||||
}
|
||||
}
|
||||
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);
|
||||
return reader;
|
||||
FAIL:
|
||||
return 0;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
wav_io_context_t wav_io = { read_callback, seek_callback };
|
||||
m4af_io_callbacks_t m4af_io = {
|
||||
write_callback, seek_callback, tell_callback };
|
||||
static m4af_io_callbacks_t m4af_io = {
|
||||
read_callback, write_callback, seek_callback, tell_callback
|
||||
};
|
||||
aacenc_param_ex_t params = { 0 };
|
||||
|
||||
int result = 2;
|
||||
FILE *ifp = 0;
|
||||
FILE *ofp = 0;
|
||||
char *output_filename = 0;
|
||||
wav_reader_t *wavf = 0;
|
||||
pcm_reader_t *reader = 0;
|
||||
HANDLE_AACENCODER encoder = 0;
|
||||
AACENC_InfoStruct aacinfo = { 0 };
|
||||
m4af_writer_t *m4af = 0;
|
||||
m4af_ctx_t *m4af = 0;
|
||||
const pcm_sample_description_t *sample_format;
|
||||
int downsampled_timescale = 0;
|
||||
int frame_count = 0;
|
||||
int sbr_mode = 0;
|
||||
unsigned scale_shift = 0;
|
||||
|
||||
setlocale(LC_CTYPE, "");
|
||||
setbuf(stderr, 0);
|
||||
@ -446,77 +782,95 @@ int main(int argc, char **argv)
|
||||
if (parse_options(argc, argv, ¶ms) < 0)
|
||||
return 1;
|
||||
|
||||
if ((ifp = aacenc_fopen(params.input_filename, "rb")) == 0) {
|
||||
aacenc_fprintf(stderr, "ERROR: %s: %s\n", params.input_filename,
|
||||
strerror(errno));
|
||||
if ((reader = open_input(¶ms)) == 0)
|
||||
goto END;
|
||||
}
|
||||
|
||||
if (ifp == stdin)
|
||||
wav_io.seek = 0;
|
||||
sample_format = pcm_get_format(reader);
|
||||
|
||||
if ((wavf = wav_open(&wav_io, ifp, params.ignore_length)) == 0) {
|
||||
fprintf(stderr, "ERROR: broken / unsupported input file\n");
|
||||
goto END;
|
||||
sbr_mode = aacenc_is_sbr_active((aacenc_param_t*)¶ms);
|
||||
if (sbr_mode && !aacenc_is_sbr_ratio_available()) {
|
||||
fprintf(stderr, "WARNING: Only dual-rate SBR is available "
|
||||
"for this version\n");
|
||||
params.sbr_ratio = 2;
|
||||
}
|
||||
sample_format = wav_get_format(wavf);
|
||||
scale_shift = aacenc_is_dual_rate_sbr((aacenc_param_t*)¶ms);
|
||||
params.sbr_signaling =
|
||||
(params.transport_format == TT_MP4_LOAS) ? 2 :
|
||||
(params.transport_format == TT_MP4_RAW) ? 1 : 0;
|
||||
if (sbr_mode && !scale_shift)
|
||||
params.sbr_signaling = 2;
|
||||
|
||||
if (aacenc_init(&encoder, (aacenc_param_t*)¶ms, sample_format,
|
||||
&aacinfo) < 0)
|
||||
goto END;
|
||||
|
||||
if (!params.output_filename) {
|
||||
size_t ilen = strlen(params.input_filename);
|
||||
const char *ext = strrchr(params.input_filename, '.');
|
||||
if (ext) ilen = ext - params.input_filename;
|
||||
output_filename = malloc(ilen + 5);
|
||||
sprintf(output_filename, "%.*s%s", ilen, params.input_filename,
|
||||
params.transport_format ? ".aac" : ".m4a");
|
||||
const char *ext = params.transport_format ? ".aac" : ".m4a";
|
||||
output_filename = generate_output_filename(params.input_filename, ext);
|
||||
params.output_filename = output_filename;
|
||||
}
|
||||
|
||||
if ((ofp = aacenc_fopen(params.output_filename, "wb")) == 0) {
|
||||
if ((params.output_fp = aacenc_fopen(params.output_filename, "wb+")) == 0) {
|
||||
aacenc_fprintf(stderr, "ERROR: %s: %s\n", params.output_filename,
|
||||
strerror(errno));
|
||||
goto END;
|
||||
}
|
||||
handle_signals();
|
||||
|
||||
if (!params.transport_format) {
|
||||
uint32_t scale;
|
||||
unsigned framelen = aacinfo.frameLength;
|
||||
int sbr_mode = aacenc_is_sbr_active((aacenc_param_t*)¶ms);
|
||||
int sig_mode = aacEncoder_GetParam(encoder, AACENC_SIGNALING_MODE);
|
||||
if (sbr_mode && !sig_mode)
|
||||
downsampled_timescale = 1;
|
||||
scale = sample_format->sample_rate >> downsampled_timescale;
|
||||
if ((m4af = m4af_create(M4AF_CODEC_MP4A, scale, &m4af_io, ofp)) < 0)
|
||||
scale = sample_format->sample_rate >> scale_shift;
|
||||
if ((m4af = m4af_create(M4AF_CODEC_MP4A, scale, &m4af_io,
|
||||
params.output_fp)) < 0)
|
||||
goto END;
|
||||
m4af_decoder_specific_info(m4af, 0, aacinfo.confBuf, aacinfo.confSize);
|
||||
m4af_set_fixed_frame_duration(m4af, 0,
|
||||
framelen >> downsampled_timescale);
|
||||
m4af_set_decoder_specific_info(m4af, 0,
|
||||
aacinfo.confBuf, aacinfo.confSize);
|
||||
m4af_set_fixed_frame_duration(m4af, 0, framelen >> scale_shift);
|
||||
m4af_set_vbr_mode(m4af, 0, params.bitrate_mode);
|
||||
m4af_set_priming_mode(m4af, params.gapless_mode + 1);
|
||||
m4af_begin_write(m4af);
|
||||
}
|
||||
frame_count = encode(wavf, encoder, aacinfo.frameLength, ofp, 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;
|
||||
int64_t frames_read = wav_get_position(wavf);
|
||||
uint32_t padding = frame_count * aacinfo.frameLength
|
||||
- frames_read - aacinfo.encoderDelay;
|
||||
m4af_set_priming(m4af, 0, delay >> downsampled_timescale,
|
||||
padding >> downsampled_timescale);
|
||||
uint32_t padding;
|
||||
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)
|
||||
goto END;
|
||||
}
|
||||
result = 0;
|
||||
END:
|
||||
if (wavf) wav_teardown(&wavf);
|
||||
if (ifp) fclose(ifp);
|
||||
if (reader) pcm_teardown(&reader);
|
||||
if (params.input_fp) fclose(params.input_fp);
|
||||
if (m4af) m4af_teardown(&m4af);
|
||||
if (ofp) fclose(ofp);
|
||||
if (params.output_fp) fclose(params.output_fp);
|
||||
if (encoder) aacEncClose(&encoder);
|
||||
if (output_filename) free(output_filename);
|
||||
if (params.tag_table) free(params.tag_table);
|
||||
if (params.tags.tag_table)
|
||||
aacenc_free_tag_store(¶ms.tags);
|
||||
if (params.source_tags.tag_table)
|
||||
aacenc_free_tag_store(¶ms.source_tags);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
442
src/metadata.c
Normal file
442
src/metadata.c
Normal file
@ -0,0 +1,442 @@
|
||||
/*
|
||||
* Copyright (C) 2013 nu774
|
||||
* For conditions of distribution and use, see copyright notice in COPYING
|
||||
*/
|
||||
#if HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
#if HAVE_STDINT_H
|
||||
# include <stdint.h>
|
||||
#endif
|
||||
#if HAVE_INTTYPES_H
|
||||
# include <inttypes.h>
|
||||
#elif defined(_MSC_VER)
|
||||
# define SCNd64 "I64d"
|
||||
#endif
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#include "m4af.h"
|
||||
#include "metadata.h"
|
||||
#include "compat.h"
|
||||
#include "parson.h"
|
||||
|
||||
typedef struct tag_key_mapping_t {
|
||||
const char *name;
|
||||
uint32_t fcc;
|
||||
} tag_key_mapping_t;
|
||||
|
||||
enum {
|
||||
TAG_TOTAL_DISCS = 1,
|
||||
TAG_TOTAL_TRACKS = 2
|
||||
};
|
||||
|
||||
static tag_key_mapping_t tag_mapping_table[] = {
|
||||
{ "album", M4AF_TAG_ALBUM },
|
||||
{ "albumartist", M4AF_TAG_ALBUM_ARTIST },
|
||||
{ "albumartistsort", M4AF_FOURCC('s','o','a','a') },
|
||||
{ "albumartistsortorder", M4AF_FOURCC('s','o','a','a') },
|
||||
{ "albumsort", M4AF_FOURCC('s','o','a','l') },
|
||||
{ "albumsortorder", M4AF_FOURCC('s','o','a','l') },
|
||||
{ "artist", M4AF_TAG_ARTIST },
|
||||
{ "artistsort", M4AF_FOURCC('s','o','a','r') },
|
||||
{ "artistsortorder", M4AF_FOURCC('s','o','a','r') },
|
||||
{ "band", M4AF_TAG_ALBUM_ARTIST },
|
||||
{ "bpm", M4AF_TAG_TEMPO },
|
||||
{ "comment", M4AF_TAG_COMMENT },
|
||||
{ "compilation", M4AF_TAG_COMPILATION },
|
||||
{ "composer", M4AF_TAG_COMPOSER },
|
||||
{ "composersort", M4AF_FOURCC('s','o','c','o') },
|
||||
{ "composersortorder", M4AF_FOURCC('s','o','c','o') },
|
||||
{ "contentgroup", M4AF_TAG_GROUPING },
|
||||
{ "copyright", M4AF_TAG_COPYRIGHT },
|
||||
{ "date", M4AF_TAG_DATE },
|
||||
{ "disc", M4AF_TAG_DISK },
|
||||
{ "discnumber", M4AF_TAG_DISK },
|
||||
{ "disctotal", TAG_TOTAL_DISCS },
|
||||
{ "genre", M4AF_TAG_GENRE },
|
||||
{ "grouping", M4AF_TAG_GROUPING },
|
||||
{ "itunescompilation", M4AF_TAG_COMPILATION },
|
||||
{ "lyrics", M4AF_TAG_LYRICS },
|
||||
{ "tempo", M4AF_TAG_TEMPO },
|
||||
{ "recordeddate", M4AF_TAG_DATE },
|
||||
{ "title", M4AF_TAG_TITLE },
|
||||
{ "titlesort", M4AF_FOURCC('s','o','n','m') },
|
||||
{ "titlesortorder", M4AF_FOURCC('s','o','n','m') },
|
||||
{ "totaldiscs", TAG_TOTAL_DISCS },
|
||||
{ "totaltracks", TAG_TOTAL_TRACKS },
|
||||
{ "track", M4AF_TAG_TRACK },
|
||||
{ "tracknumber", M4AF_TAG_TRACK },
|
||||
{ "tracktotal", TAG_TOTAL_TRACKS },
|
||||
{ "unsyncedlyrics", M4AF_TAG_LYRICS },
|
||||
{ "year", M4AF_TAG_DATE },
|
||||
};
|
||||
|
||||
static
|
||||
int tag_key_comparator(const void *k, const void *v)
|
||||
{
|
||||
return strcmp((const char *)k, ((tag_key_mapping_t*)v)->name);
|
||||
}
|
||||
|
||||
static
|
||||
uint32_t get_tag_fcc_from_name(const char *name)
|
||||
{
|
||||
char *name_p = 0, *p;
|
||||
const tag_key_mapping_t *ent;
|
||||
|
||||
name_p = malloc(strlen(name) + 1);
|
||||
for (p = name_p; *name; ++name) {
|
||||
unsigned char c = *name;
|
||||
if (c != ' ' && c != '-' && c != '_')
|
||||
*p++ = tolower(c);
|
||||
}
|
||||
*p = 0;
|
||||
ent = bsearch(name_p, tag_mapping_table,
|
||||
sizeof(tag_mapping_table) / sizeof(tag_mapping_table[0]),
|
||||
sizeof(tag_mapping_table[0]),
|
||||
tag_key_comparator);
|
||||
free(name_p);
|
||||
return ent ? ent->fcc : 0;
|
||||
}
|
||||
|
||||
static
|
||||
char *aacenc_load_tag_from_file(const char *path, uint32_t *data_size)
|
||||
{
|
||||
FILE *fp = 0;
|
||||
char *data = 0;
|
||||
int64_t size;
|
||||
|
||||
if ((fp = aacenc_fopen(path, "rb")) == NULL) {
|
||||
aacenc_fprintf(stderr, "WARNING: %s: %s\n", path, strerror(errno));
|
||||
goto END;
|
||||
}
|
||||
fseeko(fp, 0, SEEK_END);
|
||||
size = ftello(fp);
|
||||
if (size > 5*1024*1024) {
|
||||
aacenc_fprintf(stderr, "WARNING: %s: size too large\n", path);
|
||||
goto END;
|
||||
}
|
||||
fseeko(fp, 0, SEEK_SET);
|
||||
data = malloc(size + 1);
|
||||
if (data) fread(data, 1, size, fp);
|
||||
data[size] = 0;
|
||||
*data_size = (uint32_t)size;
|
||||
END:
|
||||
if (fp) fclose(fp);
|
||||
return data;
|
||||
}
|
||||
|
||||
static
|
||||
int aacenc_is_string_tag(uint32_t tag)
|
||||
{
|
||||
switch (tag) {
|
||||
case M4AF_TAG_TITLE:
|
||||
case M4AF_TAG_ARTIST:
|
||||
case M4AF_TAG_ALBUM:
|
||||
case M4AF_TAG_GENRE:
|
||||
case M4AF_TAG_DATE:
|
||||
case M4AF_TAG_COMPOSER:
|
||||
case M4AF_TAG_GROUPING:
|
||||
case M4AF_TAG_COMMENT:
|
||||
case M4AF_TAG_LYRICS:
|
||||
case M4AF_TAG_TOOL:
|
||||
case M4AF_TAG_ALBUM_ARTIST:
|
||||
case M4AF_TAG_DESCRIPTION:
|
||||
case M4AF_TAG_LONG_DESCRIPTION:
|
||||
case M4AF_TAG_COPYRIGHT:
|
||||
case M4AF_FOURCC('a','p','I','D'):
|
||||
case M4AF_FOURCC('c','a','t','g'):
|
||||
case M4AF_FOURCC('k','e','y','w'):
|
||||
case M4AF_FOURCC('p','u','r','d'):
|
||||
case M4AF_FOURCC('p','u','r','l'):
|
||||
case M4AF_FOURCC('s','o','a','a'):
|
||||
case M4AF_FOURCC('s','o','a','l'):
|
||||
case M4AF_FOURCC('s','o','a','r'):
|
||||
case M4AF_FOURCC('s','o','c','o'):
|
||||
case M4AF_FOURCC('s','o','n','m'):
|
||||
case M4AF_FOURCC('s','o','s','n'):
|
||||
case M4AF_FOURCC('t','v','e','n'):
|
||||
case M4AF_FOURCC('t','v','n','n'):
|
||||
case M4AF_FOURCC('t','v','s','h'):
|
||||
case M4AF_FOURCC('x','i','d',' '):
|
||||
case M4AF_FOURCC('\xa9','e','n','c'):
|
||||
case M4AF_FOURCC('\xa9','s','t','3'):
|
||||
case M4AF_FOURCC('-','-','-','-'):
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void aacenc_add_tag_to_store(aacenc_tag_store_t *store, uint32_t tag,
|
||||
const char *key, const char *value,
|
||||
uint32_t size, int is_file_name)
|
||||
{
|
||||
aacenc_tag_entry_t entry = { 0 };
|
||||
char *dp = 0;
|
||||
|
||||
if (!is_file_name && !size)
|
||||
return;
|
||||
entry.tag = tag;
|
||||
if (tag == M4AF_FOURCC('-','-','-','-'))
|
||||
entry.name = (char *)key;
|
||||
|
||||
if (is_file_name) {
|
||||
entry.data = dp = aacenc_load_tag_from_file(value, &size);
|
||||
entry.data_size = size;
|
||||
} else if (aacenc_is_string_tag(tag)) {
|
||||
entry.data = dp = aacenc_to_utf8(value);
|
||||
entry.data_size = strlen(entry.data);
|
||||
} else {
|
||||
entry.data = (char *)value;
|
||||
entry.data_size = size;
|
||||
}
|
||||
aacenc_add_tag_entry_to_store(store, &entry);
|
||||
free(dp);
|
||||
}
|
||||
|
||||
void aacenc_add_tag_entry_to_store(void *ctx, const aacenc_tag_entry_t *tag)
|
||||
{
|
||||
aacenc_tag_store_t *store = ctx;
|
||||
aacenc_tag_entry_t *entry;
|
||||
if (store->tag_count == store->tag_table_capacity) {
|
||||
unsigned newsize = store->tag_table_capacity;
|
||||
newsize = newsize ? newsize * 2 : 1;
|
||||
store->tag_table =
|
||||
realloc(store->tag_table, newsize * sizeof(aacenc_tag_entry_t));
|
||||
store->tag_table_capacity = newsize;
|
||||
}
|
||||
entry = store->tag_table + store->tag_count;
|
||||
entry->tag = tag->tag;
|
||||
entry->data_size = tag->data_size;
|
||||
entry->name = tag->name ? strdup(tag->name) : 0;
|
||||
entry->data = malloc(tag->data_size + 1);
|
||||
memcpy(entry->data, tag->data, tag->data_size);
|
||||
entry->data[tag->data_size] = 0;
|
||||
store->tag_count++;
|
||||
}
|
||||
|
||||
static
|
||||
void tag_put_number_pair(aacenc_translate_generic_text_tag_ctx_t *ctx,
|
||||
uint32_t fcc, unsigned number, unsigned total)
|
||||
{
|
||||
char buf[128];
|
||||
aacenc_tag_entry_t entry = { 0 };
|
||||
|
||||
if (number) {
|
||||
if (total) sprintf(buf, "%u/%u", number, total);
|
||||
else sprintf(buf, "%u", number);
|
||||
entry.tag = fcc;
|
||||
entry.data = buf;
|
||||
entry.data_size = strlen(buf);
|
||||
ctx->add(ctx->add_ctx, &entry);
|
||||
}
|
||||
}
|
||||
|
||||
void aacenc_translate_generic_text_tag(void *pctx, const char *key,
|
||||
const char *val, uint32_t size)
|
||||
{
|
||||
aacenc_translate_generic_text_tag_ctx_t *ctx = pctx;
|
||||
aacenc_tag_entry_t entry = { 0 };
|
||||
uint32_t fcc;
|
||||
/*
|
||||
* Since track/disc number pair (number and total) can be stored within
|
||||
* either single tag or separately, we cannot instantly translate
|
||||
* them in one-to-one manner.
|
||||
* Instead, we keep and store them until all tags are processed,
|
||||
* then finally submit.
|
||||
*/
|
||||
if (!key) {
|
||||
/* use null key as flushing signal */
|
||||
tag_put_number_pair(ctx, M4AF_TAG_TRACK, ctx->track, ctx->track_total);
|
||||
tag_put_number_pair(ctx, M4AF_TAG_DISK, ctx->disc, ctx->disc_total);
|
||||
return;
|
||||
}
|
||||
if (!val || !size)
|
||||
return;
|
||||
if ((fcc = get_tag_fcc_from_name(key)) == 0)
|
||||
return;
|
||||
|
||||
switch (fcc) {
|
||||
case TAG_TOTAL_DISCS:
|
||||
sscanf(val, "%d", &ctx->disc_total); break;
|
||||
case TAG_TOTAL_TRACKS:
|
||||
sscanf(val, "%d", &ctx->track_total); break;
|
||||
case M4AF_TAG_DISK:
|
||||
sscanf(val, "%d/%d", &ctx->disc, &ctx->disc_total); break;
|
||||
case M4AF_TAG_TRACK:
|
||||
sscanf(val, "%d/%d", &ctx->track, &ctx->track_total); break;
|
||||
default:
|
||||
{
|
||||
entry.tag = fcc;
|
||||
entry.data = (char *)val;
|
||||
entry.data_size = (size == ~0U) ? strlen(val) : size;
|
||||
ctx->add(ctx->add_ctx, &entry);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static
|
||||
const char *aacenc_json_object_get_string(JSON_Object *obj, const char *key,
|
||||
char *buf)
|
||||
{
|
||||
JSON_Value_Type type;
|
||||
const char *val = 0;
|
||||
|
||||
type = json_value_get_type(json_object_get_value(obj, key));
|
||||
if (type == JSONString)
|
||||
val = json_object_get_string(obj, key);
|
||||
else if (type == JSONNumber) {
|
||||
double num = json_object_get_number(obj, key);
|
||||
sprintf(buf, "%.15g", num);
|
||||
val = buf;
|
||||
} else if (type == JSONBoolean) {
|
||||
int n = json_object_get_boolean(obj, key);
|
||||
sprintf(buf, "%d", n);
|
||||
val = buf;
|
||||
}
|
||||
return val;
|
||||
}
|
||||
|
||||
void aacenc_write_tags_from_json(m4af_ctx_t *m4af, const char *json_filename)
|
||||
{
|
||||
char *data = 0;
|
||||
JSON_Value *json = 0;
|
||||
JSON_Object *root;
|
||||
size_t i, nelts;
|
||||
uint32_t data_size;
|
||||
char *json_dot_path;
|
||||
char *filename = 0;
|
||||
aacenc_translate_generic_text_tag_ctx_t ctx = { 0 };
|
||||
|
||||
ctx.add = aacenc_write_tag_entry;
|
||||
ctx.add_ctx = m4af;
|
||||
|
||||
filename = strdup(json_filename);
|
||||
if ((json_dot_path = strchr(filename, '?')) != 0)
|
||||
*json_dot_path++ = '\0';
|
||||
|
||||
if (!(data = aacenc_load_tag_from_file(filename, &data_size)))
|
||||
goto DONE;
|
||||
if (!(json = json_parse_string(data))) {
|
||||
aacenc_fprintf(stderr, "WARNING: failed to parse JSON\n");
|
||||
goto DONE;
|
||||
}
|
||||
root = json_value_get_object(json);
|
||||
if (json_dot_path) {
|
||||
if (!(root = json_object_dotget_object(root, json_dot_path))) {
|
||||
aacenc_fprintf(stderr, "WARNING: %s not found in JSON\n",
|
||||
json_dot_path);
|
||||
goto DONE;
|
||||
}
|
||||
}
|
||||
nelts = json_object_get_count(root);
|
||||
for (i = 0; i < nelts; ++i) {
|
||||
char buf[256];
|
||||
const char *key = json_object_get_name(root, i);
|
||||
const char *val = aacenc_json_object_get_string(root, key, buf);
|
||||
if (val) aacenc_translate_generic_text_tag(&ctx, key, val, ~0U);
|
||||
}
|
||||
aacenc_translate_generic_text_tag(&ctx, 0, 0, 0);
|
||||
DONE:
|
||||
if (data) free(data);
|
||||
if (filename) free(filename);
|
||||
if (json) json_value_free(json);
|
||||
}
|
||||
|
||||
void aacenc_free_tag_store(aacenc_tag_store_t *store)
|
||||
{
|
||||
if (store->tag_table) {
|
||||
unsigned i;
|
||||
for (i = 0; i < store->tag_count; ++i) {
|
||||
aacenc_tag_entry_t *ent = &store->tag_table[i];
|
||||
free(ent->name);
|
||||
free(ent->data);
|
||||
}
|
||||
free(store->tag_table);
|
||||
store->tag_table = 0;
|
||||
store->tag_count = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void aacenc_write_tag_entry(void *ctx, const aacenc_tag_entry_t *tag)
|
||||
{
|
||||
m4af_ctx_t *m4af = ctx;
|
||||
unsigned m, n = 0;
|
||||
const char *data = tag->data;
|
||||
|
||||
switch (tag->tag) {
|
||||
case M4AF_TAG_TRACK:
|
||||
if (sscanf(data, "%u/%u", &m, &n) >= 1)
|
||||
m4af_add_itmf_track_tag(m4af, m, n);
|
||||
break;
|
||||
case M4AF_TAG_DISK:
|
||||
if (sscanf(data, "%u/%u", &m, &n) >= 1)
|
||||
m4af_add_itmf_disk_tag(m4af, m, n);
|
||||
break;
|
||||
case M4AF_TAG_GENRE_ID3:
|
||||
if (sscanf(data, "%u", &n) == 1)
|
||||
m4af_add_itmf_genre_tag(m4af, n);
|
||||
break;
|
||||
case M4AF_TAG_TEMPO:
|
||||
if (sscanf(data, "%u", &n) == 1)
|
||||
m4af_add_itmf_int16_tag(m4af, tag->tag, n);
|
||||
break;
|
||||
case M4AF_TAG_COMPILATION:
|
||||
case M4AF_FOURCC('a','k','I','D'):
|
||||
case M4AF_FOURCC('h','d','v','d'):
|
||||
case M4AF_FOURCC('p','c','s','t'):
|
||||
case M4AF_FOURCC('p','g','a','p'):
|
||||
case M4AF_FOURCC('r','t','n','g'):
|
||||
case M4AF_FOURCC('s','t','i','k'):
|
||||
if (sscanf(data, "%u", &n) == 1)
|
||||
m4af_add_itmf_int8_tag(m4af, tag->tag, n);
|
||||
break;
|
||||
case M4AF_FOURCC('a','t','I','D'):
|
||||
case M4AF_FOURCC('c','m','I','D'):
|
||||
case M4AF_FOURCC('c','n','I','D'):
|
||||
case M4AF_FOURCC('g','e','I','D'):
|
||||
case M4AF_FOURCC('s','f','I','D'):
|
||||
case M4AF_FOURCC('t','v','s','n'):
|
||||
case M4AF_FOURCC('t','v','s','s'):
|
||||
if (sscanf(data, "%u", &n) == 1)
|
||||
m4af_add_itmf_int32_tag(m4af, tag->tag, n);
|
||||
break;
|
||||
case M4AF_FOURCC('p','l','I','D'):
|
||||
{
|
||||
int64_t qn;
|
||||
if (sscanf(data, "%" SCNd64, &qn) == 1)
|
||||
m4af_add_itmf_int64_tag(m4af, tag->tag, qn);
|
||||
break;
|
||||
}
|
||||
case M4AF_TAG_ARTWORK:
|
||||
{
|
||||
int data_type = 0;
|
||||
if (!memcmp(data, "GIF", 3))
|
||||
data_type = M4AF_GIF;
|
||||
else if (!memcmp(data, "\xff\xd8\xff", 3))
|
||||
data_type = M4AF_JPEG;
|
||||
else if (!memcmp(data, "\x89PNG", 4))
|
||||
data_type = M4AF_PNG;
|
||||
if (data_type)
|
||||
m4af_add_itmf_short_tag(m4af, tag->tag, data_type,
|
||||
data, tag->data_size);
|
||||
break;
|
||||
}
|
||||
case M4AF_FOURCC('-','-','-','-'):
|
||||
{
|
||||
m4af_add_itmf_long_tag(m4af, tag->name, data);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
if (aacenc_is_string_tag(tag->tag))
|
||||
m4af_add_itmf_string_tag(m4af, tag->tag, data);
|
||||
else
|
||||
fprintf(stderr, "WARNING: unknown/unsupported tag: %c%c%c%c\n",
|
||||
tag->tag >> 24, (tag->tag >> 16) & 0xff,
|
||||
(tag->tag >> 8) & 0xff, tag->tag & 0xff);
|
||||
}
|
||||
}
|
||||
|
||||
|
48
src/metadata.h
Normal file
48
src/metadata.h
Normal file
@ -0,0 +1,48 @@
|
||||
/*
|
||||
* Copyright (C) 2013 nu774
|
||||
* For conditions of distribution and use, see copyright notice in COPYING
|
||||
*/
|
||||
#ifndef METADATA_H
|
||||
#define METADATA_H
|
||||
|
||||
#include "m4af.h"
|
||||
|
||||
typedef struct aacenc_tag_entry_t {
|
||||
uint32_t tag;
|
||||
char *name;
|
||||
char *data;
|
||||
uint32_t data_size;
|
||||
} aacenc_tag_entry_t;
|
||||
|
||||
typedef struct aacenc_tag_store_t {
|
||||
aacenc_tag_entry_t *tag_table;
|
||||
unsigned tag_count;
|
||||
unsigned tag_table_capacity;
|
||||
} aacenc_tag_store_t;
|
||||
|
||||
typedef struct aacenc_translate_generic_text_tag_ctx_t {
|
||||
unsigned track, track_total, disc, disc_total;
|
||||
void (*add)(void *, const aacenc_tag_entry_t *);
|
||||
void *add_ctx;
|
||||
} aacenc_translate_generic_text_tag_ctx_t;
|
||||
|
||||
typedef void (*aacenc_tag_callback_t)(void *ctx, const char *key,
|
||||
const char *value, uint32_t size);
|
||||
|
||||
void aacenc_translate_generic_text_tag(void *ctx, const char *key,
|
||||
const char *val, uint32_t size);
|
||||
|
||||
|
||||
void aacenc_add_tag_to_store(aacenc_tag_store_t *store, uint32_t tag,
|
||||
const char *key, const char *value,
|
||||
uint32_t size, int is_file_name);
|
||||
|
||||
void aacenc_add_tag_entry_to_store(void *store, const aacenc_tag_entry_t *tag);
|
||||
|
||||
void aacenc_free_tag_store(aacenc_tag_store_t *store);
|
||||
|
||||
void aacenc_write_tags_from_json(m4af_ctx_t *m4af, const char *json_filename);
|
||||
|
||||
void aacenc_write_tag_entry(void *m4af, const aacenc_tag_entry_t *tag);
|
||||
|
||||
#endif
|
647
src/parson.c
Normal file
647
src/parson.c
Normal file
@ -0,0 +1,647 @@
|
||||
/*
|
||||
Parson ( http://kgabis.github.com/parson/ )
|
||||
Copyright (c) 2012 Krzysztof Gabis
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "parson.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#define ERROR 0
|
||||
#define SUCCESS 1
|
||||
#define STARTING_CAPACITY 15
|
||||
#define ARRAY_MAX_CAPACITY 122880 /* 15*(2^13) */
|
||||
#define OBJECT_MAX_CAPACITY 960 /* 15*(2^6) */
|
||||
#define MAX_NESTING 19
|
||||
#define sizeof_token(a) (sizeof(a) - 1)
|
||||
#define skip_char(str) ((*str)++)
|
||||
#define skip_whitespaces(str) while (isspace(**string)) { skip_char(string); }
|
||||
#define MAX(a, b) ((a) > (b) ? (a) : (b))
|
||||
|
||||
#define parson_malloc(a) malloc(a)
|
||||
#define parson_free(a) free((void*)a)
|
||||
#define parson_realloc(a, b) realloc(a, b)
|
||||
|
||||
/* Type definitions */
|
||||
typedef union json_value_value {
|
||||
const char *string;
|
||||
double number;
|
||||
JSON_Object *object;
|
||||
JSON_Array *array;
|
||||
int boolean;
|
||||
int null;
|
||||
} JSON_Value_Value;
|
||||
|
||||
struct json_value_t {
|
||||
JSON_Value_Type type;
|
||||
JSON_Value_Value value;
|
||||
};
|
||||
|
||||
struct json_object_t {
|
||||
const char **names;
|
||||
JSON_Value **values;
|
||||
size_t count;
|
||||
size_t capacity;
|
||||
};
|
||||
|
||||
struct json_array_t {
|
||||
JSON_Value **items;
|
||||
size_t count;
|
||||
size_t capacity;
|
||||
};
|
||||
|
||||
/* Various */
|
||||
static int try_realloc(void **ptr, size_t new_size);
|
||||
static char * parson_strndup(const char *string, size_t n);
|
||||
static int is_utf(const unsigned char *string);
|
||||
static int is_decimal(const char *string, size_t length);
|
||||
|
||||
/* JSON Object */
|
||||
static JSON_Object * json_object_init(void);
|
||||
static int json_object_add(JSON_Object *object, const char *name, JSON_Value *value);
|
||||
static int json_object_resize(JSON_Object *object, size_t capacity);
|
||||
static JSON_Value * json_object_nget_value(const JSON_Object *object, const char *name, size_t n);
|
||||
static void json_object_free(JSON_Object *object);
|
||||
|
||||
/* JSON Array */
|
||||
static JSON_Array * json_array_init(void);
|
||||
static int json_array_add(JSON_Array *array, JSON_Value *value);
|
||||
static int json_array_resize(JSON_Array *array, size_t capacity);
|
||||
static void json_array_free(JSON_Array *array);
|
||||
|
||||
/* JSON Value */
|
||||
static JSON_Value * json_value_init_object(void);
|
||||
static JSON_Value * json_value_init_array(void);
|
||||
static JSON_Value * json_value_init_string(const char *string);
|
||||
static JSON_Value * json_value_init_number(double number);
|
||||
static JSON_Value * json_value_init_boolean(int boolean);
|
||||
static JSON_Value * json_value_init_null(void);
|
||||
|
||||
/* Parser */
|
||||
static void skip_quotes(const char **string);
|
||||
static const char * get_processed_string(const char **string);
|
||||
static JSON_Value * parse_object_value(const char **string, size_t nesting);
|
||||
static JSON_Value * parse_array_value(const char **string, size_t nesting);
|
||||
static JSON_Value * parse_string_value(const char **string);
|
||||
static JSON_Value * parse_boolean_value(const char **string);
|
||||
static JSON_Value * parse_number_value(const char **string);
|
||||
static JSON_Value * parse_null_value(const char **string);
|
||||
static JSON_Value * parse_value(const char **string, size_t nesting);
|
||||
|
||||
/* Various */
|
||||
static int try_realloc(void **ptr, size_t new_size) {
|
||||
void *reallocated_ptr = parson_realloc(*ptr, new_size);
|
||||
if (!reallocated_ptr) { return ERROR; }
|
||||
*ptr = reallocated_ptr;
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
static char * parson_strndup(const char *string, size_t n) {
|
||||
char *output_string = (char*)parson_malloc(n + 1);
|
||||
if (!output_string) { return NULL; }
|
||||
output_string[n] = '\0';
|
||||
strncpy(output_string, string, n);
|
||||
return output_string;
|
||||
}
|
||||
|
||||
static int is_utf(const unsigned char *s) {
|
||||
return isxdigit(s[0]) && isxdigit(s[1]) && isxdigit(s[2]) && isxdigit(s[3]);
|
||||
}
|
||||
|
||||
static int is_decimal(const char *string, size_t length) {
|
||||
if (length > 1 && string[0] == '0' && string[1] != '.') { return 0; }
|
||||
if (length > 2 && !strncmp(string, "-0", 2) && string[2] != '.') { return 0; }
|
||||
while (length--) { if (strchr("xX", string[length])) { return 0; } }
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* JSON Object */
|
||||
static JSON_Object * json_object_init(void) {
|
||||
JSON_Object *new_obj = (JSON_Object*)parson_malloc(sizeof(JSON_Object));
|
||||
if (!new_obj) { return NULL; }
|
||||
new_obj->names = (const char**)NULL;
|
||||
new_obj->values = (JSON_Value**)NULL;
|
||||
new_obj->capacity = 0;
|
||||
new_obj->count = 0;
|
||||
return new_obj;
|
||||
}
|
||||
|
||||
static int json_object_add(JSON_Object *object, const char *name, JSON_Value *value) {
|
||||
size_t index;
|
||||
if (object->count >= object->capacity) {
|
||||
size_t new_capacity = MAX(object->capacity * 2, STARTING_CAPACITY);
|
||||
if (new_capacity > OBJECT_MAX_CAPACITY) { return ERROR; }
|
||||
if (json_object_resize(object, new_capacity) == ERROR) { return ERROR; }
|
||||
}
|
||||
if (json_object_get_value(object, name) != NULL) { return ERROR; }
|
||||
index = object->count;
|
||||
object->names[index] = parson_strndup(name, strlen(name));
|
||||
if (!object->names[index]) { return ERROR; }
|
||||
object->values[index] = value;
|
||||
object->count++;
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
static int json_object_resize(JSON_Object *object, size_t capacity) {
|
||||
if (try_realloc((void**)&object->names, capacity * sizeof(char*)) == ERROR) { return ERROR; }
|
||||
if (try_realloc((void**)&object->values, capacity * sizeof(JSON_Value*)) == ERROR) { return ERROR; }
|
||||
object->capacity = capacity;
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
static JSON_Value * json_object_nget_value(const JSON_Object *object, const char *name, size_t n) {
|
||||
size_t i, name_length;
|
||||
for (i = 0; i < json_object_get_count(object); i++) {
|
||||
name_length = strlen(object->names[i]);
|
||||
if (name_length != n) { continue; }
|
||||
if (strncmp(object->names[i], name, n) == 0) { return object->values[i]; }
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void json_object_free(JSON_Object *object) {
|
||||
while(object->count--) {
|
||||
parson_free(object->names[object->count]);
|
||||
json_value_free(object->values[object->count]);
|
||||
}
|
||||
parson_free(object->names);
|
||||
parson_free(object->values);
|
||||
parson_free(object);
|
||||
}
|
||||
|
||||
/* JSON Array */
|
||||
static JSON_Array * json_array_init(void) {
|
||||
JSON_Array *new_array = (JSON_Array*)parson_malloc(sizeof(JSON_Array));
|
||||
if (!new_array) { return NULL; }
|
||||
new_array->items = (JSON_Value**)NULL;
|
||||
new_array->capacity = 0;
|
||||
new_array->count = 0;
|
||||
return new_array;
|
||||
}
|
||||
|
||||
static int json_array_add(JSON_Array *array, JSON_Value *value) {
|
||||
if (array->count >= array->capacity) {
|
||||
size_t new_capacity = MAX(array->capacity * 2, STARTING_CAPACITY);
|
||||
if (new_capacity > ARRAY_MAX_CAPACITY) { return ERROR; }
|
||||
if (!json_array_resize(array, new_capacity)) { return ERROR; }
|
||||
}
|
||||
array->items[array->count] = value;
|
||||
array->count++;
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
static int json_array_resize(JSON_Array *array, size_t capacity) {
|
||||
if (try_realloc((void**)&array->items, capacity * sizeof(JSON_Value*)) == ERROR) { return ERROR; }
|
||||
array->capacity = capacity;
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
static void json_array_free(JSON_Array *array) {
|
||||
while (array->count--) { json_value_free(array->items[array->count]); }
|
||||
parson_free(array->items);
|
||||
parson_free(array);
|
||||
}
|
||||
|
||||
/* JSON Value */
|
||||
static JSON_Value * json_value_init_object(void) {
|
||||
JSON_Value *new_value = (JSON_Value*)parson_malloc(sizeof(JSON_Value));
|
||||
if (!new_value) { return NULL; }
|
||||
new_value->type = JSONObject;
|
||||
new_value->value.object = json_object_init();
|
||||
if (!new_value->value.object) { parson_free(new_value); return NULL; }
|
||||
return new_value;
|
||||
}
|
||||
|
||||
static JSON_Value * json_value_init_array(void) {
|
||||
JSON_Value *new_value = (JSON_Value*)parson_malloc(sizeof(JSON_Value));
|
||||
if (!new_value) { return NULL; }
|
||||
new_value->type = JSONArray;
|
||||
new_value->value.array = json_array_init();
|
||||
if (!new_value->value.array) { parson_free(new_value); return NULL; }
|
||||
return new_value;
|
||||
}
|
||||
|
||||
static JSON_Value * json_value_init_string(const char *string) {
|
||||
JSON_Value *new_value = (JSON_Value*)parson_malloc(sizeof(JSON_Value));
|
||||
if (!new_value) { return NULL; }
|
||||
new_value->type = JSONString;
|
||||
new_value->value.string = string;
|
||||
return new_value;
|
||||
}
|
||||
|
||||
static JSON_Value * json_value_init_number(double number) {
|
||||
JSON_Value *new_value = (JSON_Value*)parson_malloc(sizeof(JSON_Value));
|
||||
if (!new_value) { return NULL; }
|
||||
new_value->type = JSONNumber;
|
||||
new_value->value.number = number;
|
||||
return new_value;
|
||||
}
|
||||
|
||||
static JSON_Value * json_value_init_boolean(int boolean) {
|
||||
JSON_Value *new_value = (JSON_Value*)parson_malloc(sizeof(JSON_Value));
|
||||
if (!new_value) { return NULL; }
|
||||
new_value->type = JSONBoolean;
|
||||
new_value->value.boolean = boolean;
|
||||
return new_value;
|
||||
}
|
||||
|
||||
static JSON_Value * json_value_init_null(void) {
|
||||
JSON_Value *new_value = (JSON_Value*)parson_malloc(sizeof(JSON_Value));
|
||||
if (!new_value) { return NULL; }
|
||||
new_value->type = JSONNull;
|
||||
return new_value;
|
||||
}
|
||||
|
||||
/* Parser */
|
||||
static void skip_quotes(const char **string) {
|
||||
skip_char(string);
|
||||
while (**string != '\"') {
|
||||
if (**string == '\0') { return; }
|
||||
if (**string == '\\') { skip_char(string); if (**string == '\0') { return; }}
|
||||
skip_char(string);
|
||||
}
|
||||
skip_char(string);
|
||||
}
|
||||
|
||||
/* Returns contents of a string inside double quotes and parses escaped
|
||||
characters inside.
|
||||
Example: "\u006Corem ipsum" -> lorem ipsum */
|
||||
static const char * get_processed_string(const char **string) {
|
||||
const char *string_start = *string;
|
||||
char *output, *processed_ptr, *unprocessed_ptr, current_char;
|
||||
unsigned int utf_val;
|
||||
skip_quotes(string);
|
||||
if (**string == '\0') { return NULL; }
|
||||
output = parson_strndup(string_start + 1, *string - string_start - 2);
|
||||
if (!output) { return NULL; }
|
||||
processed_ptr = unprocessed_ptr = output;
|
||||
while (*unprocessed_ptr) {
|
||||
current_char = *unprocessed_ptr;
|
||||
if (current_char == '\\') {
|
||||
unprocessed_ptr++;
|
||||
current_char = *unprocessed_ptr;
|
||||
switch (current_char) {
|
||||
case '\"': case '\\': case '/': break;
|
||||
case 'b': current_char = '\b'; break;
|
||||
case 'f': current_char = '\f'; break;
|
||||
case 'n': current_char = '\n'; break;
|
||||
case 'r': current_char = '\r'; break;
|
||||
case 't': current_char = '\t'; break;
|
||||
case 'u':
|
||||
unprocessed_ptr++;
|
||||
if (!is_utf((const unsigned char*)unprocessed_ptr) ||
|
||||
sscanf(unprocessed_ptr, "%4x", &utf_val) == EOF) {
|
||||
parson_free(output); return NULL;
|
||||
}
|
||||
if (utf_val < 0x80) {
|
||||
current_char = utf_val;
|
||||
} else if (utf_val < 0x800) {
|
||||
*processed_ptr++ = (utf_val >> 6) | 0xC0;
|
||||
current_char = ((utf_val | 0x80) & 0xBF);
|
||||
} else {
|
||||
*processed_ptr++ = (utf_val >> 12) | 0xE0;
|
||||
*processed_ptr++ = (((utf_val >> 6) | 0x80) & 0xBF);
|
||||
current_char = ((utf_val | 0x80) & 0xBF);
|
||||
}
|
||||
unprocessed_ptr += 3;
|
||||
break;
|
||||
default:
|
||||
parson_free(output);
|
||||
return NULL;
|
||||
break;
|
||||
}
|
||||
} else if ((unsigned char)current_char < 0x20) { /* 0x00-0x19 are invalid characters for json string (http://www.ietf.org/rfc/rfc4627.txt) */
|
||||
parson_free(output);
|
||||
return NULL;
|
||||
}
|
||||
*processed_ptr = current_char;
|
||||
processed_ptr++;
|
||||
unprocessed_ptr++;
|
||||
}
|
||||
*processed_ptr = '\0';
|
||||
if (try_realloc((void**)&output, strlen(output) + 1) == ERROR) { return NULL; }
|
||||
return output;
|
||||
}
|
||||
|
||||
static JSON_Value * parse_value(const char **string, size_t nesting) {
|
||||
if (nesting > MAX_NESTING) { return NULL; }
|
||||
skip_whitespaces(string);
|
||||
switch (**string) {
|
||||
case '{':
|
||||
return parse_object_value(string, nesting + 1);
|
||||
case '[':
|
||||
return parse_array_value(string, nesting + 1);
|
||||
case '\"':
|
||||
return parse_string_value(string);
|
||||
case 'f': case 't':
|
||||
return parse_boolean_value(string);
|
||||
case '-':
|
||||
case '0': case '1': case '2': case '3': case '4':
|
||||
case '5': case '6': case '7': case '8': case '9':
|
||||
return parse_number_value(string);
|
||||
case 'n':
|
||||
return parse_null_value(string);
|
||||
default:
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
static JSON_Value * parse_object_value(const char **string, size_t nesting) {
|
||||
JSON_Value *output_value = json_value_init_object(), *new_value = NULL;
|
||||
JSON_Object *output_object = json_value_get_object(output_value);
|
||||
const char *new_key = NULL;
|
||||
if (!output_value) { return NULL; }
|
||||
skip_char(string);
|
||||
skip_whitespaces(string);
|
||||
if (**string == '}') { skip_char(string); return output_value; } /* empty object */
|
||||
while (**string != '\0') {
|
||||
new_key = get_processed_string(string);
|
||||
skip_whitespaces(string);
|
||||
if (!new_key || **string != ':') {
|
||||
json_value_free(output_value);
|
||||
return NULL;
|
||||
}
|
||||
skip_char(string);
|
||||
new_value = parse_value(string, nesting);
|
||||
if (!new_value) {
|
||||
parson_free(new_key);
|
||||
json_value_free(output_value);
|
||||
return NULL;
|
||||
}
|
||||
if(!json_object_add(output_object, new_key, new_value)) {
|
||||
parson_free(new_key);
|
||||
parson_free(new_value);
|
||||
json_value_free(output_value);
|
||||
return NULL;
|
||||
}
|
||||
parson_free(new_key);
|
||||
skip_whitespaces(string);
|
||||
if (**string != ',') { break; }
|
||||
skip_char(string);
|
||||
skip_whitespaces(string);
|
||||
}
|
||||
skip_whitespaces(string);
|
||||
if (**string != '}' || /* Trim object after parsing is over */
|
||||
json_object_resize(output_object, json_object_get_count(output_object)) == ERROR) {
|
||||
json_value_free(output_value);
|
||||
return NULL;
|
||||
}
|
||||
skip_char(string);
|
||||
return output_value;
|
||||
}
|
||||
|
||||
static JSON_Value * parse_array_value(const char **string, size_t nesting) {
|
||||
JSON_Value *output_value = json_value_init_array(), *new_array_value = NULL;
|
||||
JSON_Array *output_array = json_value_get_array(output_value);
|
||||
if (!output_value) { return NULL; }
|
||||
skip_char(string);
|
||||
skip_whitespaces(string);
|
||||
if (**string == ']') { /* empty array */
|
||||
skip_char(string);
|
||||
return output_value;
|
||||
}
|
||||
while (**string != '\0') {
|
||||
new_array_value = parse_value(string, nesting);
|
||||
if (!new_array_value) {
|
||||
json_value_free(output_value);
|
||||
return NULL;
|
||||
}
|
||||
if(json_array_add(output_array, new_array_value) == ERROR) {
|
||||
parson_free(new_array_value);
|
||||
json_value_free(output_value);
|
||||
return NULL;
|
||||
}
|
||||
skip_whitespaces(string);
|
||||
if (**string != ',') { break; }
|
||||
skip_char(string);
|
||||
skip_whitespaces(string);
|
||||
}
|
||||
skip_whitespaces(string);
|
||||
if (**string != ']' || /* Trim array after parsing is over */
|
||||
json_array_resize(output_array, json_array_get_count(output_array)) == ERROR) {
|
||||
json_value_free(output_value);
|
||||
return NULL;
|
||||
}
|
||||
skip_char(string);
|
||||
return output_value;
|
||||
}
|
||||
|
||||
static JSON_Value * parse_string_value(const char **string) {
|
||||
const char *new_string = get_processed_string(string);
|
||||
if (!new_string) { return NULL; }
|
||||
return json_value_init_string(new_string);
|
||||
}
|
||||
|
||||
static JSON_Value * parse_boolean_value(const char **string) {
|
||||
size_t true_token_size = sizeof_token("true");
|
||||
size_t false_token_size = sizeof_token("false");
|
||||
if (strncmp("true", *string, true_token_size) == 0) {
|
||||
*string += true_token_size;
|
||||
return json_value_init_boolean(1);
|
||||
} else if (strncmp("false", *string, false_token_size) == 0) {
|
||||
*string += false_token_size;
|
||||
return json_value_init_boolean(0);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static JSON_Value * parse_number_value(const char **string) {
|
||||
char *end;
|
||||
double number = strtod(*string, &end);
|
||||
JSON_Value *output_value;
|
||||
if (is_decimal(*string, end - *string)) {
|
||||
*string = end;
|
||||
output_value = json_value_init_number(number);
|
||||
} else {
|
||||
output_value = NULL;
|
||||
}
|
||||
return output_value;
|
||||
}
|
||||
|
||||
static JSON_Value * parse_null_value(const char **string) {
|
||||
size_t token_size = sizeof_token("null");
|
||||
if (strncmp("null", *string, token_size) == 0) {
|
||||
*string += token_size;
|
||||
return json_value_init_null();
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Parser API */
|
||||
JSON_Value * json_parse_file(const char *filename) {
|
||||
FILE *fp = fopen(filename, "r");
|
||||
size_t file_size;
|
||||
char *file_contents;
|
||||
JSON_Value *output_value;
|
||||
if (!fp) { return NULL; }
|
||||
fseek(fp, 0L, SEEK_END);
|
||||
file_size = ftell(fp);
|
||||
rewind(fp);
|
||||
file_contents = (char*)parson_malloc(sizeof(char) * (file_size + 1));
|
||||
if (!file_contents) { fclose(fp); return NULL; }
|
||||
fread(file_contents, file_size, 1, fp);
|
||||
fclose(fp);
|
||||
file_contents[file_size] = '\0';
|
||||
output_value = json_parse_string(file_contents);
|
||||
parson_free(file_contents);
|
||||
return output_value;
|
||||
}
|
||||
|
||||
JSON_Value * json_parse_string(const char *string) {
|
||||
if (!string || (*string != '{' && *string != '[')) { return NULL; }
|
||||
return parse_value((const char**)&string, 0);
|
||||
}
|
||||
|
||||
/* JSON Object API */
|
||||
JSON_Value * json_object_get_value(const JSON_Object *object, const char *name) {
|
||||
return json_object_nget_value(object, name, strlen(name));
|
||||
}
|
||||
|
||||
const char * json_object_get_string(const JSON_Object *object, const char *name) {
|
||||
return json_value_get_string(json_object_get_value(object, name));
|
||||
}
|
||||
|
||||
double json_object_get_number(const JSON_Object *object, const char *name) {
|
||||
return json_value_get_number(json_object_get_value(object, name));
|
||||
}
|
||||
|
||||
JSON_Object * json_object_get_object(const JSON_Object *object, const char *name) {
|
||||
return json_value_get_object(json_object_get_value(object, name));
|
||||
}
|
||||
|
||||
JSON_Array * json_object_get_array(const JSON_Object *object, const char *name) {
|
||||
return json_value_get_array(json_object_get_value(object, name));
|
||||
}
|
||||
|
||||
int json_object_get_boolean(const JSON_Object *object, const char *name) {
|
||||
return json_value_get_boolean(json_object_get_value(object, name));
|
||||
}
|
||||
|
||||
JSON_Value * json_object_dotget_value(const JSON_Object *object, const char *name) {
|
||||
const char *dot_position = strchr(name, '.');
|
||||
if (!dot_position) { return json_object_get_value(object, name); }
|
||||
object = json_value_get_object(json_object_nget_value(object, name, dot_position - name));
|
||||
return json_object_dotget_value(object, dot_position + 1);
|
||||
}
|
||||
|
||||
const char * json_object_dotget_string(const JSON_Object *object, const char *name) {
|
||||
return json_value_get_string(json_object_dotget_value(object, name));
|
||||
}
|
||||
|
||||
double json_object_dotget_number(const JSON_Object *object, const char *name) {
|
||||
return json_value_get_number(json_object_dotget_value(object, name));
|
||||
}
|
||||
|
||||
JSON_Object * json_object_dotget_object(const JSON_Object *object, const char *name) {
|
||||
return json_value_get_object(json_object_dotget_value(object, name));
|
||||
}
|
||||
|
||||
JSON_Array * json_object_dotget_array(const JSON_Object *object, const char *name) {
|
||||
return json_value_get_array(json_object_dotget_value(object, name));
|
||||
}
|
||||
|
||||
int json_object_dotget_boolean(const JSON_Object *object, const char *name) {
|
||||
return json_value_get_boolean(json_object_dotget_value(object, name));
|
||||
}
|
||||
|
||||
size_t json_object_get_count(const JSON_Object *object) {
|
||||
return object ? object->count : 0;
|
||||
}
|
||||
|
||||
const char * json_object_get_name(const JSON_Object *object, size_t index) {
|
||||
if (index >= json_object_get_count(object)) { return NULL; }
|
||||
return object->names[index];
|
||||
}
|
||||
|
||||
/* JSON Array API */
|
||||
JSON_Value * json_array_get_value(const JSON_Array *array, size_t index) {
|
||||
if (index >= json_array_get_count(array)) { return NULL; }
|
||||
return array->items[index];
|
||||
}
|
||||
|
||||
const char * json_array_get_string(const JSON_Array *array, size_t index) {
|
||||
return json_value_get_string(json_array_get_value(array, index));
|
||||
}
|
||||
|
||||
double json_array_get_number(const JSON_Array *array, size_t index) {
|
||||
return json_value_get_number(json_array_get_value(array, index));
|
||||
}
|
||||
|
||||
JSON_Object * json_array_get_object(const JSON_Array *array, size_t index) {
|
||||
return json_value_get_object(json_array_get_value(array, index));
|
||||
}
|
||||
|
||||
JSON_Array * json_array_get_array(const JSON_Array *array, size_t index) {
|
||||
return json_value_get_array(json_array_get_value(array, index));
|
||||
}
|
||||
|
||||
int json_array_get_boolean(const JSON_Array *array, size_t index) {
|
||||
return json_value_get_boolean(json_array_get_value(array, index));
|
||||
}
|
||||
|
||||
size_t json_array_get_count(const JSON_Array *array) {
|
||||
return array ? array->count : 0;
|
||||
}
|
||||
|
||||
/* JSON Value API */
|
||||
JSON_Value_Type json_value_get_type(const JSON_Value *value) {
|
||||
return value ? value->type : JSONError;
|
||||
}
|
||||
|
||||
JSON_Object * json_value_get_object(const JSON_Value *value) {
|
||||
return json_value_get_type(value) == JSONObject ? value->value.object : NULL;
|
||||
}
|
||||
|
||||
JSON_Array * json_value_get_array(const JSON_Value *value) {
|
||||
return json_value_get_type(value) == JSONArray ? value->value.array : NULL;
|
||||
}
|
||||
|
||||
const char * json_value_get_string(const JSON_Value *value) {
|
||||
return json_value_get_type(value) == JSONString ? value->value.string : NULL;
|
||||
}
|
||||
|
||||
double json_value_get_number(const JSON_Value *value) {
|
||||
return json_value_get_type(value) == JSONNumber ? value->value.number : 0;
|
||||
}
|
||||
|
||||
int json_value_get_boolean(const JSON_Value *value) {
|
||||
return json_value_get_type(value) == JSONBoolean ? value->value.boolean : -1;
|
||||
}
|
||||
|
||||
void json_value_free(JSON_Value *value) {
|
||||
switch (json_value_get_type(value)) {
|
||||
case JSONObject:
|
||||
json_object_free(value->value.object);
|
||||
break;
|
||||
case JSONString:
|
||||
if (value->value.string) { parson_free(value->value.string); }
|
||||
break;
|
||||
case JSONArray:
|
||||
json_array_free(value->value.array);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
parson_free(value);
|
||||
}
|
100
src/parson.h
Normal file
100
src/parson.h
Normal file
@ -0,0 +1,100 @@
|
||||
/*
|
||||
Parson ( http://kgabis.github.com/parson/ )
|
||||
Copyright (c) 2012 Krzysztof Gabis
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef parson_parson_h
|
||||
#define parson_parson_h
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
#include <stddef.h> /* size_t */
|
||||
|
||||
/* Types and enums */
|
||||
typedef struct json_object_t JSON_Object;
|
||||
typedef struct json_array_t JSON_Array;
|
||||
typedef struct json_value_t JSON_Value;
|
||||
|
||||
typedef enum json_value_type {
|
||||
JSONError = 0,
|
||||
JSONNull = 1,
|
||||
JSONString = 2,
|
||||
JSONNumber = 3,
|
||||
JSONObject = 4,
|
||||
JSONArray = 5,
|
||||
JSONBoolean = 6
|
||||
} JSON_Value_Type;
|
||||
|
||||
/* Parses first JSON value in a file, returns NULL in case of error */
|
||||
JSON_Value * json_parse_file(const char *filename);
|
||||
|
||||
/* Parses first JSON value in a string, returns NULL in case of error */
|
||||
JSON_Value * json_parse_string(const char *string);
|
||||
|
||||
/* JSON Object */
|
||||
JSON_Value * json_object_get_value (const JSON_Object *object, const char *name);
|
||||
const char * json_object_get_string (const JSON_Object *object, const char *name);
|
||||
JSON_Object * json_object_get_object (const JSON_Object *object, const char *name);
|
||||
JSON_Array * json_object_get_array (const JSON_Object *object, const char *name);
|
||||
double json_object_get_number (const JSON_Object *object, const char *name);
|
||||
int json_object_get_boolean(const JSON_Object *object, const char *name);
|
||||
|
||||
/* dotget functions enable addressing values with dot notation in nested objects,
|
||||
just like in structs or c++/java/c# objects (e.g. objectA.objectB.value).
|
||||
Because valid names in JSON can contain dots, some values may be inaccessible
|
||||
this way. */
|
||||
JSON_Value * json_object_dotget_value (const JSON_Object *object, const char *name);
|
||||
const char * json_object_dotget_string (const JSON_Object *object, const char *name);
|
||||
JSON_Object * json_object_dotget_object (const JSON_Object *object, const char *name);
|
||||
JSON_Array * json_object_dotget_array (const JSON_Object *object, const char *name);
|
||||
double json_object_dotget_number (const JSON_Object *object, const char *name);
|
||||
int json_object_dotget_boolean(const JSON_Object *object, const char *name);
|
||||
|
||||
/* Functions to get available names */
|
||||
size_t json_object_get_count(const JSON_Object *object);
|
||||
const char * json_object_get_name (const JSON_Object *object, size_t index);
|
||||
|
||||
/* JSON Array */
|
||||
JSON_Value * json_array_get_value (const JSON_Array *array, size_t index);
|
||||
const char * json_array_get_string (const JSON_Array *array, size_t index);
|
||||
JSON_Object * json_array_get_object (const JSON_Array *array, size_t index);
|
||||
JSON_Array * json_array_get_array (const JSON_Array *array, size_t index);
|
||||
double json_array_get_number (const JSON_Array *array, size_t index);
|
||||
int json_array_get_boolean(const JSON_Array *array, size_t index);
|
||||
size_t json_array_get_count (const JSON_Array *array);
|
||||
|
||||
/* JSON Value */
|
||||
JSON_Value_Type json_value_get_type (const JSON_Value *value);
|
||||
JSON_Object * json_value_get_object (const JSON_Value *value);
|
||||
JSON_Array * json_value_get_array (const JSON_Value *value);
|
||||
const char * json_value_get_string (const JSON_Value *value);
|
||||
double json_value_get_number (const JSON_Value *value);
|
||||
int json_value_get_boolean(const JSON_Value *value);
|
||||
void json_value_free (JSON_Value *value);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
85
src/pcm_float_converter.c
Normal file
85
src/pcm_float_converter.c
Normal file
@ -0,0 +1,85 @@
|
||||
/*
|
||||
* Copyright (C) 2013 nu774
|
||||
* For conditions of distribution and use, see copyright notice in COPYING
|
||||
*/
|
||||
#if HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#if HAVE_STDINT_H
|
||||
# include <stdint.h>
|
||||
#endif
|
||||
#include "pcm_reader.h"
|
||||
|
||||
typedef struct pcm_float_converter_t {
|
||||
pcm_reader_vtbl_t *vtbl;
|
||||
pcm_reader_t *src;
|
||||
pcm_sample_description_t format;
|
||||
} pcm_float_converter_t;
|
||||
|
||||
static inline pcm_reader_t *get_source(pcm_reader_t *reader)
|
||||
{
|
||||
return ((pcm_float_converter_t *)reader)->src;
|
||||
}
|
||||
|
||||
static const
|
||||
pcm_sample_description_t *get_format(pcm_reader_t *reader)
|
||||
{
|
||||
return &((pcm_float_converter_t *)reader)->format;
|
||||
}
|
||||
|
||||
static int64_t get_length(pcm_reader_t *reader)
|
||||
{
|
||||
return pcm_get_length(get_source(reader));
|
||||
}
|
||||
|
||||
static int64_t get_position(pcm_reader_t *reader)
|
||||
{
|
||||
return pcm_get_position(get_source(reader));
|
||||
}
|
||||
|
||||
static int read_frames(pcm_reader_t *reader, void *buffer, unsigned nframes)
|
||||
{
|
||||
unsigned i;
|
||||
pcm_float_converter_t *self = (pcm_float_converter_t *)reader;
|
||||
const pcm_sample_description_t *sfmt = pcm_get_format(self->src);
|
||||
nframes = pcm_read_frames(self->src, buffer, nframes);
|
||||
if (!(sfmt->sample_type & PCM_TYPE_FLOAT)) {
|
||||
int32_t *ip = buffer;
|
||||
float *op = buffer;
|
||||
unsigned i, count = nframes * sfmt->channels_per_frame;
|
||||
for (i = 0; i < count; ++i)
|
||||
op[i] = ip[i] / 2147483648.0f;
|
||||
}
|
||||
return nframes;
|
||||
}
|
||||
|
||||
static void teardown(pcm_reader_t **reader)
|
||||
{
|
||||
pcm_float_converter_t *self = (pcm_float_converter_t *)*reader;
|
||||
pcm_teardown(&self->src);
|
||||
free(self);
|
||||
*reader = 0;
|
||||
}
|
||||
|
||||
static pcm_reader_vtbl_t my_vtable = {
|
||||
get_format, get_length, get_position, read_frames, teardown
|
||||
};
|
||||
|
||||
pcm_reader_t *pcm_open_float_converter(pcm_reader_t *reader)
|
||||
{
|
||||
pcm_float_converter_t *self = 0;
|
||||
pcm_sample_description_t *fmt;
|
||||
|
||||
if ((self = calloc(1, sizeof(pcm_float_converter_t))) == 0)
|
||||
return 0;
|
||||
self->src = reader;
|
||||
self->vtbl = &my_vtable;
|
||||
memcpy(&self->format, pcm_get_format(reader), sizeof(self->format));
|
||||
fmt = &self->format;
|
||||
fmt->bits_per_channel = 32;
|
||||
fmt->sample_type = PCM_TYPE_FLOAT;
|
||||
fmt->bytes_per_frame = 4 * fmt->channels_per_frame;
|
||||
return (pcm_reader_t *)self;
|
||||
}
|
272
src/pcm_native_converter.c
Normal file
272
src/pcm_native_converter.c
Normal file
@ -0,0 +1,272 @@
|
||||
/*
|
||||
* Copyright (C) 2013 nu774
|
||||
* For conditions of distribution and use, see copyright notice in COPYING
|
||||
*/
|
||||
#if HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#if HAVE_STDINT_H
|
||||
# include <stdint.h>
|
||||
#endif
|
||||
#include "m4af_endian.h"
|
||||
#include "pcm_reader.h"
|
||||
|
||||
static
|
||||
inline float pcm_i2f(int32_t n)
|
||||
{
|
||||
union {
|
||||
int32_t ivalue;
|
||||
float fvalue;
|
||||
} u;
|
||||
u.ivalue = n;
|
||||
return u.fvalue;
|
||||
}
|
||||
static
|
||||
inline double pcm_i2d(int64_t n)
|
||||
{
|
||||
union {
|
||||
int64_t ivalue;
|
||||
double fvalue;
|
||||
} u;
|
||||
u.ivalue = n;
|
||||
return u.fvalue;
|
||||
}
|
||||
static
|
||||
inline int32_t pcm_s8_to_s32(int8_t n)
|
||||
{
|
||||
return n << 24;
|
||||
}
|
||||
static
|
||||
inline int32_t pcm_u8_to_s32(uint8_t n)
|
||||
{
|
||||
return (n << 24) ^ 0x80000000;
|
||||
}
|
||||
static
|
||||
inline int32_t pcm_s16le_to_s32(int16_t n)
|
||||
{
|
||||
return m4af_ltoh16(n) << 16;
|
||||
}
|
||||
static
|
||||
inline int32_t pcm_s16be_to_s32(int16_t n)
|
||||
{
|
||||
return m4af_btoh16(n) << 16;
|
||||
}
|
||||
static
|
||||
inline int32_t pcm_u16le_to_s32(uint16_t n)
|
||||
{
|
||||
return (m4af_ltoh16(n) << 16) ^ 0x80000000;
|
||||
}
|
||||
static
|
||||
inline int32_t pcm_u16be_to_s32(uint16_t n)
|
||||
{
|
||||
return (m4af_btoh16(n) << 16) ^ 0x80000000;
|
||||
}
|
||||
static
|
||||
inline int32_t pcm_s24le_to_s32(uint8_t *p)
|
||||
{
|
||||
return p[0]<<8 | p[1]<<16 | p[2]<<24;
|
||||
}
|
||||
static
|
||||
inline int32_t pcm_s24be_to_s32(uint8_t *p)
|
||||
{
|
||||
return p[0]<<24 | p[1]<<16 | p[2]<<8;
|
||||
}
|
||||
static
|
||||
inline int32_t pcm_u24le_to_s32(uint8_t *p)
|
||||
{
|
||||
return pcm_s24le_to_s32(p) ^ 0x80000000;
|
||||
}
|
||||
static
|
||||
inline int32_t pcm_u24be_to_s32(uint8_t *p)
|
||||
{
|
||||
return pcm_s24be_to_s32(p) ^ 0x80000000;
|
||||
}
|
||||
static
|
||||
inline int32_t pcm_s32le_to_s32(int32_t n)
|
||||
{
|
||||
return m4af_ltoh32(n);
|
||||
}
|
||||
static
|
||||
inline int32_t pcm_s32be_to_s32(int32_t n)
|
||||
{
|
||||
return m4af_btoh32(n);
|
||||
}
|
||||
static
|
||||
inline int32_t pcm_u32le_to_s32(int32_t n)
|
||||
{
|
||||
return m4af_ltoh32(n) ^ 0x80000000;
|
||||
}
|
||||
static
|
||||
inline int32_t pcm_u32be_to_s32(int32_t n)
|
||||
{
|
||||
return m4af_btoh32(n) ^ 0x80000000;
|
||||
}
|
||||
static
|
||||
inline float pcm_f32le_to_f32(int32_t n)
|
||||
{
|
||||
return pcm_i2f(m4af_ltoh32(n));
|
||||
}
|
||||
static
|
||||
inline float pcm_f32be_to_f32(int32_t n)
|
||||
{
|
||||
return pcm_i2f(m4af_btoh32(n));
|
||||
}
|
||||
static
|
||||
inline float pcm_f64le_to_f32(int64_t n)
|
||||
{
|
||||
return pcm_i2d(m4af_ltoh64(n));
|
||||
}
|
||||
static
|
||||
inline float pcm_f64be_to_f32(int64_t n)
|
||||
{
|
||||
return pcm_i2d(m4af_btoh64(n));
|
||||
}
|
||||
|
||||
static
|
||||
int pcm_convert_to_native(const pcm_sample_description_t *format,
|
||||
const void *input, uint32_t nframes,
|
||||
void *result)
|
||||
{
|
||||
#define CONVERT(type, rtype, conv) \
|
||||
do { \
|
||||
unsigned i; \
|
||||
type *ip = (type *)input; \
|
||||
for (i = 0; i < count; ++i) { \
|
||||
((rtype *)result)[i] = conv(ip[i]); \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
#define CONVERT_BYTES(rtype, conv) \
|
||||
do { \
|
||||
unsigned i, bytes_per_channel; \
|
||||
uint8_t *ip = (uint8_t *)input; \
|
||||
bytes_per_channel = PCM_BYTES_PER_CHANNEL(format); \
|
||||
for (i = 0; i < count; ++i) { \
|
||||
((rtype *)result)[i] = conv(ip); \
|
||||
ip += bytes_per_channel; \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
uint32_t count = nframes * format->channels_per_frame;
|
||||
if (!count)
|
||||
return 0;
|
||||
switch (PCM_BYTES_PER_CHANNEL(format) | format->sample_type<<4) {
|
||||
case 1 | PCM_TYPE_SINT<<4:
|
||||
CONVERT(int8_t, int32_t, pcm_s8_to_s32); break;
|
||||
case 1 | PCM_TYPE_UINT<<4:
|
||||
CONVERT(uint8_t, int32_t, pcm_u8_to_s32); break;
|
||||
case 2 | PCM_TYPE_SINT<<4:
|
||||
CONVERT(int16_t, int32_t, pcm_s16le_to_s32); break;
|
||||
case 2 | PCM_TYPE_UINT<<4:
|
||||
CONVERT(uint16_t, int32_t, pcm_u16le_to_s32); break;
|
||||
case 2 | PCM_TYPE_SINT_BE<<4:
|
||||
CONVERT(int16_t, int32_t, pcm_s16be_to_s32); break;
|
||||
case 2 | PCM_TYPE_UINT_BE<<4:
|
||||
CONVERT(int16_t, int32_t, pcm_u16be_to_s32); break;
|
||||
case 3 | PCM_TYPE_SINT<<4:
|
||||
CONVERT_BYTES(int32_t, pcm_s24le_to_s32); break;
|
||||
case 3 | PCM_TYPE_UINT<<4:
|
||||
CONVERT_BYTES(int32_t, pcm_u24le_to_s32); break;
|
||||
case 3 | PCM_TYPE_SINT_BE<<4:
|
||||
CONVERT_BYTES(int32_t, pcm_s24be_to_s32); break;
|
||||
case 3 | PCM_TYPE_UINT_BE<<4:
|
||||
CONVERT_BYTES(int32_t, pcm_u24be_to_s32); break;
|
||||
case 4 | PCM_TYPE_SINT<<4:
|
||||
CONVERT(int32_t, int32_t, pcm_s32le_to_s32); break;
|
||||
case 4 | PCM_TYPE_UINT<<4:
|
||||
CONVERT(uint32_t, int32_t, pcm_u32le_to_s32); break;
|
||||
case 4 | PCM_TYPE_FLOAT<<4:
|
||||
CONVERT(int32_t, float, pcm_f32le_to_f32); break;
|
||||
case 4 | PCM_TYPE_SINT_BE<<4:
|
||||
CONVERT(int32_t, int32_t, pcm_s32be_to_s32); break;
|
||||
case 4 | PCM_TYPE_UINT_BE<<4:
|
||||
CONVERT(uint32_t, int32_t, pcm_u32be_to_s32); break;
|
||||
case 4 | PCM_TYPE_FLOAT_BE<<4:
|
||||
CONVERT(int32_t, float, pcm_f32be_to_f32); break;
|
||||
case 8 | PCM_TYPE_FLOAT<<4:
|
||||
CONVERT(int64_t, float, pcm_f64le_to_f32); break;
|
||||
case 8 | PCM_TYPE_FLOAT_BE<<4:
|
||||
CONVERT(int64_t, float, pcm_f64be_to_f32); break;
|
||||
default:
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
typedef struct pcm_native_converter_t {
|
||||
pcm_reader_vtbl_t *vtbl;
|
||||
pcm_reader_t *src;
|
||||
pcm_sample_description_t format;
|
||||
void *pivot;
|
||||
unsigned capacity;
|
||||
} pcm_native_converter_t;
|
||||
|
||||
static inline pcm_reader_t *get_source(pcm_reader_t *reader)
|
||||
{
|
||||
return ((pcm_native_converter_t *)reader)->src;
|
||||
}
|
||||
|
||||
static const
|
||||
pcm_sample_description_t *get_format(pcm_reader_t *reader)
|
||||
{
|
||||
return &((pcm_native_converter_t *)reader)->format;
|
||||
}
|
||||
|
||||
static int64_t get_length(pcm_reader_t *reader)
|
||||
{
|
||||
return pcm_get_length(get_source(reader));
|
||||
}
|
||||
|
||||
static int64_t get_position(pcm_reader_t *reader)
|
||||
{
|
||||
return pcm_get_position(get_source(reader));
|
||||
}
|
||||
|
||||
static int read_frames(pcm_reader_t *reader, void *buffer, unsigned nframes)
|
||||
{
|
||||
pcm_native_converter_t *self = (pcm_native_converter_t *)reader;
|
||||
const pcm_sample_description_t *sfmt = pcm_get_format(self->src);
|
||||
unsigned bytes = nframes * sfmt->bytes_per_frame;
|
||||
|
||||
if (self->capacity < bytes) {
|
||||
void *p = realloc(self->pivot, bytes);
|
||||
if (!p) return -1;
|
||||
self->pivot = p;
|
||||
self->capacity = bytes;
|
||||
}
|
||||
nframes = pcm_read_frames(self->src, self->pivot, nframes);
|
||||
if (pcm_convert_to_native(sfmt, self->pivot, nframes, buffer) < 0)
|
||||
return -1;
|
||||
return nframes;
|
||||
}
|
||||
|
||||
static void teardown(pcm_reader_t **reader)
|
||||
{
|
||||
pcm_native_converter_t *self = (pcm_native_converter_t *)*reader;
|
||||
pcm_teardown(&self->src);
|
||||
free(self->pivot);
|
||||
free(self);
|
||||
*reader = 0;
|
||||
}
|
||||
|
||||
static pcm_reader_vtbl_t my_vtable = {
|
||||
get_format, get_length, get_position, read_frames, teardown
|
||||
};
|
||||
|
||||
pcm_reader_t *pcm_open_native_converter(pcm_reader_t *reader)
|
||||
{
|
||||
pcm_native_converter_t *self = 0;
|
||||
pcm_sample_description_t *fmt;
|
||||
|
||||
if ((self = calloc(1, sizeof(pcm_native_converter_t))) == 0)
|
||||
return 0;
|
||||
self->src = reader;
|
||||
self->vtbl = &my_vtable;
|
||||
memcpy(&self->format, pcm_get_format(reader), sizeof(self->format));
|
||||
fmt = &self->format;
|
||||
fmt->sample_type = PCM_IS_FLOAT(fmt) ? PCM_TYPE_FLOAT : PCM_TYPE_SINT;
|
||||
fmt->bytes_per_frame = 4 * fmt->channels_per_frame;
|
||||
return (pcm_reader_t *)self;
|
||||
}
|
124
src/pcm_reader.h
Normal file
124
src/pcm_reader.h
Normal file
@ -0,0 +1,124 @@
|
||||
/*
|
||||
* Copyright (C) 2013 nu774
|
||||
* For conditions of distribution and use, see copyright notice in COPYING
|
||||
*/
|
||||
#ifndef PCM_READER_H
|
||||
#define PCM_READER_H
|
||||
|
||||
#include "lpcm.h"
|
||||
#include "metadata.h"
|
||||
|
||||
typedef struct pcm_reader_t pcm_reader_t;
|
||||
|
||||
typedef struct pcm_reader_vtbl_t {
|
||||
const pcm_sample_description_t *(*get_format)(pcm_reader_t *);
|
||||
int64_t (*get_length)(pcm_reader_t *);
|
||||
int64_t (*get_position)(pcm_reader_t *);
|
||||
int (*read_frames)(pcm_reader_t *, void *, unsigned);
|
||||
void (*teardown)(pcm_reader_t **);
|
||||
} pcm_reader_vtbl_t;
|
||||
|
||||
struct pcm_reader_t {
|
||||
pcm_reader_vtbl_t *vtbl;
|
||||
};
|
||||
|
||||
typedef int (*pcm_read_callback)(void *cookie, void *data, uint32_t count);
|
||||
typedef int (*pcm_seek_callback)(void *cookie, int64_t off, int whence);
|
||||
typedef int64_t (*pcm_tell_callback)(void *cookie);
|
||||
|
||||
typedef struct pcm_io_vtbl_t {
|
||||
pcm_read_callback read;
|
||||
pcm_seek_callback seek;
|
||||
pcm_tell_callback tell;
|
||||
} pcm_io_vtbl_t;
|
||||
|
||||
typedef struct pcm_io_context_t {
|
||||
pcm_io_vtbl_t *vtbl;
|
||||
void *cookie;
|
||||
} pcm_io_context_t;
|
||||
|
||||
static inline
|
||||
const pcm_sample_description_t *pcm_get_format(pcm_reader_t *r)
|
||||
{
|
||||
return r->vtbl->get_format(r);
|
||||
}
|
||||
|
||||
static inline
|
||||
int64_t pcm_get_length(pcm_reader_t *r)
|
||||
{
|
||||
return r->vtbl->get_length(r);
|
||||
}
|
||||
|
||||
static inline
|
||||
int64_t pcm_get_position(pcm_reader_t *r)
|
||||
{
|
||||
return r->vtbl->get_position(r);
|
||||
}
|
||||
|
||||
int pcm_read_frames(pcm_reader_t *r, void *data, unsigned nframes);
|
||||
|
||||
static inline
|
||||
void pcm_teardown(pcm_reader_t **r)
|
||||
{
|
||||
(*r)->vtbl->teardown(r);
|
||||
}
|
||||
|
||||
static inline
|
||||
uint32_t bitcount(uint32_t bits)
|
||||
{
|
||||
bits = (bits & 0x55555555) + (bits >> 1 & 0x55555555);
|
||||
bits = (bits & 0x33333333) + (bits >> 2 & 0x33333333);
|
||||
bits = (bits & 0x0f0f0f0f) + (bits >> 4 & 0x0f0f0f0f);
|
||||
bits = (bits & 0x00ff00ff) + (bits >> 8 & 0x00ff00ff);
|
||||
return (bits & 0x0000ffff) + (bits >>16 & 0x0000ffff);
|
||||
}
|
||||
|
||||
#define TRY_IO(expr) \
|
||||
do { \
|
||||
if ((expr)) goto FAIL; \
|
||||
} while (0)
|
||||
|
||||
#define ENSURE(expr) \
|
||||
do { \
|
||||
if (!(expr)) goto FAIL;\
|
||||
} while (0)
|
||||
|
||||
int pcm_read(pcm_io_context_t *io, void *buffer, uint32_t size);
|
||||
int pcm_skip(pcm_io_context_t *io, int64_t count);
|
||||
|
||||
static inline int pcm_seek(pcm_io_context_t *io, int64_t off, int whence)
|
||||
{
|
||||
return io->vtbl->seek ? io->vtbl->seek(io->cookie, off, whence) : -1;
|
||||
}
|
||||
|
||||
static inline int64_t pcm_tell(pcm_io_context_t *io)
|
||||
{
|
||||
return io->vtbl->tell ? io->vtbl->tell(io->cookie) : -1;
|
||||
}
|
||||
|
||||
int pcm_read16le(pcm_io_context_t *io, uint16_t *value);
|
||||
int pcm_read16be(pcm_io_context_t *io, uint16_t *value);
|
||||
int pcm_read32le(pcm_io_context_t *io, uint32_t *value);
|
||||
int pcm_read32be(pcm_io_context_t *io, uint32_t *value);
|
||||
int pcm_read64le(pcm_io_context_t *io, uint64_t *value);
|
||||
int pcm_read64be(pcm_io_context_t *io, uint64_t *value);
|
||||
int pcm_scanl(pcm_io_context_t *io, const char *fmt, ...);
|
||||
int pcm_scanb(pcm_io_context_t *io, const char *fmt, ...);
|
||||
|
||||
int apple_chan_chunk(pcm_io_context_t *io, uint32_t chunk_size,
|
||||
pcm_sample_description_t *fmt, uint8_t *mapping);
|
||||
|
||||
pcm_reader_t *wav_open(pcm_io_context_t *io, int ignore_length);
|
||||
pcm_reader_t *raw_open(pcm_io_context_t *io,
|
||||
const pcm_sample_description_t *desc);
|
||||
pcm_reader_t *caf_open(pcm_io_context_t *io,
|
||||
aacenc_tag_callback_t tag_callback, void *tag_ctx);
|
||||
|
||||
pcm_reader_t *pcm_open_native_converter(pcm_reader_t *reader);
|
||||
pcm_reader_t *pcm_open_float_converter(pcm_reader_t *reader);
|
||||
pcm_reader_t *pcm_open_sint16_converter(pcm_reader_t *reader);
|
||||
|
||||
pcm_reader_t *extrapolater_open(pcm_reader_t *reader);
|
||||
pcm_reader_t *limiter_open(pcm_reader_t *reader);
|
||||
|
||||
#endif
|
376
src/pcm_readhelper.c
Normal file
376
src/pcm_readhelper.c
Normal file
@ -0,0 +1,376 @@
|
||||
/*
|
||||
* Copyright (C) 2013 nu774
|
||||
* For conditions of distribution and use, see copyright notice in COPYING
|
||||
*/
|
||||
|
||||
#if HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#if HAVE_STDINT_H
|
||||
# include <stdint.h>
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
#include "pcm_reader.h"
|
||||
#include "m4af_endian.h"
|
||||
#include "catypes.h"
|
||||
|
||||
int pcm_read_frames(pcm_reader_t *r, void *data, unsigned nframes)
|
||||
{
|
||||
int n;
|
||||
unsigned count = 0;
|
||||
uint8_t *bp = data;
|
||||
unsigned bpf = pcm_get_format(r)->bytes_per_frame;
|
||||
|
||||
do {
|
||||
n = r->vtbl->read_frames(r, bp, nframes - count);
|
||||
if (n > 0) {
|
||||
count += n;
|
||||
bp += n * bpf;
|
||||
}
|
||||
} while (n > 0 && count < nframes);
|
||||
return count;
|
||||
}
|
||||
|
||||
int pcm_read(pcm_io_context_t *io, void *buffer, uint32_t size)
|
||||
{
|
||||
int rc;
|
||||
uint32_t count = 0;
|
||||
uint8_t *bp = buffer;
|
||||
|
||||
do {
|
||||
rc = io->vtbl->read(io->cookie, bp, size - count);
|
||||
if (rc > 0) {
|
||||
count += rc;
|
||||
bp += rc;
|
||||
}
|
||||
} while (rc > 0 && count < size);
|
||||
return count > 0 ? count : rc;
|
||||
}
|
||||
|
||||
int pcm_skip(pcm_io_context_t *io, int64_t count)
|
||||
{
|
||||
char buff[8192];
|
||||
int rc;
|
||||
pcm_io_vtbl_t *vp = io->vtbl;
|
||||
|
||||
if (count == 0 || pcm_seek(io, count, SEEK_CUR) >= 0)
|
||||
return 0;
|
||||
do {
|
||||
if ((rc = vp->read(io->cookie, buff, count > 8192 ? 8192 : count)) > 0)
|
||||
count -= rc;
|
||||
} while (rc > 0 && count > 0);
|
||||
|
||||
return count == 0 ? 0 : -1;
|
||||
}
|
||||
|
||||
int pcm_read16le(pcm_io_context_t *io, uint16_t *value)
|
||||
{
|
||||
if (pcm_read(io, value, 2) == 2) {
|
||||
*value = m4af_ltoh16(*value);
|
||||
return 0;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
int pcm_read16be(pcm_io_context_t *io, uint16_t *value)
|
||||
{
|
||||
if (pcm_read(io, value, 2) == 2) {
|
||||
*value = m4af_btoh16(*value);
|
||||
return 0;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
int pcm_read32le(pcm_io_context_t *io, uint32_t *value)
|
||||
{
|
||||
if (pcm_read(io, value, 4) == 4) {
|
||||
*value = m4af_ltoh32(*value);
|
||||
return 0;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
int pcm_read32be(pcm_io_context_t *io, uint32_t *value)
|
||||
{
|
||||
if (pcm_read(io, value, 4) == 4) {
|
||||
*value = m4af_btoh32(*value);
|
||||
return 0;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
int pcm_read64le(pcm_io_context_t *io, uint64_t *value)
|
||||
{
|
||||
if (pcm_read(io, value, 8) == 8) {
|
||||
*value = m4af_ltoh64(*value);
|
||||
return 0;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
int pcm_read64be(pcm_io_context_t *io, uint64_t *value)
|
||||
{
|
||||
if (pcm_read(io, value, 8) == 8) {
|
||||
*value = m4af_btoh64(*value);
|
||||
return 0;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
int pcm_scanl(pcm_io_context_t *io, const char *fmt, ...)
|
||||
{
|
||||
int c, count = 0;
|
||||
va_list ap;
|
||||
|
||||
va_start(ap, fmt);
|
||||
while ((c = *fmt++)) {
|
||||
switch (c) {
|
||||
case 'S':
|
||||
TRY_IO(pcm_read16le(io, va_arg(ap, uint16_t*)));
|
||||
++count;
|
||||
break;
|
||||
case 'L':
|
||||
TRY_IO(pcm_read32le(io, va_arg(ap, uint32_t*)));
|
||||
++count;
|
||||
break;
|
||||
case 'Q':
|
||||
TRY_IO(pcm_read64le(io, va_arg(ap, uint64_t*)));
|
||||
++count;
|
||||
break;
|
||||
}
|
||||
}
|
||||
FAIL:
|
||||
va_end(ap);
|
||||
return count;
|
||||
}
|
||||
|
||||
int pcm_scanb(pcm_io_context_t *io, const char *fmt, ...)
|
||||
{
|
||||
int c, count = 0;
|
||||
va_list ap;
|
||||
|
||||
va_start(ap, fmt);
|
||||
while ((c = *fmt++)) {
|
||||
switch (c) {
|
||||
case 'S':
|
||||
TRY_IO(pcm_read16be(io, va_arg(ap, uint16_t*)));
|
||||
++count;
|
||||
break;
|
||||
case 'L':
|
||||
TRY_IO(pcm_read32be(io, va_arg(ap, uint32_t*)));
|
||||
++count;
|
||||
break;
|
||||
case 'Q':
|
||||
TRY_IO(pcm_read64be(io, va_arg(ap, uint64_t*)));
|
||||
++count;
|
||||
break;
|
||||
}
|
||||
}
|
||||
FAIL:
|
||||
va_end(ap);
|
||||
return count;
|
||||
}
|
||||
|
||||
static
|
||||
int channel_compare(const void *a, const void *b)
|
||||
{
|
||||
return (*(const uint8_t **)a)[0] - (*(const uint8_t **)b)[0];
|
||||
}
|
||||
|
||||
void apple_translate_channel_labels(uint8_t *channels, unsigned n)
|
||||
{
|
||||
unsigned i;
|
||||
char *has_side = strpbrk((char*)channels, "\x0A\x0B");
|
||||
|
||||
for (i = 0; i < n; ++i) {
|
||||
switch (channels[i]) {
|
||||
case kAudioChannelLabel_LeftSurround:
|
||||
case kAudioChannelLabel_RightSurround:
|
||||
if (!has_side) channels[i] += 5; // map to SL/SR
|
||||
break;
|
||||
case kAudioChannelLabel_RearSurroundLeft:
|
||||
case kAudioChannelLabel_RearSurroundRight:
|
||||
if (!has_side) channels[i] -= 28; // map to BL/BR
|
||||
break;
|
||||
case kAudioChannelLabel_Mono:
|
||||
channels[i] = kAudioChannelLabel_Center;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int apple_chan_chunk(pcm_io_context_t *io, uint32_t chunk_size,
|
||||
pcm_sample_description_t *fmt, uint8_t *mapping)
|
||||
{
|
||||
/*
|
||||
* Although FDK encoder supports upto 5.1ch, we handle upto
|
||||
* 8 channels here.
|
||||
*/
|
||||
uint32_t i, mChannelLayoutTag, mChannelBitmap, mNumberChannelDescriptions;
|
||||
uint32_t mask = 0;
|
||||
const uint32_t nchannels = fmt->channels_per_frame;
|
||||
uint8_t channels[9] = { 0 };
|
||||
uint8_t *index[8] = { 0 };
|
||||
const char *layout = 0;
|
||||
|
||||
ENSURE(chunk_size >= 12);
|
||||
TRY_IO(pcm_scanb(io, "LLL", &mChannelLayoutTag, &mChannelBitmap,
|
||||
&mNumberChannelDescriptions) != 3);
|
||||
|
||||
switch (mChannelLayoutTag) {
|
||||
case kAudioChannelLayoutTag_UseChannelBitmap:
|
||||
ENSURE(bitcount(mChannelBitmap) == nchannels);
|
||||
TRY_IO(pcm_skip(io, chunk_size - 12));
|
||||
fmt->channel_mask = mChannelBitmap;
|
||||
for (i = 0; i < nchannels; ++i)
|
||||
mapping[i] = i;
|
||||
return 0;
|
||||
case kAudioChannelLayoutTag_UseChannelDescriptions:
|
||||
ENSURE(mNumberChannelDescriptions == nchannels);
|
||||
ENSURE(chunk_size >= 12 + nchannels * 20);
|
||||
for (i = 0; i < mNumberChannelDescriptions; ++i) {
|
||||
uint32_t mChannelLabel;
|
||||
TRY_IO(pcm_read32be(io, &mChannelLabel));
|
||||
ENSURE(mChannelLabel && mChannelLabel <= 0xff);
|
||||
channels[i] = mChannelLabel;
|
||||
TRY_IO(pcm_skip(io, 16));
|
||||
}
|
||||
TRY_IO(pcm_skip(io, chunk_size - 12 - nchannels * 20));
|
||||
apple_translate_channel_labels(channels, nchannels);
|
||||
for (i = 0; i < nchannels; ++i)
|
||||
if (channels[i] > kAudioChannelLabel_TopBackLeft)
|
||||
goto FAIL;
|
||||
break;
|
||||
default:
|
||||
ENSURE((mChannelLayoutTag & 0xffff) == nchannels);
|
||||
TRY_IO(pcm_skip(io, chunk_size - 12));
|
||||
|
||||
switch (mChannelLayoutTag) {
|
||||
/* 1ch */
|
||||
case kAudioChannelLayoutTag_Mono:
|
||||
layout = "\x03"; break;
|
||||
/* 1.1ch */
|
||||
case kAudioChannelLayoutTag_AC3_1_0_1:
|
||||
layout = "\x03\x04"; break;
|
||||
/* 2ch */
|
||||
case kAudioChannelLayoutTag_Stereo:
|
||||
case kAudioChannelLayoutTag_MatrixStereo:
|
||||
case kAudioChannelLayoutTag_Binaural:
|
||||
layout = "\x01\x02"; break;
|
||||
/* 2.1ch */
|
||||
case kAudioChannelLayoutTag_DVD_4:
|
||||
layout = "\x01\x02\x04"; break;
|
||||
/* 3ch */
|
||||
case kAudioChannelLayoutTag_MPEG_3_0_A:
|
||||
layout = "\x01\x02\x03"; break;
|
||||
case kAudioChannelLayoutTag_AC3_3_0:
|
||||
layout = "\x01\x03\x02"; break;
|
||||
case kAudioChannelLayoutTag_MPEG_3_0_B:
|
||||
layout = "\x03\x01\x02"; break;
|
||||
case kAudioChannelLayoutTag_ITU_2_1:
|
||||
layout = "\x01\x02\x09"; break;
|
||||
/* 3.1ch */
|
||||
case kAudioChannelLayoutTag_DVD_10:
|
||||
layout = "\x01\x02\x03\x04"; break;
|
||||
case kAudioChannelLayoutTag_AC3_3_0_1:
|
||||
layout = "\x01\x03\x02\x04"; break;
|
||||
case kAudioChannelLayoutTag_DVD_5:
|
||||
layout = "\x01\x02\x04\x09"; break;
|
||||
case kAudioChannelLayoutTag_AC3_2_1_1:
|
||||
layout = "\x01\x02\x09\x04"; break;
|
||||
/* 4ch */
|
||||
case kAudioChannelLayoutTag_Quadraphonic:
|
||||
case kAudioChannelLayoutTag_ITU_2_2:
|
||||
layout = "\x01\x02\x0A\x0B"; break;
|
||||
case kAudioChannelLayoutTag_MPEG_4_0_A:
|
||||
layout = "\x01\x02\x03\x09"; break;
|
||||
case kAudioChannelLayoutTag_MPEG_4_0_B:
|
||||
layout = "\x03\x01\x02\x09"; break;
|
||||
case kAudioChannelLayoutTag_AC3_3_1:
|
||||
layout = "\x01\x03\x02\x09"; break;
|
||||
/* 4.1ch */
|
||||
case kAudioChannelLayoutTag_DVD_6:
|
||||
layout = "\x01\x02\x04\x0A\x0B"; break;
|
||||
case kAudioChannelLayoutTag_DVD_18:
|
||||
layout = "\x01\x02\x0A\x0B\x04"; break;
|
||||
case kAudioChannelLayoutTag_DVD_11:
|
||||
layout = "\x01\x02\x03\x04\x09"; break;
|
||||
case kAudioChannelLayoutTag_AC3_3_1_1:
|
||||
layout = "\x01\x03\x02\x09\x04"; break;
|
||||
/* 5ch */
|
||||
case kAudioChannelLayoutTag_MPEG_5_0_A:
|
||||
layout = "\x01\x02\x03\x0A\x0B"; break;
|
||||
case kAudioChannelLayoutTag_Pentagonal:
|
||||
case kAudioChannelLayoutTag_MPEG_5_0_B:
|
||||
layout = "\x01\x02\x0A\x0B\x03"; break;
|
||||
case kAudioChannelLayoutTag_MPEG_5_0_C:
|
||||
layout = "\x01\x03\x02\x0A\x0B"; break;
|
||||
case kAudioChannelLayoutTag_MPEG_5_0_D:
|
||||
layout = "\x03\x01\x02\x0A\x0B"; break;
|
||||
/* 5.1ch */
|
||||
case kAudioChannelLayoutTag_MPEG_5_1_A:
|
||||
layout = "\x01\x02\x03\x04\x0A\x0B"; break;
|
||||
case kAudioChannelLayoutTag_MPEG_5_1_B:
|
||||
layout = "\x01\x02\x0A\x0B\x03\x04"; break;
|
||||
case kAudioChannelLayoutTag_MPEG_5_1_C:
|
||||
layout = "\x01\x03\x02\x0A\x0B\x04"; break;
|
||||
case kAudioChannelLayoutTag_MPEG_5_1_D:
|
||||
layout = "\x03\x01\x02\x0A\x0B\x04"; break;
|
||||
/* 6ch */
|
||||
case kAudioChannelLayoutTag_Hexagonal:
|
||||
case kAudioChannelLayoutTag_AudioUnit_6_0:
|
||||
layout = "\x01\x02\x0A\x0B\x03\x09"; break;
|
||||
case kAudioChannelLayoutTag_AAC_6_0:
|
||||
layout = "\x03\x01\x02\x0A\x0B\x09"; break;
|
||||
/* 6.1ch */
|
||||
case kAudioChannelLayoutTag_MPEG_6_1_A:
|
||||
layout = "\x01\x02\x03\x04\x0A\x0B\x09"; break;
|
||||
case kAudioChannelLayoutTag_AAC_6_1:
|
||||
layout = "\x03\x01\x02\x0A\x0B\x09\x04"; break;
|
||||
/* 7ch */
|
||||
case kAudioChannelLayoutTag_AudioUnit_7_0:
|
||||
layout = "\x01\x02\x0A\x0B\x03\x05\x06"; break;
|
||||
case kAudioChannelLayoutTag_AudioUnit_7_0_Front:
|
||||
layout = "\x01\x02\x0A\x0B\x03\x07\x08"; break;
|
||||
case kAudioChannelLayoutTag_AAC_7_0:
|
||||
layout = "\x03\x01\x02\x0A\x0B\x05\x06"; break;
|
||||
/* 7.1ch */
|
||||
case kAudioChannelLayoutTag_MPEG_7_1_A:
|
||||
layout = "\x01\x02\x03\x04\x0A\x0B\x07\x08"; break;
|
||||
case kAudioChannelLayoutTag_MPEG_7_1_B:
|
||||
layout = "\x03\x07\x08\x01\x02\x05\x06\x04"; break;
|
||||
case kAudioChannelLayoutTag_MPEG_7_1_C:
|
||||
layout = "\x01\x02\x03\x04\x0A\x0B\x05\x06"; break;
|
||||
case kAudioChannelLayoutTag_Emagic_Default_7_1:
|
||||
layout = "\x01\x02\x0A\x0B\x03\x04\x07\x08"; break;
|
||||
/* 8ch */
|
||||
case kAudioChannelLayoutTag_Octagonal:
|
||||
layout = "\x01\x02\x05\x06\x03\x09\x0A\x0B"; break;
|
||||
case kAudioChannelLayoutTag_AAC_Octagonal:
|
||||
layout = "\x03\x01\x02\x0A\x0B\x05\x06\x09"; break;
|
||||
default:
|
||||
goto FAIL;
|
||||
}
|
||||
strcpy((char*)channels, layout);
|
||||
}
|
||||
|
||||
for (i = 0; i < nchannels; ++i)
|
||||
mask |= 1 << (channels[i] - 1);
|
||||
fmt->channel_mask = mask;
|
||||
ENSURE(bitcount(mask) == nchannels);
|
||||
|
||||
for (i = 0; i < nchannels; ++i)
|
||||
index[i] = channels + i;
|
||||
qsort(index, nchannels, sizeof(char*), channel_compare);
|
||||
for (i = 0; i < nchannels; ++i)
|
||||
mapping[i] = index[i] - channels;
|
||||
|
||||
return 0;
|
||||
FAIL:
|
||||
return -1;
|
||||
}
|
107
src/pcm_sint16_converter.c
Normal file
107
src/pcm_sint16_converter.c
Normal file
@ -0,0 +1,107 @@
|
||||
/*
|
||||
* Copyright (C) 2013 nu774
|
||||
* For conditions of distribution and use, see copyright notice in COPYING
|
||||
*/
|
||||
#if HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#if HAVE_STDINT_H
|
||||
# include <stdint.h>
|
||||
#endif
|
||||
#include "pcm_reader.h"
|
||||
|
||||
typedef struct pcm_sint16_converter_t {
|
||||
pcm_reader_vtbl_t *vtbl;
|
||||
pcm_reader_t *src;
|
||||
pcm_sample_description_t format;
|
||||
void *pivot;
|
||||
unsigned capacity;
|
||||
} pcm_sint16_converter_t;
|
||||
|
||||
static inline pcm_reader_t *get_source(pcm_reader_t *reader)
|
||||
{
|
||||
return ((pcm_sint16_converter_t *)reader)->src;
|
||||
}
|
||||
|
||||
static const
|
||||
pcm_sample_description_t *get_format(pcm_reader_t *reader)
|
||||
{
|
||||
return &((pcm_sint16_converter_t *)reader)->format;
|
||||
}
|
||||
|
||||
static int64_t get_length(pcm_reader_t *reader)
|
||||
{
|
||||
return pcm_get_length(get_source(reader));
|
||||
}
|
||||
|
||||
static int64_t get_position(pcm_reader_t *reader)
|
||||
{
|
||||
return pcm_get_position(get_source(reader));
|
||||
}
|
||||
|
||||
static int read_frames(pcm_reader_t *reader, void *buffer, unsigned nframes)
|
||||
{
|
||||
unsigned i, count;
|
||||
pcm_sint16_converter_t *self = (pcm_sint16_converter_t *)reader;
|
||||
const pcm_sample_description_t *sfmt = pcm_get_format(self->src);
|
||||
unsigned bytes = nframes * sfmt->bytes_per_frame;
|
||||
if (self->capacity < bytes) {
|
||||
void *p = realloc(self->pivot, bytes);
|
||||
if (!p) return -1;
|
||||
self->pivot = p;
|
||||
self->capacity = bytes;
|
||||
}
|
||||
nframes = pcm_read_frames(self->src, self->pivot, nframes);
|
||||
count = nframes * sfmt->channels_per_frame;
|
||||
if (PCM_IS_FLOAT(sfmt)) {
|
||||
float *ip = self->pivot;
|
||||
int16_t *op = buffer;
|
||||
for (i = 0; i < count; ++i)
|
||||
op[i] = pcm_clip(ip[i] * 32768.0, -32768.0, 32767.0);
|
||||
} else {
|
||||
int32_t *ip = self->pivot;
|
||||
int16_t *op = buffer;
|
||||
if (sfmt->bits_per_channel <= 16) {
|
||||
for (i = 0; i < count; ++i)
|
||||
op[i] = ip[i] >> 16;
|
||||
} else {
|
||||
for (i = 0; i < count; ++i) {
|
||||
int n = ((ip[i] >> 15) + 1) >> 1;
|
||||
op[i] = (n == 0x8000) ? 0x7fff : n;
|
||||
}
|
||||
}
|
||||
}
|
||||
return nframes;
|
||||
}
|
||||
|
||||
static void teardown(pcm_reader_t **reader)
|
||||
{
|
||||
pcm_sint16_converter_t *self = (pcm_sint16_converter_t *)*reader;
|
||||
pcm_teardown(&self->src);
|
||||
free(self->pivot);
|
||||
free(self);
|
||||
*reader = 0;
|
||||
}
|
||||
|
||||
static pcm_reader_vtbl_t my_vtable = {
|
||||
get_format, get_length, get_position, read_frames, teardown
|
||||
};
|
||||
|
||||
pcm_reader_t *pcm_open_sint16_converter(pcm_reader_t *reader)
|
||||
{
|
||||
pcm_sint16_converter_t *self = 0;
|
||||
pcm_sample_description_t *fmt;
|
||||
|
||||
if ((self = calloc(1, sizeof(pcm_sint16_converter_t))) == 0)
|
||||
return 0;
|
||||
self->src = reader;
|
||||
self->vtbl = &my_vtable;
|
||||
memcpy(&self->format, pcm_get_format(reader), sizeof(self->format));
|
||||
fmt = &self->format;
|
||||
fmt->bits_per_channel = 16;
|
||||
fmt->sample_type = PCM_TYPE_SINT;
|
||||
fmt->bytes_per_frame = 2 * fmt->channels_per_frame;
|
||||
return (pcm_reader_t *)self;
|
||||
}
|
@ -6,6 +6,8 @@
|
||||
# include "config.h"
|
||||
#endif
|
||||
#include <stdio.h>
|
||||
#include <limits.h>
|
||||
#include <float.h>
|
||||
#include <time.h>
|
||||
#if HAVE_STDINT_H
|
||||
# include <stdint.h>
|
||||
@ -51,11 +53,14 @@ void aacenc_progress_init(aacenc_progress_t *progress, int64_t total,
|
||||
void aacenc_progress_update(aacenc_progress_t *progress, int64_t current,
|
||||
int period)
|
||||
{
|
||||
int percent = 100.0 * current / progress->total + .5;
|
||||
double seconds = current / progress->timescale;
|
||||
double ellapsed = (aacenc_timer() - progress->start) / 1000.0;
|
||||
double eta = ellapsed * (progress->total / (double)current - 1.0);
|
||||
double speed = ellapsed ? seconds / ellapsed : 0.0;
|
||||
double speed = ellapsed ? seconds / ellapsed : 1.0;
|
||||
int percent = progress->total ? 100.0 * current / progress->total + .5
|
||||
: 100;
|
||||
double eta = current ? ellapsed * (progress->total / (double)current - 1.0)
|
||||
: progress->total ? DBL_MAX : 0;
|
||||
|
||||
if (current < progress->processed + period)
|
||||
return;
|
||||
|
||||
@ -80,7 +85,7 @@ void aacenc_progress_finish(aacenc_progress_t *progress, int64_t current)
|
||||
double ellapsed = (aacenc_timer() - progress->start) / 1000.0;
|
||||
aacenc_progress_update(progress, current, 0);
|
||||
if (progress->total == INT64_MAX)
|
||||
fprintf(stderr, "\n%" PRId64 "samples processed in ", current);
|
||||
fprintf(stderr, "\n%" PRId64 " samples processed in ", current);
|
||||
else
|
||||
fprintf(stderr, "\n%" PRId64 "/%" PRId64 " samples processed in ",
|
||||
current, progress->total);
|
||||
|
268
src/wav_reader.c
268
src/wav_reader.c
@ -14,35 +14,19 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
#include "wav_reader.h"
|
||||
#include "m4af_endian.h"
|
||||
#include "pcm_reader.h"
|
||||
|
||||
#define RIFF_FOURCC(a,b,c,d) ((a)|((b)<<8)|((c)<<16)|((d)<<24))
|
||||
|
||||
#define TRY_IO(expr) \
|
||||
do { \
|
||||
if (expr) \
|
||||
goto FAIL; \
|
||||
} while (0)
|
||||
|
||||
#define ASSERT_FORMAT(ctx, expr) \
|
||||
do { \
|
||||
if (!expr) { \
|
||||
if (!ctx->last_error) \
|
||||
ctx->last_error = WAV_INVALID_FORMAT; \
|
||||
goto FAIL;\
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
struct wav_reader_t {
|
||||
typedef struct wav_reader_t {
|
||||
pcm_reader_vtbl_t *vtbl;
|
||||
pcm_sample_description_t sample_format;
|
||||
int64_t length;
|
||||
int64_t position;
|
||||
int32_t data_offset;
|
||||
int ignore_length;
|
||||
int last_error;
|
||||
wav_io_context_t io;
|
||||
void *io_cookie;
|
||||
};
|
||||
pcm_io_context_t io;
|
||||
} wav_reader_t;
|
||||
|
||||
static const uint8_t WAV_GUID_PCM[] = {
|
||||
1, 0, 0, 0, 0, 0, 0x10, 0, 0x80, 0, 0, 0xaa, 0, 0x38, 0x9b, 0x71
|
||||
@ -51,146 +35,46 @@ static const uint8_t WAV_GUID_FLOAT[] = {
|
||||
3, 0, 0, 0, 0, 0, 0x10, 0, 0x80, 0, 0, 0xaa, 0, 0x38, 0x9b, 0x71
|
||||
};
|
||||
|
||||
const pcm_sample_description_t *wav_get_format(wav_reader_t *reader)
|
||||
static const pcm_sample_description_t *wav_get_format(pcm_reader_t *reader)
|
||||
{
|
||||
return &reader->sample_format;
|
||||
return &((wav_reader_t *)reader)->sample_format;
|
||||
}
|
||||
|
||||
int64_t wav_get_length(wav_reader_t *reader)
|
||||
static int64_t wav_get_length(pcm_reader_t *reader)
|
||||
{
|
||||
return reader->length;
|
||||
return ((wav_reader_t *)reader)->length;
|
||||
}
|
||||
|
||||
int64_t wav_get_position(wav_reader_t *reader)
|
||||
static int64_t wav_get_position(pcm_reader_t *reader)
|
||||
{
|
||||
return reader->position;
|
||||
return ((wav_reader_t *)reader)->position;
|
||||
}
|
||||
|
||||
void wav_teardown(wav_reader_t **reader)
|
||||
static void wav_teardown(pcm_reader_t **reader)
|
||||
{
|
||||
free(*reader);
|
||||
*reader = 0;
|
||||
}
|
||||
|
||||
static
|
||||
int riff_read(wav_reader_t *reader, void *buffer, uint32_t size)
|
||||
{
|
||||
int rc;
|
||||
uint32_t count = 0;
|
||||
|
||||
if (reader->last_error)
|
||||
return -1;
|
||||
do {
|
||||
rc = reader->io.read(reader->io_cookie, buffer, size - count);
|
||||
if (rc > 0)
|
||||
count += rc;
|
||||
else if (rc < 0)
|
||||
reader->last_error = WAV_IO_ERROR;
|
||||
} while (rc > 0 && count < size);
|
||||
return count > 0 ? count : rc;
|
||||
}
|
||||
|
||||
static
|
||||
int riff_skip(wav_reader_t *reader, uint32_t count)
|
||||
{
|
||||
char buff[8192];
|
||||
int rc;
|
||||
|
||||
if (reader->last_error)
|
||||
return -1;
|
||||
if (count == 0)
|
||||
return 0;
|
||||
if (reader->io.seek &&
|
||||
reader->io.seek(reader->io_cookie, count, SEEK_CUR) >= 0)
|
||||
return 0;
|
||||
|
||||
do {
|
||||
if ((rc = riff_read(reader, buff, count > 8192 ? 8192 : count)) > 0)
|
||||
count -= rc;
|
||||
} while (rc > 0 && count > 0);
|
||||
|
||||
if (count > 0)
|
||||
reader->last_error = WAV_IO_ERROR;
|
||||
return reader->last_error ? -1 : 0;
|
||||
}
|
||||
|
||||
static
|
||||
int riff_read16(wav_reader_t *reader, uint16_t *value)
|
||||
{
|
||||
TRY_IO(riff_read(reader, value, 2) != 2);
|
||||
*value = m4af_ltoh16(*value);
|
||||
return 0;
|
||||
FAIL:
|
||||
return -1;
|
||||
}
|
||||
|
||||
static
|
||||
int riff_read32(wav_reader_t *reader, uint32_t *value)
|
||||
{
|
||||
TRY_IO(riff_read(reader, value, 4) != 4);
|
||||
*value = m4af_ltoh32(*value);
|
||||
return 0;
|
||||
FAIL:
|
||||
return -1;
|
||||
}
|
||||
|
||||
static
|
||||
int riff_read64(wav_reader_t *reader, uint64_t *value)
|
||||
{
|
||||
TRY_IO(riff_read(reader, value, 8) != 8);
|
||||
*value = m4af_ltoh64(*value);
|
||||
return 0;
|
||||
FAIL:
|
||||
return -1;
|
||||
}
|
||||
|
||||
static
|
||||
int riff_scan(wav_reader_t *reader, const char *fmt, ...)
|
||||
{
|
||||
int c, count = 0;
|
||||
va_list ap;
|
||||
|
||||
va_start(ap, fmt);
|
||||
while ((c = *fmt++)) {
|
||||
switch (c) {
|
||||
case 'S':
|
||||
TRY_IO(riff_read16(reader, va_arg(ap, uint16_t*)));
|
||||
++count;
|
||||
break;
|
||||
case 'L':
|
||||
TRY_IO(riff_read32(reader, va_arg(ap, uint32_t*)));
|
||||
++count;
|
||||
break;
|
||||
case 'Q':
|
||||
TRY_IO(riff_read64(reader, va_arg(ap, uint64_t*)));
|
||||
++count;
|
||||
break;
|
||||
}
|
||||
}
|
||||
FAIL:
|
||||
va_end(ap);
|
||||
return count;
|
||||
}
|
||||
|
||||
static
|
||||
uint32_t riff_next_chunk(wav_reader_t *reader, uint32_t *chunk_size)
|
||||
{
|
||||
uint32_t fcc;
|
||||
if (riff_scan(reader, "LL", &fcc, chunk_size) == 2)
|
||||
return fcc;
|
||||
return 0;
|
||||
return (pcm_scanl(&reader->io, "LL", &fcc, chunk_size) == 2) ? fcc : 0;
|
||||
}
|
||||
|
||||
int wav_read_frames(wav_reader_t *reader, void *buffer, unsigned nframes)
|
||||
static
|
||||
int wav_read_frames(pcm_reader_t *preader, void *buffer, unsigned nframes)
|
||||
{
|
||||
int rc;
|
||||
unsigned nbytes;
|
||||
wav_reader_t *reader = (wav_reader_t *)preader;
|
||||
|
||||
if (!reader->ignore_length && nframes > reader->length - reader->position)
|
||||
nframes = reader->length - reader->position;
|
||||
nbytes = nframes * reader->sample_format.bytes_per_frame;
|
||||
if (nbytes) {
|
||||
if ((rc = riff_read(reader, buffer, nbytes)) < 0)
|
||||
if ((rc = pcm_read(&reader->io, buffer, nbytes)) < 0)
|
||||
return -1;
|
||||
nframes = rc / reader->sample_format.bytes_per_frame;
|
||||
reader->position += nframes;
|
||||
@ -205,13 +89,10 @@ int riff_ds64(wav_reader_t *reader, int64_t *length)
|
||||
uint64_t riff_size, sample_count;
|
||||
|
||||
fcc = riff_next_chunk(reader, &chunk_size);
|
||||
ASSERT_FORMAT(reader,
|
||||
fcc == RIFF_FOURCC('d','s','6','4') && chunk_size >= 28);
|
||||
TRY_IO(riff_scan(reader, "QQQL",
|
||||
ENSURE(fcc == RIFF_FOURCC('d','s','6','4') && chunk_size >= 28);
|
||||
TRY_IO(pcm_scanl(&reader->io, "QQQL",
|
||||
&riff_size, length, &sample_count, &table_size) != 4);
|
||||
if (table_size == 0)
|
||||
return 0;
|
||||
reader->last_error = WAV_UNSUPPORTED_FORMAT;
|
||||
TRY_IO(pcm_skip(&reader->io, (chunk_size - 27) & ~1));
|
||||
FAIL:
|
||||
return -1;
|
||||
}
|
||||
@ -225,41 +106,34 @@ int wav_fmt(wav_reader_t *reader, uint32_t size)
|
||||
uint8_t guid[16];
|
||||
int is_float = 0;
|
||||
|
||||
ASSERT_FORMAT(reader, size >= 16);
|
||||
TRY_IO(riff_scan(reader, "SSLLSS", &wFormatTag, &nChannels,
|
||||
ENSURE(size >= 16);
|
||||
TRY_IO(pcm_scanl(&reader->io, "SSLLSS", &wFormatTag, &nChannels,
|
||||
&nSamplesPerSec, &nAvgBytesPerSec, &nBlockAlign,
|
||||
&wBitsPerSample) != 6);
|
||||
wValidBitsPerSample = wBitsPerSample;
|
||||
|
||||
if (wFormatTag != 1 && wFormatTag != 3 && wFormatTag != 0xfffe) {
|
||||
reader->last_error = WAV_UNSUPPORTED_FORMAT;
|
||||
goto FAIL;
|
||||
}
|
||||
ASSERT_FORMAT(reader,
|
||||
nChannels && nSamplesPerSec && nAvgBytesPerSec &&
|
||||
nBlockAlign && wBitsPerSample && !(wBitsPerSample & 7) &&
|
||||
nBlockAlign == nChannels * wBitsPerSample / 8);
|
||||
ENSURE(wFormatTag == 1 || wFormatTag == 3 || wFormatTag == 0xfffe);
|
||||
ENSURE(nChannels && nSamplesPerSec && nAvgBytesPerSec &&
|
||||
nBlockAlign && wBitsPerSample && !(wBitsPerSample & 7) &&
|
||||
nBlockAlign == nChannels * wBitsPerSample / 8);
|
||||
|
||||
if (wFormatTag == 3)
|
||||
is_float = 1;
|
||||
|
||||
if (wFormatTag != 0xfffe)
|
||||
TRY_IO(riff_skip(reader, (size - 15) & ~1));
|
||||
TRY_IO(pcm_skip(&reader->io, (size - 15) & ~1));
|
||||
else {
|
||||
ASSERT_FORMAT(reader, size >= 40);
|
||||
TRY_IO(riff_scan(reader, "SSL",
|
||||
ENSURE(size >= 40);
|
||||
TRY_IO(pcm_scanl(&reader->io, "SSL",
|
||||
&cbSize, &wValidBitsPerSample, &dwChannelMask) != 3);
|
||||
TRY_IO(riff_read(reader, guid, 16) != 16);
|
||||
TRY_IO(pcm_read(&reader->io, guid, 16) != 16);
|
||||
|
||||
if (memcmp(guid, WAV_GUID_FLOAT, 16) == 0)
|
||||
is_float = 1;
|
||||
else if (memcmp(guid, WAV_GUID_PCM, 16) != 0) {
|
||||
reader->last_error = WAV_UNSUPPORTED_FORMAT;
|
||||
else if (memcmp(guid, WAV_GUID_PCM, 16) != 0)
|
||||
goto FAIL;
|
||||
}
|
||||
ASSERT_FORMAT(reader,
|
||||
wValidBitsPerSample &&
|
||||
wValidBitsPerSample <= wBitsPerSample);
|
||||
TRY_IO(riff_skip(reader, (size - 39) & ~1));
|
||||
ENSURE(wValidBitsPerSample && wValidBitsPerSample <= wBitsPerSample);
|
||||
TRY_IO(pcm_skip(&reader->io, (size - 39) & ~1));
|
||||
}
|
||||
reader->sample_format.sample_rate = nSamplesPerSec;
|
||||
reader->sample_format.bits_per_channel = wValidBitsPerSample;
|
||||
@ -284,12 +158,11 @@ int wav_parse(wav_reader_t *reader, int64_t *data_length)
|
||||
|
||||
*data_length = 0;
|
||||
container = riff_next_chunk(reader, &chunk_size);
|
||||
if (container != RIFF_FOURCC('R','I','F','F') &&
|
||||
container != RIFF_FOURCC('R','F','6','4'))
|
||||
goto FAIL;
|
||||
TRY_IO(riff_read32(reader, &fcc));
|
||||
if (fcc != RIFF_FOURCC('W','A','V','E'))
|
||||
goto FAIL;
|
||||
ENSURE(container == RIFF_FOURCC('R','I','F','F') ||
|
||||
container == RIFF_FOURCC('R','F','6','4'));
|
||||
TRY_IO(pcm_read32le(&reader->io, &fcc));
|
||||
ENSURE(fcc == RIFF_FOURCC('W','A','V','E'));
|
||||
|
||||
if (container == RIFF_FOURCC('R','F','6','4'))
|
||||
riff_ds64(reader, data_length);
|
||||
while ((fcc = riff_next_chunk(reader, &chunk_size)) != 0) {
|
||||
@ -299,9 +172,11 @@ int wav_parse(wav_reader_t *reader, int64_t *data_length)
|
||||
} else if (fcc == RIFF_FOURCC('d','a','t','a')) {
|
||||
if (container == RIFF_FOURCC('R','I','F','F'))
|
||||
*data_length = chunk_size;
|
||||
reader->data_offset = pcm_tell(&reader->io);
|
||||
break;
|
||||
} else
|
||||
TRY_IO(riff_skip(reader, (chunk_size + 1) & ~1));
|
||||
} else {
|
||||
TRY_IO(pcm_skip(&reader->io, (chunk_size + 1) & ~1));
|
||||
}
|
||||
}
|
||||
if (fcc == RIFF_FOURCC('d','a','t','a'))
|
||||
return 0;
|
||||
@ -309,25 +184,62 @@ FAIL:
|
||||
return -1;
|
||||
}
|
||||
|
||||
wav_reader_t *wav_open(wav_io_context_t *io_ctx, void *io_cookie,
|
||||
int ignore_length)
|
||||
static pcm_reader_vtbl_t wav_vtable = {
|
||||
wav_get_format,
|
||||
wav_get_length,
|
||||
wav_get_position,
|
||||
wav_read_frames,
|
||||
wav_teardown
|
||||
};
|
||||
|
||||
pcm_reader_t *wav_open(pcm_io_context_t *io, int ignore_length)
|
||||
{
|
||||
wav_reader_t *reader;
|
||||
wav_reader_t *reader = 0;
|
||||
int64_t data_length;
|
||||
unsigned bpf;
|
||||
|
||||
if ((reader = calloc(1, sizeof(wav_reader_t))) == 0)
|
||||
return 0;
|
||||
memcpy(&reader->io, io_ctx, sizeof(wav_io_context_t));
|
||||
reader->io_cookie = io_cookie;
|
||||
memcpy(&reader->io, io, sizeof(pcm_io_context_t));
|
||||
reader->ignore_length = ignore_length;
|
||||
if (wav_parse(reader, &data_length) < 0) {
|
||||
free(reader);
|
||||
return 0;
|
||||
}
|
||||
if (ignore_length || !data_length ||
|
||||
data_length % reader->sample_format.bytes_per_frame != 0)
|
||||
bpf = reader->sample_format.bytes_per_frame;
|
||||
if (ignore_length || !data_length || data_length % bpf)
|
||||
reader->length = INT64_MAX;
|
||||
else
|
||||
reader->length = data_length / reader->sample_format.bytes_per_frame;
|
||||
return reader;
|
||||
reader->length = data_length / bpf;
|
||||
|
||||
if (reader->length == INT64_MAX) {
|
||||
if (pcm_seek(&reader->io, 0, SEEK_END) >= 0) {
|
||||
int64_t size = pcm_tell(&reader->io);
|
||||
if (size > 0)
|
||||
reader->length = (size - reader->data_offset) / bpf;
|
||||
pcm_seek(&reader->io, reader->data_offset, SEEK_SET);
|
||||
}
|
||||
}
|
||||
reader->vtbl = &wav_vtable;
|
||||
return (pcm_reader_t *)reader;
|
||||
}
|
||||
|
||||
pcm_reader_t *raw_open(pcm_io_context_t *io,
|
||||
const pcm_sample_description_t *desc)
|
||||
{
|
||||
wav_reader_t *reader = 0;
|
||||
|
||||
if ((reader = calloc(1, sizeof(wav_reader_t))) == 0)
|
||||
return 0;
|
||||
memcpy(&reader->io, io, sizeof(pcm_io_context_t));
|
||||
memcpy(&reader->sample_format, desc, sizeof(pcm_sample_description_t));
|
||||
if (pcm_seek(&reader->io, 0, SEEK_END) >= 0) {
|
||||
int64_t size = pcm_tell(&reader->io);
|
||||
if (size > 0)
|
||||
reader->length = size / reader->sample_format.bytes_per_frame;
|
||||
pcm_seek(&reader->io, 0, SEEK_SET);
|
||||
} else
|
||||
reader->length = INT64_MAX;
|
||||
reader->vtbl = &wav_vtable;
|
||||
return (pcm_reader_t *)reader;
|
||||
}
|
||||
|
@ -1,35 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2013 nu774
|
||||
* For conditions of distribution and use, see copyright notice in COPYING
|
||||
*/
|
||||
#ifndef WAV_READER_H
|
||||
#define WAV_READER_H
|
||||
|
||||
#include "lpcm.h"
|
||||
|
||||
enum wav_error_code {
|
||||
WAV_IO_ERROR = 1,
|
||||
WAV_NO_MEMORY,
|
||||
WAV_INVALID_FORMAT,
|
||||
WAV_UNSUPPORTED_FORMAT
|
||||
};
|
||||
|
||||
typedef int (*wav_read_callback)(void *cookie, void *data, uint32_t size);
|
||||
typedef int (*wav_seek_callback)(void *cookie, int64_t off, int whence);
|
||||
|
||||
typedef struct wav_io_context_t {
|
||||
wav_read_callback read;
|
||||
wav_seek_callback seek;
|
||||
} wav_io_context_t;
|
||||
|
||||
typedef struct wav_reader_t wav_reader_t;
|
||||
|
||||
wav_reader_t *wav_open(wav_io_context_t *io_ctx, void *io_cookie,
|
||||
int ignore_length);
|
||||
const pcm_sample_description_t *wav_get_format(wav_reader_t *reader);
|
||||
int wav_read_frames(wav_reader_t *reader, void *buffer, unsigned nframes);
|
||||
int64_t wav_get_length(wav_reader_t *reader);
|
||||
int64_t wav_get_position(wav_reader_t *reader);
|
||||
void wav_teardown(wav_reader_t **reader);
|
||||
|
||||
#endif
|
Reference in New Issue
Block a user