Remove schroedinger, voaac and aacplus.

CHANGES

@@ -7,6 +7,12 @@ New:
 
 - Change `track_sensitive` parameter to a boolean getter (fixed value or anonymous function).
 
+Removed:
+
+- aac and aacplus encoders, removed in favor of fdk-aac.
+
+- dirac/schroedinger video encoder: obsolete, abandoned upstream.
+
 
 1.2.1 (01-07-2016)
 ========

INSTALL

@@ -36,15 +36,12 @@ Optional dependencies :
    ocaml-theora>=0.3.0       for Ogg/Theora codec
    ocaml-speex>=0.2.0        for Ogg/Speex codec
    ocaml-flac>=0.1.1         for Flac and Ogg/Flac codec
-   ocaml-schroedinger>=0.1.0 for Ogg/Schroedinger codec
    ocaml-mad>=0.4.4          for MP3 decoding
    ocaml-lame>=0.3.2         for MP3 encoding
    ocaml-shine>=0.1.0        for fixed-point MP3 encoding
    ocaml-taglib>=0.3.1       for MP3ID3 metadata access
    ocaml-faad>=0.3.2         for AAC stream decoding
-   ocaml-aacplus>=0.2.1      for AAC+ encoding
-   ocaml-voaacenc>=0.1.0     for AAC encoding
-   ocaml-fdkaac>=0.1.0       for AAC(+) encoding (replacement candidate for voaac and aacplus)
+   ocaml-fdkaac>=0.1.0       for AAC(+) encoding
    camlimages>=4.0.0         for image decoding
    ocaml-sdl                 for display, font & image support
    ocaml-gavl>=0.1.5         for video conversion using the gavl library

Makefile.defs.in

@@ -75,9 +75,6 @@ W_SHINE=@W_SHINE@
 W_MAD=@W_MAD@
 W_LAME=@W_LAME@
 W_LAME_DYN=@W_LAME_DYN@
-W_AACPLUS=@W_AACPLUS@
-W_AACPLUS_DYN=@W_AACPLUS_DYN@
-W_VOAACENC=@W_VOAACENC@
 W_FDKAAC=@W_FDKAAC@
 W_FDKAAC_DYN=@W_FDKAAC_DYN@
 W_ALSA=@W_ALSA@
@@ -101,7 +98,6 @@ W_PULSEAUDIO=@W_PULSEAUDIO@
 W_LADSPA=@W_LADSPA@
 W_DSSI=@W_DSSI@
 W_THEORA=@W_THEORA@
-W_SCHROEDINGER=@W_SCHROEDINGER@
 W_SDL=@W_SDL@
 W_GAVL=@W_GAVL@
 W_FFMPEG=@W_FFMPEG@

Makefile.rules

