From: Andre Noll Date: Sun, 23 Apr 2017 19:12:22 +0000 (+0200) Subject: Merge branch 'refs/heads/t/dynamic_chunks' X-Git-Tag: v0.6.0~7 X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=9264932e105071a24d843785900e29e70c78d6ae;p=paraslash.git Merge branch 'refs/heads/t/dynamic_chunks' A rather long and intrusive series that finally improves the aac decoder and audio format handler. The merge had a minor conflict in error.h, which was easily resolved by removing both affected error codes. Cooking for a month. * refs/heads/t/dynamic_chunks: (24 commits) afh_recv: Check return value of afh_get_chunk(). aacdec: Decode only one frame per iteration. aacdec: Combine aac_open() and aacdec_open(). aacdec: Make "initialized" a boolean. aacdec: Make frame_info local to ->post_select(). aacdec: Remove pointless assignment. aacdec: Remove pointless check and improve comment. aacdec: Rename buffer variables. aacdec: Remove pointless variable p. aacdec: Remove check which is always true. aacdec: Kill pointless label. aacdec: Remove superfluous assignment. aacdec: Improve and silence error message. aacdec: Prefer NeAACDecInit() over NeAACDecInit2(). aacdec: Don't eat full buffer on errors. Combine aacdec and aac_common. Convert the aac audio format handler to libmp4ff. aac_afh: Don't create chunk tables any more. afh: Dynamic chunks. server: Store max chunk size in database. ... --- 9264932e105071a24d843785900e29e70c78d6ae diff --cc Makefile.in index 6e84b6fd,4700e80e..aff321fd --- a/Makefile.in +++ b/Makefile.in @@@ -49,8 -50,8 +49,7 @@@ samplerate_cppflags := @samplerate_cppf readline_cppflags := @readline_cppflags@ alsa_cppflags := @alsa_cppflags@ oss_cppflags := @oss_cppflags@ - mp4v2_cppflags := @mp4v2_cppflags@ -clock_gettime_ldflags := @clock_gettime_ldflags@ id3tag_ldflags := @id3tag_ldflags@ ogg_ldflags := @ogg_ldflags@ vorbis_ldflags := @vorbis_ldflags@ @@@ -67,8 -68,8 +66,7 @@@ readline_ldflags := @readline_ldflags samplerate_ldflags := @samplerate_ldflags@ osl_ldflags := @osl_ldflags@ curses_ldflags := @curses_ldflags@ -core_audio_ldflags := @core_audio_ldflags@ crypto_ldflags := @crypto_ldflags@ iconv_ldflags := @iconv_ldflags@ - mp4v2_ldflags := @mp4v2_ldflags@ include Makefile.real diff --cc NEWS.md index df1a80e3,2056f90c..9b6ef0a7 --- a/NEWS.md +++ b/NEWS.md @@@ -1,35 -1,6 +1,43 @@@ NEWS ==== +------------------------------------ +0.6.0 (to be announced) "fuzzy flux" +------------------------------------ +- Support for Mac OS X has been removed. +- On Linux systems, glibc-2.17 or newer is required to build the + source tree. +- Support for RSA public keys in ASN format (as generated by openssl + genrsa) has been removed. These keys have been deprecated since + 2011, so users should have long switched to keys generated with + ssh-keygen(1). +- If libgcrypt is used as the crypto library, we now require version + 1.5.0 (released in 2011) or later. +- The insecure RC4 stream cipher has been removed. It was superseded + by aes_ctr128 three years ago but the RC4 code had been kept for + backwards compatibility. +- On Linux, abstract unix domain sockets are used unconditionally. +- The "install" target no longer strips executables, the new + install-strip target can be used to get the old behaviour. +- The clean targets have been renamed: clean2 is gone, and the new + mostlyclean removes only the executables and object files. +- New target: check (identical to test). +- The DESTDIR make variable is honored to prepend a path to the + installation directory. This feature is orthogonal to the --prefix + option to configure. +- Minor WMA cleanups. ++- The aac audio format handler has been rewritten to use the mp4ff library. ++ See the manual for how to install the library on your system. ++- New status item: max_chunk_size. The value is stored in a previously ++ unused field of the afhi object of the aft table. Although backwards ++ compatible, users are encouraged to re-add m4a files to populate ++ the new field. ++- No more chunk tables for aac. Chunk boundaries are determined ++ dynamically at stream time. + +Downloads: +[tarball](./releases/paraslash-git.tar.bz2), + ------------------------------------- 0.5.7 (2016-12-31) "semantic density" ------------------------------------- diff --cc error.h index fad41729,25eedf5a..32e525cd --- a/error.h +++ b/error.h @@@ -221,7 -230,7 +226,6 @@@ PARA_ERROR(SSH_PARSE, "could not parse ssh public key"), \ PARA_ERROR(STAT_ITEM_PARSE, "failed to parse status item"), \ PARA_ERROR(STATUS_TIMEOUT, "status item timeout"), \ - PARA_ERROR(STCO, "did not find stco atom"), \ - PARA_ERROR(STREAM_FORMAT, "could not set stream format"), \ PARA_ERROR(STREAM_PACKETIN, "ogg stream packet-in error"), \ PARA_ERROR(STREAM_PACKETOUT, "ogg stream packet-out error"), \ PARA_ERROR(STREAM_PAGEIN, "ogg stream page-in error"), \