Remove obsolete liba52 wrapper code.
Originally committed as revision 15571 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun
parent
66e9aa7463
commit
d8d12c1594
|
|
@ -137,6 +137,7 @@ version <next>
|
|||
- E-AC-3 support added to AC-3 decoder
|
||||
- Nellymoser ASAO encoder
|
||||
- ASS and SSA demuxer and muxer
|
||||
- liba52 wrapper removed
|
||||
|
||||
version 0.4.9-pre1:
|
||||
|
||||
|
|
|
|||
|
|
@ -87,8 +87,6 @@ show_help(){
|
|||
echo
|
||||
echo "External library support:"
|
||||
echo " --enable-mlib use Sun medialib [default=no]"
|
||||
echo " --enable-liba52 enable GPLed liba52 support [default=no]"
|
||||
echo " --enable-liba52bin open liba52.so.0 at runtime [default=no]"
|
||||
echo " --enable-avisynth allow reading AVISynth script files [default=no]"
|
||||
echo " --enable-libamr-nb enable libamr-nb floating point audio codec"
|
||||
echo " --enable-libamr-wb enable libamr-wb floating point audio codec"
|
||||
|
|
@ -666,8 +664,6 @@ CONFIG_LIST="
|
|||
gray
|
||||
hardcoded_tables
|
||||
ipv6
|
||||
liba52
|
||||
liba52bin
|
||||
libamr_nb
|
||||
libamr_wb
|
||||
libdc1394
|
||||
|
|
@ -852,7 +848,7 @@ vis_deps="sparc"
|
|||
byteswap_h_deps="!armv4l"
|
||||
|
||||
# decoders / encoders
|
||||
ac3_decoder_deps="gpl !liba52"
|
||||
ac3_decoder_deps="gpl"
|
||||
dxa_decoder_deps="zlib"
|
||||
eac3_decoder_deps="gpl"
|
||||
flashsv_decoder_deps="zlib"
|
||||
|
|
@ -865,8 +861,6 @@ zmbv_decoder_deps="zlib"
|
|||
zmbv_encoder_deps="zlib"
|
||||
|
||||
# external libraries
|
||||
liba52_decoder_deps="liba52"
|
||||
liba52bin_decoder_extralibs='$ldl'
|
||||
libamr_nb_decoder_deps="libamr_nb"
|
||||
libamr_nb_encoder_deps="libamr_nb"
|
||||
libamr_wb_decoder_deps="libamr_wb"
|
||||
|
|
@ -1407,7 +1401,6 @@ if ! enabled gpl; then
|
|||
enabled_any $@ && die "$name is under GPL and --enable-gpl is not specified."
|
||||
}
|
||||
die_gpl_disabled "The Postprocessing code" postproc
|
||||
die_gpl_disabled "liba52" liba52
|
||||
die_gpl_disabled "libx264" libx264
|
||||
die_gpl_disabled "libxvidcore" libxvid
|
||||
die_gpl_disabled "FAAD2" libfaad2
|
||||
|
|
@ -1704,7 +1697,6 @@ done
|
|||
|
||||
# these are off by default, so fail if requested and not available
|
||||
enabled avisynth && require2 vfw32 "windows.h vfw.h" AVIFileInit -lvfw32
|
||||
enabled liba52 && require liba52 a52dec/a52.h a52_init -la52
|
||||
enabled libamr_nb && require libamrnb amrnb/interf_dec.h Speech_Decode_Frame_init -lamrnb -lm
|
||||
enabled libamr_wb && require libamrwb amrwb/dec_if.h D_IF_init -lamrwb -lm
|
||||
enabled libdirac && add_cflags "$(pkg-config --cflags dirac)" \
|
||||
|
|
@ -2010,8 +2002,6 @@ if enabled sdl_too_old; then
|
|||
fi
|
||||
echo "Sun medialib support ${mlib-no}"
|
||||
echo "AVISynth enabled ${avisynth-no}"
|
||||
echo "liba52 support ${liba52-no}"
|
||||
echo "liba52 dlopened ${liba52bin-no}"
|
||||
echo "libamr-nb support ${libamr_nb-no}"
|
||||
echo "libamr-wb support ${libamr_wb-no}"
|
||||
echo "libdc1394 support ${libdc1394-no}"
|
||||
|
|
|
|||
|
|
@ -339,7 +339,6 @@ following image formats are supported:
|
|||
@item AAC @tab X @tab X
|
||||
@tab Encoding is supported through the external library libfaac.
|
||||
@item AC-3 @tab IX @tab IX
|
||||
@tab liba52 can be used alternatively for decoding.
|
||||
@item AMR-NB @tab X @tab X
|
||||
@tab Supported through an external library.
|
||||
@item AMR-WB @tab X @tab X
|
||||
|
|
|
|||
|
|
@ -324,7 +324,6 @@ OBJS-$(CONFIG_OGG_MUXER) += xiph.o
|
|||
OBJS-$(CONFIG_RTP_MUXER) += mpegvideo.o
|
||||
|
||||
# external codec libraries
|
||||
OBJS-$(CONFIG_LIBA52) += liba52.o
|
||||
OBJS-$(CONFIG_LIBAMR_NB) += libamr.o
|
||||
OBJS-$(CONFIG_LIBAMR_WB) += libamr.o
|
||||
OBJS-$(CONFIG_LIBDIRAC_DECODER) += libdiracdec.o
|
||||
|
|
@ -495,3 +494,4 @@ DIRS = alpha armv4l bfin i386 mlib ppc ps2 sh4 sparc
|
|||
include $(SUBDIR)../subdir.mak
|
||||
|
||||
$(SUBDIR)dct-test$(EXESUF): $(SUBDIR)fdctref.o
|
||||
$(SUBDIR)fft-test$(EXESUF): $(SUBDIR)fdctref.o
|
||||
|
|
|
|||
|
|
@ -284,7 +284,6 @@ void avcodec_register_all(void)
|
|||
REGISTER_ENCDEC (DVDSUB, dvdsub);
|
||||
|
||||
/* external libraries */
|
||||
REGISTER_DECODER (LIBA52, liba52);
|
||||
REGISTER_ENCDEC (LIBAMR_NB, libamr_nb);
|
||||
REGISTER_ENCDEC (LIBAMR_WB, libamr_wb);
|
||||
REGISTER_ENCDEC (LIBDIRAC, libdirac);
|
||||
|
|
|
|||
|
|
@ -1,227 +0,0 @@
|
|||
/*
|
||||
* A52 decoder using liba52
|
||||
* Copyright (c) 2001 Fabrice Bellard.
|
||||
*
|
||||
* 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 a52dec.c
|
||||
* A52 decoder using liba52
|
||||
*/
|
||||
|
||||
#include "avcodec.h"
|
||||
#include <a52dec/a52.h>
|
||||
|
||||
#ifdef CONFIG_LIBA52BIN
|
||||
#include <dlfcn.h>
|
||||
static const char* const liba52name = "liba52.so.0";
|
||||
#endif
|
||||
|
||||
/**
|
||||
* liba52 - Copyright (C) Aaron Holtzman
|
||||
* released under the GPL license.
|
||||
*/
|
||||
typedef struct AC3DecodeState {
|
||||
int flags;
|
||||
int channels;
|
||||
a52_state_t* state;
|
||||
sample_t* samples;
|
||||
|
||||
/*
|
||||
* virtual method table
|
||||
*
|
||||
* using this function table so the liba52 doesn't
|
||||
* have to be really linked together with ffmpeg
|
||||
* and might be linked in runtime - this allows binary
|
||||
* distribution of ffmpeg library which doens't depend
|
||||
* on liba52 library - but if user has it installed
|
||||
* it will be used - user might install such library
|
||||
* separately
|
||||
*/
|
||||
void* handle;
|
||||
a52_state_t* (*a52_init)(uint32_t mm_accel);
|
||||
sample_t* (*a52_samples)(a52_state_t * state);
|
||||
int (*a52_syncinfo)(uint8_t * buf, int * flags,
|
||||
int * sample_rate, int * bit_rate);
|
||||
int (*a52_frame)(a52_state_t * state, uint8_t * buf, int * flags,
|
||||
sample_t * level, sample_t bias);
|
||||
void (*a52_dynrng)(a52_state_t * state,
|
||||
sample_t (* call) (sample_t, void *), void * data);
|
||||
int (*a52_block)(a52_state_t * state);
|
||||
void (*a52_free)(a52_state_t * state);
|
||||
|
||||
} AC3DecodeState;
|
||||
|
||||
#ifdef CONFIG_LIBA52BIN
|
||||
static void* dlsymm(void* handle, const char* symbol)
|
||||
{
|
||||
void* f = dlsym(handle, symbol);
|
||||
if (!f)
|
||||
av_log( NULL, AV_LOG_ERROR, "A52 Decoder - function '%s' can't be resolved\n", symbol);
|
||||
return f;
|
||||
}
|
||||
#endif
|
||||
|
||||
static av_cold int a52_decode_init(AVCodecContext *avctx)
|
||||
{
|
||||
AC3DecodeState *s = avctx->priv_data;
|
||||
|
||||
#ifdef CONFIG_LIBA52BIN
|
||||
s->handle = dlopen(liba52name, RTLD_LAZY);
|
||||
if (!s->handle)
|
||||
{
|
||||
av_log( avctx, AV_LOG_ERROR, "A52 library %s could not be opened! \n%s\n", liba52name, dlerror());
|
||||
return -1;
|
||||
}
|
||||
s->a52_init = (a52_state_t* (*)(uint32_t)) dlsymm(s->handle, "a52_init");
|
||||
s->a52_samples = (sample_t* (*)(a52_state_t*)) dlsymm(s->handle, "a52_samples");
|
||||
s->a52_syncinfo = (int (*)(uint8_t*, int*, int*, int*)) dlsymm(s->handle, "a52_syncinfo");
|
||||
s->a52_frame = (int (*)(a52_state_t*, uint8_t*, int*, sample_t*, sample_t)) dlsymm(s->handle, "a52_frame");
|
||||
s->a52_block = (int (*)(a52_state_t*)) dlsymm(s->handle, "a52_block");
|
||||
s->a52_free = (void (*)(a52_state_t*)) dlsymm(s->handle, "a52_free");
|
||||
if (!s->a52_init || !s->a52_samples || !s->a52_syncinfo
|
||||
|| !s->a52_frame || !s->a52_block || !s->a52_free)
|
||||
{
|
||||
dlclose(s->handle);
|
||||
return -1;
|
||||
}
|
||||
#else
|
||||
s->handle = 0;
|
||||
s->a52_init = a52_init;
|
||||
s->a52_samples = a52_samples;
|
||||
s->a52_syncinfo = a52_syncinfo;
|
||||
s->a52_frame = a52_frame;
|
||||
s->a52_block = a52_block;
|
||||
s->a52_free = a52_free;
|
||||
#endif
|
||||
s->state = s->a52_init(0); /* later use CPU flags */
|
||||
s->samples = s->a52_samples(s->state);
|
||||
|
||||
/* allow downmixing to stereo or mono */
|
||||
if (avctx->channels > 0 && avctx->request_channels > 0 &&
|
||||
avctx->request_channels < avctx->channels &&
|
||||
avctx->request_channels <= 2) {
|
||||
avctx->channels = avctx->request_channels;
|
||||
}
|
||||
|
||||
avctx->sample_fmt = SAMPLE_FMT_S16;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**** the following function comes from a52dec */
|
||||
static inline void float_to_int (float * _f, int16_t * s16, int nchannels)
|
||||
{
|
||||
int i, j, c;
|
||||
int32_t * f = (int32_t *) _f; // XXX assumes IEEE float format
|
||||
|
||||
j = 0;
|
||||
nchannels *= 256;
|
||||
for (i = 0; i < 256; i++) {
|
||||
for (c = 0; c < nchannels; c += 256)
|
||||
s16[j++] = av_clip_int16(f[i + c] - 0x43c00000);
|
||||
}
|
||||
}
|
||||
|
||||
/**** end */
|
||||
|
||||
#define HEADER_SIZE 7
|
||||
|
||||
static int a52_decode_frame(AVCodecContext *avctx,
|
||||
void *data, int *data_size,
|
||||
uint8_t *buf, int buf_size)
|
||||
{
|
||||
AC3DecodeState *s = avctx->priv_data;
|
||||
int flags, i, len;
|
||||
int sample_rate, bit_rate;
|
||||
short *out_samples = data;
|
||||
float level;
|
||||
static const int ac3_channels[8] = {
|
||||
2, 1, 2, 3, 3, 4, 4, 5
|
||||
};
|
||||
|
||||
*data_size= 0;
|
||||
|
||||
if (buf_size < HEADER_SIZE) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Error decoding frame, not enough bytes for header\n");
|
||||
return -1;
|
||||
}
|
||||
len = s->a52_syncinfo(buf, &s->flags, &sample_rate, &bit_rate);
|
||||
if (len == 0) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Error decoding frame, no sync byte at begin\n");
|
||||
return -1;
|
||||
}
|
||||
if (buf_size < len) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Error decoding frame, not enough bytes\n");
|
||||
return -1;
|
||||
}
|
||||
/* update codec info */
|
||||
avctx->sample_rate = sample_rate;
|
||||
s->channels = ac3_channels[s->flags & 7];
|
||||
if (s->flags & A52_LFE)
|
||||
s->channels++;
|
||||
if (avctx->request_channels > 0 &&
|
||||
avctx->request_channels <= 2 &&
|
||||
avctx->request_channels < s->channels) {
|
||||
avctx->channels = avctx->request_channels;
|
||||
} else {
|
||||
avctx->channels = s->channels;
|
||||
}
|
||||
avctx->bit_rate = bit_rate;
|
||||
flags = s->flags;
|
||||
if (avctx->channels == 1)
|
||||
flags = A52_MONO;
|
||||
else if (avctx->channels == 2)
|
||||
flags = A52_STEREO;
|
||||
else
|
||||
flags |= A52_ADJUST_LEVEL;
|
||||
level = 1;
|
||||
if (s->a52_frame(s->state, buf, &flags, &level, 384)) {
|
||||
fail:
|
||||
av_log(avctx, AV_LOG_ERROR, "Error decoding frame\n");
|
||||
return -1;
|
||||
}
|
||||
for (i = 0; i < 6; i++) {
|
||||
if (s->a52_block(s->state))
|
||||
goto fail;
|
||||
float_to_int(s->samples, out_samples + i * 256 * avctx->channels, avctx->channels);
|
||||
}
|
||||
*data_size = 6 * avctx->channels * 256 * sizeof(int16_t);
|
||||
return len;
|
||||
}
|
||||
|
||||
static av_cold int a52_decode_end(AVCodecContext *avctx)
|
||||
{
|
||||
AC3DecodeState *s = avctx->priv_data;
|
||||
s->a52_free(s->state);
|
||||
#ifdef CONFIG_LIBA52BIN
|
||||
dlclose(s->handle);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
AVCodec liba52_decoder = {
|
||||
"liba52",
|
||||
CODEC_TYPE_AUDIO,
|
||||
CODEC_ID_AC3,
|
||||
sizeof(AC3DecodeState),
|
||||
a52_decode_init,
|
||||
NULL,
|
||||
a52_decode_end,
|
||||
a52_decode_frame,
|
||||
.long_name = NULL_IF_CONFIG_SMALL("liba52 ATSC A/52 / AC-3"),
|
||||
};
|
||||
Loading…
Reference in New Issue