@@ -148,7 +148,6 @@ $(foreach plug,$($(PROG)_PLUGINS),\
 vorbis_dontlink += ogg
 speex_dontlink += ogg
 theora_dontlink += ogg
-schroedinger_dontlink += ogg
 flac_dontlink += ogg
 flac_ogg_dontlink += ogg flac
 lastfm_dontlink += xmlm xmlplaylist

configure.ac

@@ -458,27 +458,6 @@ AC_CHECK_OCAML_BINDING([gstreamer],[0.2.0])
 
 AC_CHECK_OCAML_BINDING([frei0r],[0.1.0])
 
-#
-# Aacplus
-#
-
-AC_CHECK_OCAML_BINDING([aacplus],[0.2.0])
-if test -z "${W_AACPLUS}"; then
-  if test -n "${W_DYNLINK}"; then
-    if test -n "${OCAML_HAS_FIRST_CLASS_MODULES}"; then
-       W_AACPLUS_DYN=yes
-       w_AACPLUS="detected at runtime"
-    fi
-  fi
-fi
-AC_SUBST(W_AACPLUS_DYN)
-
-#
-# Voaacenc
-#
-
-AC_CHECK_OCAML_BINDING([voaacenc],[0.1.0])
-
 #
 # Fdkaac
 #
@@ -500,12 +479,6 @@ AC_SUBST(W_FDKAAC_DYN)
 
 AC_CHECK_OCAML_BINDING([theora],[0.3.1],[ogg])
 
-#
-# Schroedinger
-#
-
-AC_CHECK_OCAML_BINDING([schroedinger],[0.1.1],[ogg])
-
 #
 # Gavl
 #
@@ -940,7 +913,6 @@ cat <<EOMSG
    - Vorbis            : $w_VORBIS
    - Theora            : $w_THEORA
    - Speex             : $w_SPEEX
-   - Dirac             : $w_SCHROEDINGER
    - Flac (native)     : $w_FLAC
    - Flac (ogg)        : $w_FLAC_OGG
    - MP3               : $w_MAD
@@ -953,13 +925,10 @@ cat <<EOMSG
    - Vorbis            : $w_VORBIS
    - MP3               : $w_LAME
    - MP3 (fixed-point) : $w_SHINE
-   - AAC               : $w_VOAACENC
-   - AAC+              : $w_AACPLUS
    - FDK-AAC           : $w_FDKAAC
    - SPEEX             : $w_SPEEX
    - Opus              : $w_OPUS
    - Theora            : $w_THEORA
-   - Dirac             : $w_SCHROEDINGER
 
  * Tags
    - Taglib (ID3 tags) : $w_TAGLIB

doc/content/build.txt

@@ -63,12 +63,9 @@ also @libtool@.
 * ocaml-lame for mp3 encoding
 * ocaml-shine for fixed-point mp3 encoding
 * ocaml-faac for AAC encoding
-* ocaml-aacplus for AAC+ encoding
-* ocaml-voaacenc for AAC decoding
 * ocaml-fdkaac for AAC(+) encoding. Replacement candidate for both voaac and aacplus
 * ocaml-flac for native flac and ogg/flac encoding/decoding
 * ocaml-theora for ogg/theora encoding/decoding
-* ocaml-schroedinger for ogg/dirac video encoding/decoding
 * ocaml-gavl for video conversion
 * ocaml-samplerate for audio samplerate conversion
 * ocaml-taglib for MP3 audio tag reading (needs @g++@)

doc/content/encoding_formats.txt

@@ -180,14 +180,6 @@ You can also pass @bitrate=x@ explicitly instead of a quality.
 The default dimensions are liquidsoap's default,
 from the settings @frame.video.height/width@.
 
-h5. Dirac
-
-%%
-%dirac(quality=35,width=w,height=h,
-       picture_x=0, picture_y=0,
-       aspect_numerator=1, aspect_denominator=1)
-%%
-
 h5. Speex
 
 %%
@@ -215,24 +207,9 @@ The parameters are:
 
 @compression@ ranges from 0 to 8 and @bits_per_sample@ should be one of: @8@, @16@ or @32@.
 
-h4. AAC
-
-The syntax for the internal AAC encoder is:
-%%
-%aac(channels=2, samplerate=44100, bitrate=64, adts=true)
-%%
-
-h4. AAC+
-
-The syntax for the internal AAC+ encoder is:
-%%
-%aacplus(channels=2, samplerate=44100, bitrate=64)
-%%
-
 h4. FDK-AAC
 
-This encoder can do both AAC and AAC+. It is projected to
-replace both encoders in a future release.
+This encoder can do both AAC and AAC+.
 
 Its syntax is:
 %%

doc/content/on2_part2.txt

@@ -345,7 +345,7 @@ def outputs(s) =
 
   # An output in AAC+ at 32 kbits to the "my_radio.aac"
   # mountpoint
-  output.icecast(%aacplus(bitrate=32), mount="my_radio.aac",s)
+  output.icecast(%fdkaac(bitrate=32), mount="my_radio.aac",s)
 end
 %%
 

doc/content/radiopi.txt

@@ -118,8 +118,8 @@ output.file(%vorbis, reopen_on_metadata=true,
 # Specialize the output functions by partial application
 output.icecast = output.icecast(description=descr, url=url)
 out = output.icecast(host=ice_host,port=8080,password=pass,fallible=true)
-out_aac32 = out(%aacplus(bitrate=32))
-out_aac = out(%aacplus(bitrate=64))
+out_aac32 = out(%fdkaac(bitrate=32))
+out_aac = out(%fdkaac(bitrate=64))
 out = out(%mp3)
 
 # A file for playing during failures

doc/content/shoutcast.txt

@@ -9,7 +9,7 @@ h4. Shoutcast output
 
 Shoutcast server accept streams encoded with the MP3 or AAC/AAC+ codec. You to compile Liquidsoap with 
 @lame@ support, so it can encode in MP3. Liquidsoap also has support for AAC+ encoding
-using libaacplus or using an "external encoder":external_encoders.html. The recommended format is MP3.
+using FDK-AAC or using an "external encoder":external_encoders.html. The recommended format is MP3.
 
 Shoutcast output are done using the @output.shoutcast@ operator with the appropriate parameters.
 An example is:

src/Makefile

@@ -45,7 +45,6 @@ $(call conditional_compilation,ogg_demuxer,$(W_VORBIS),ogg_formats/vorbis_decode
 $(call conditional_compilation,ogg_demuxer,$(W_OPUS),ogg_formats/opus_decoder.ml)
 $(call conditional_compilation,ogg_demuxer,$(W_THEORA),ogg_formats/theora_decoder.ml)
 $(call conditional_compilation,ogg_demuxer,$(W_FLAC_OGG),ogg_formats/ogg_flac_decoder.ml)
-$(call conditional_compilation,ogg_demuxer,$(W_SCHROEDINGER),ogg_formats/dirac_decoder.ml)
 
 # This variable contains only conditional files..
 ogg_muxer =
@@ -57,7 +56,6 @@ $(call conditional_compilation,ogg_muxer,$(W_VORBIS),ogg_formats/vorbis_encoder.
 $(call conditional_compilation,ogg_muxer,$(W_OPUS),ogg_formats/opus_encoder.ml)
 $(call conditional_compilation,ogg_muxer,$(W_THEORA),ogg_formats/theora_encoder.ml)
 $(call conditional_compilation,ogg_muxer,$(W_FLAC_OGG),ogg_formats/ogg_flac_encoder.ml)
-$(call conditional_compilation,ogg_muxer,$(W_SCHROEDINGER),ogg_formats/dirac_encoder.ml)
 
 audio_converters = \
 	converters/audio/native_audio_converter.ml
@@ -149,17 +147,13 @@ encoders = \
 	encoder/avi_encoder.ml \
 	encoder/lame_encoder.ml \
 	encoder/fdkaac_encoder.ml \
-	encoder/aacplus_encoder.ml \
 	encoder/external_encoder.ml \
 	$(if $(W_LAME_DYN),encoder/lame_encoder_dynlink.ml) \
-	$(if $(W_FDKAAC_DYN),encoder/fdkaac_encoder_dynlink.ml) \
-	$(if $(W_AACPLUS_DYN),encoder/aacplus_encoder_dynlink.ml)
+	$(if $(W_FDKAAC_DYN),encoder/fdkaac_encoder_dynlink.ml)
 
 $(call conditional_compilation,encoders,$(W_SHINE),encoder/shine_encoder.ml)
 $(call conditional_compilation,encoders,$(W_LAME),encoder/lame_encoder_builtin.ml)
 $(call conditional_compilation,encoders,$(W_FLAC),encoder/flac_encoder.ml)
-$(call conditional_compilation,encoders,$(W_AACPLUS),encoder/aacplus_encoder_builtin.ml)
-$(call conditional_compilation,encoders,$(W_VOAACENC),encoder/voaacenc_encoder.ml)
 $(call conditional_compilation,encoders,$(W_FDKAAC),encoder/fdkaac_encoder_builtin.ml)
 $(call conditional_compilation,encoders,$(W_TAGLIB),encoder/taglib_id3v2.ml)
 
@@ -182,7 +176,6 @@ tools = tools/stdlib.ml tools/doc.ml tools/utils.ml tools/plug.ml \
 	tools/rqueue.ml \
 	$(if $(W_LAME_DYN),tools/lame_dynlink.ml) \
 	$(if $(W_FDKAAC_DYN),tools/fdkaac_dynlink.ml) \
-	$(if $(W_AACPLUS_DYN),tools/aacplus_dynlink.ml) \
 	tools/wav_aiff.ml tools/tutils.ml tools/JSON.ml \
 	tools/file_watcher.ml tools/file_watcher_mtime.ml \
   configure.ml tools/process_handler.ml \