[FFmpeg-devel] [PATCH] avcodec: Remove libaacplus

Timothy Gu timothygu99 at gmail.com
Sun Jan 24 18:50:01 CET 2016


It's inferior to fdk-aac and has an arguably more problematic
license.
---
 LICENSE.md              |   2 +-
 configure               |   5 --
 doc/general.texi        |   6 +-
 doc/platform.texi       |   2 +-
 libavcodec/Makefile     |   1 -
 libavcodec/allcodecs.c  |   1 -
 libavcodec/libaacplus.c | 150 ------------------------------------------------
 7 files changed, 5 insertions(+), 162 deletions(-)
 delete mode 100644 libavcodec/libaacplus.c

diff --git a/LICENSE.md b/LICENSE.md
index 4c4a845..0c53d0f 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -104,7 +104,7 @@ license version needs to be upgraded by passing `--enable-version3` to configure
 incompatible libraries
 ----------------------
 
-The Fraunhofer AAC library, FAAC and aacplus are under licenses which
+The Fraunhofer AAC library and FAAC are under licenses which
 are incompatible with the GPLv2 and v3. We do not know for certain if their
 licenses are compatible with the LGPL.
 If you wish to enable these libraries, pass `--enable-nonfree` to configure.
diff --git a/configure b/configure
index 6fdb5dd..916b3eb 100755
--- a/configure
+++ b/configure
@@ -207,7 +207,6 @@ External library support:
                            if openssl is not used [no]
   --disable-iconv          disable iconv [autodetect]
   --enable-ladspa          enable LADSPA audio filtering [no]
-  --enable-libaacplus      enable AAC+ encoding via libaacplus [no]
   --enable-libass          enable libass subtitles rendering,
                            needed for subtitles and ass filter [no]
   --enable-libbluray       enable BluRay reading using libbluray [no]
@@ -1435,7 +1434,6 @@ EXTERNAL_LIBRARY_LIST="
     gnutls
     iconv
     ladspa
-    libaacplus
     libass
     libbluray
     libbs2b
@@ -2601,7 +2599,6 @@ mjpeg2jpeg_bsf_select="jpegtables"
 
 # external libraries
 chromaprint_muxer_deps="chromaprint"
-libaacplus_encoder_deps="libaacplus"
 libcelt_decoder_deps="libcelt"
 libdcadec_decoder_deps="libdcadec"
 libfaac_encoder_deps="libfaac"
@@ -4856,7 +4853,6 @@ die_license_disabled gpl libxvid
 die_license_disabled gpl libzvbi
 die_license_disabled gpl x11grab
 
-die_license_disabled nonfree libaacplus
 die_license_disabled nonfree libfaac
 die_license_disabled nonfree nvenc
 enabled gpl && die_license_disabled_gpl nonfree libfdk_aac
@@ -5430,7 +5426,6 @@ enabled gmp               && require2 gmp gmp.h mpz_export -lgmp
 enabled gnutls            && require_pkg_config gnutls gnutls/gnutls.h gnutls_global_init
 enabled ladspa            && { check_header ladspa.h || die "ERROR: ladspa.h header not found"; }
 enabled libiec61883       && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883
-enabled libaacplus        && require "libaacplus >= 2.0.0" aacplus.h aacplusEncOpen -laacplus
 enabled libass            && require_pkg_config libass ass/ass.h ass_library_init
 enabled libbluray         && require_pkg_config libbluray libbluray/bluray.h bd_open
 enabled libbs2b           && require_pkg_config libbs2b bs2b.h bs2b_open
diff --git a/doc/general.texi b/doc/general.texi
index 06933ab..4df3d49 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -887,10 +887,10 @@ following image formats are supported:
 @item Name @tab Encoding @tab Decoding @tab Comments
 @item 8SVX exponential       @tab     @tab  X
 @item 8SVX fibonacci         @tab     @tab  X
- at item AAC+                   @tab  E  @tab  IX
-    @tab encoding supported through external library libaacplus
 @item AAC                    @tab  E  @tab  X
-    @tab encoding supported through external library libfaac and libvo-aacenc
+    @tab encoding supported through external library libfaac, libfdk-aac and libvo-aacenc
+ at item AAC+                   @tab  E  @tab  IX
+    @tab encoding supported through external library libfdk-aac
 @item AC-3                   @tab IX  @tab  IX
 @item ADPCM 4X Movie         @tab     @tab  X
 @item APDCM Yamaha AICA      @tab     @tab  X
diff --git a/doc/platform.texi b/doc/platform.texi
index 3f64069..f7ee456 100644
--- a/doc/platform.texi
+++ b/doc/platform.texi
@@ -314,7 +314,7 @@ These library packages are only available from
 @uref{http://sourceware.org/cygwinports/, Cygwin Ports}:
 
 @example
-yasm, libSDL-devel, libfaac-devel, libaacplus-devel, libgsm-devel, libmp3lame-devel,
+yasm, libSDL-devel, libfaac-devel, libgsm-devel, libmp3lame-devel,
 libschroedinger1.0-devel, speex-devel, libtheora-devel, libxvidcore-devel
 @end example
 
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index b9ffdb9..253080c 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -798,7 +798,6 @@ OBJS-$(CONFIG_WTV_DEMUXER)             += mpeg4audio.o mpegaudiodata.o
 OBJS-$(CONFIG_ELBG_FILTER)             += elbg.o
 
 # external codec libraries
-OBJS-$(CONFIG_LIBAACPLUS_ENCODER)         += libaacplus.o
 OBJS-$(CONFIG_LIBCELT_DECODER)            += libcelt_dec.o
 OBJS-$(CONFIG_LIBDCADEC_DECODER)          += libdcadec.o dca.o
 OBJS-$(CONFIG_LIBFAAC_ENCODER)            += libfaac.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 2128546..7feaa72 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -590,7 +590,6 @@ void avcodec_register_all(void)
     REGISTER_ENCODER(LIBXAVS,           libxavs);
     REGISTER_ENCODER(LIBXVID,           libxvid);
     REGISTER_DECODER(LIBZVBI_TELETEXT,  libzvbi_teletext);
-    REGISTER_ENCODER(LIBAACPLUS,        libaacplus);
 
     /* text */
     REGISTER_DECODER(BINTEXT,           bintext);
diff --git a/libavcodec/libaacplus.c b/libavcodec/libaacplus.c
deleted file mode 100644
index 5d27e71..0000000
--- a/libavcodec/libaacplus.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Interface to libaacplus for aac+ (sbr+ps) encoding
- * Copyright (c) 2010 tipok <piratfm at gmail.com>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Interface to libaacplus for aac+ (sbr+ps) encoding.
- */
-
-#include <aacplus.h>
-
-#include "avcodec.h"
-#include "internal.h"
-
-typedef struct aacPlusAudioContext {
-    aacplusEncHandle aacplus_handle;
-    unsigned long max_output_bytes;
-    unsigned long samples_input;
-} aacPlusAudioContext;
-
-static int aacPlus_encode_close(AVCodecContext *avctx);
-
-static av_cold int aacPlus_encode_init(AVCodecContext *avctx)
-{
-    aacPlusAudioContext *s = avctx->priv_data;
-    aacplusEncConfiguration *aacplus_cfg;
-
-    /* number of channels */
-    if (avctx->channels < 1 || avctx->channels > 2) {
-        av_log(avctx, AV_LOG_ERROR, "encoding %d channel(s) is not allowed\n", avctx->channels);
-        return AVERROR(EINVAL);
-    }
-
-    if (avctx->profile != FF_PROFILE_AAC_LOW && avctx->profile != FF_PROFILE_UNKNOWN) {
-        av_log(avctx, AV_LOG_ERROR, "invalid AAC profile: %d, only LC supported\n", avctx->profile);
-        return AVERROR(EINVAL);
-    }
-
-    s->aacplus_handle = aacplusEncOpen(avctx->sample_rate, avctx->channels,
-                                       &s->samples_input, &s->max_output_bytes);
-    if (!s->aacplus_handle) {
-        av_log(avctx, AV_LOG_ERROR, "can't open encoder\n");
-        return AVERROR(EINVAL);
-    }
-
-    /* check aacplus version */
-    aacplus_cfg = aacplusEncGetCurrentConfiguration(s->aacplus_handle);
-
-    aacplus_cfg->bitRate = avctx->bit_rate;
-    aacplus_cfg->bandWidth = avctx->cutoff;
-    aacplus_cfg->outputFormat = !(avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER);
-    aacplus_cfg->inputFormat = avctx->sample_fmt == AV_SAMPLE_FMT_FLT ? AACPLUS_INPUT_FLOAT : AACPLUS_INPUT_16BIT;
-    if (!aacplusEncSetConfiguration(s->aacplus_handle, aacplus_cfg)) {
-        av_log(avctx, AV_LOG_ERROR, "libaacplus doesn't support this output format!\n");
-        aacPlus_encode_close(avctx);
-        return AVERROR(EINVAL);
-    }
-
-    avctx->frame_size = s->samples_input / avctx->channels;
-
-    /* Set decoder specific info */
-    avctx->extradata_size = 0;
-    if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) {
-
-        unsigned char *buffer = NULL;
-        unsigned long decoder_specific_info_size;
-
-        if (aacplusEncGetDecoderSpecificInfo(s->aacplus_handle, &buffer,
-                                           &decoder_specific_info_size) == 1) {
-            avctx->extradata = av_malloc(decoder_specific_info_size + AV_INPUT_BUFFER_PADDING_SIZE);
-            if (!avctx->extradata) {
-                free(buffer);
-                aacPlus_encode_close(avctx);
-                return AVERROR(ENOMEM);
-            }
-            avctx->extradata_size = decoder_specific_info_size;
-            memcpy(avctx->extradata, buffer, avctx->extradata_size);
-        }
-        free(buffer);
-    }
-    return 0;
-}
-
-static int aacPlus_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
-                                const AVFrame *frame, int *got_packet)
-{
-    aacPlusAudioContext *s = avctx->priv_data;
-    int32_t *input_buffer = (int32_t *)frame->data[0];
-    int ret;
-
-    if ((ret = ff_alloc_packet2(avctx, pkt, s->max_output_bytes, 0)) < 0)
-        return ret;
-
-    pkt->size = aacplusEncEncode(s->aacplus_handle, input_buffer,
-                                 s->samples_input, pkt->data, pkt->size);
-    *got_packet   = 1;
-    pkt->pts      = frame->pts;
-    return 0;
-}
-
-static av_cold int aacPlus_encode_close(AVCodecContext *avctx)
-{
-    aacPlusAudioContext *s = avctx->priv_data;
-
-    av_freep(&avctx->extradata);
-    aacplusEncClose(s->aacplus_handle);
-    s->aacplus_handle = NULL;
-
-    return 0;
-}
-
-static const AVProfile profiles[] = {
-    { FF_PROFILE_AAC_LOW, "LC" },
-    { FF_PROFILE_UNKNOWN },
-};
-
-AVCodec ff_libaacplus_encoder = {
-    .name           = "libaacplus",
-    .long_name      = NULL_IF_CONFIG_SMALL("libaacplus AAC+ (Advanced Audio Codec with SBR+PS)"),
-    .type           = AVMEDIA_TYPE_AUDIO,
-    .id             = AV_CODEC_ID_AAC,
-    .priv_data_size = sizeof(aacPlusAudioContext),
-    .init           = aacPlus_encode_init,
-    .encode2        = aacPlus_encode_frame,
-    .close          = aacPlus_encode_close,
-    .sample_fmts    = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
-                                                     AV_SAMPLE_FMT_FLT,
-                                                     AV_SAMPLE_FMT_NONE },
-    .profiles       = profiles,
-    .channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO,
-                                            AV_CH_LAYOUT_STEREO,
-                                            0 },
-};
-- 
2.1.4



More information about the ffmpeg-devel mailing list