/*
- * A52 decoder
+ * A52 decoder using liba52
* Copyright (c) 2001 Fabrice Bellard.
*
- * This library is free software; you can redistribute it and/or
+ * 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 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
+ * 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 this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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 "liba52/a52.h"
+#include <a52dec/a52.h>
-#ifdef CONFIG_A52BIN
+#ifdef CONFIG_LIBA52BIN
#include <dlfcn.h>
static const char* liba52name = "liba52.so.0";
#endif
* released under the GPL license.
*/
typedef struct AC3DecodeState {
- UINT8 inbuf[4096]; /* input buffer */
- UINT8 *inbuf_ptr;
+ uint8_t inbuf[4096]; /* input buffer */
+ uint8_t *inbuf_ptr;
int frame_size;
int flags;
int channels;
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 * sample_rate, int * bit_rate);
int (*a52_frame)(a52_state_t * state, uint8_t * buf, int * flags,
- sample_t * level, sample_t bias);
+ sample_t * level, sample_t bias);
void (*a52_dynrng)(a52_state_t * state,
- sample_t (* call) (sample_t, void *), void * data);
+ 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_A52BIN
+#ifdef CONFIG_LIBA52BIN
static void* dlsymm(void* handle, const char* symbol)
{
void* f = dlsym(handle, symbol);
if (!f)
- fprintf(stderr, "A52 Decoder - function '%s' can't be resolved\n", symbol);
+ av_log( NULL, AV_LOG_ERROR, "A52 Decoder - function '%s' can't be resolved\n", symbol);
return f;
}
#endif
{
AC3DecodeState *s = avctx->priv_data;
-#ifdef CONFIG_A52BIN
+#ifdef CONFIG_LIBA52BIN
s->handle = dlopen(liba52name, RTLD_LAZY);
if (!s->handle)
{
- fprintf(stderr, "A52 library %s could not be opened! \n%s\n", liba52name, dlerror());
+ 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");
if (!s->a52_init || !s->a52_samples || !s->a52_syncinfo
|| !s->a52_frame || !s->a52_block || !s->a52_free)
{
- dlclose(s->handle);
+ dlclose(s->handle);
return -1;
}
#else
- /* static linked version */
s->handle = 0;
- s->a52_init = ff_a52_init;
- s->a52_samples = ff_a52_samples;
- s->a52_syncinfo = ff_a52_syncinfo;
- s->a52_frame = ff_a52_frame;
- s->a52_block = ff_a52_block;
- s->a52_free = ff_a52_free;
+ 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);
static inline int blah (int32_t i)
{
if (i > 0x43c07fff)
- return 32767;
+ return 32767;
else if (i < 0x43bf8000)
- return -32768;
+ return -32768;
return i - 0x43c00000;
}
-static inline void float_to_int (float * _f, INT16 * s16, int nchannels)
+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
+ 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++] = blah (f[i + c]);
+ for (c = 0; c < nchannels; c += 256)
+ s16[j++] = blah (f[i + c]);
}
}
static int a52_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- UINT8 *buf, int buf_size)
+ uint8_t *buf, int buf_size)
{
AC3DecodeState *s = avctx->priv_data;
- UINT8 *buf_ptr;
+ uint8_t *buf_ptr;
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
+ 2, 1, 2, 3, 3, 4, 4, 5
};
- *data_size = 0;
+ *data_size= 0;
+
buf_ptr = buf;
while (buf_size > 0) {
len = s->inbuf_ptr - s->inbuf;
memcpy(s->inbuf, s->inbuf + 1, HEADER_SIZE - 1);
s->inbuf_ptr--;
} else {
- s->frame_size = len;
+ s->frame_size = len;
/* update codec info */
avctx->sample_rate = sample_rate;
s->channels = ac3_channels[s->flags & 7];
if (s->flags & A52_LFE)
- s->channels++;
- if (avctx->channels == 0)
- /* No specific number of channel requested */
- avctx->channels = s->channels;
- else if (s->channels < avctx->channels) {
- fprintf(stderr, "ac3dec: AC3 Source channels are less than specified: output to %d channels.. (frmsize: %d)\n", s->channels, len);
- avctx->channels = s->channels;
- }
- avctx->bit_rate = bit_rate;
+ s->channels++;
+ if (avctx->channels == 0)
+ /* No specific number of channel requested */
+ avctx->channels = s->channels;
+ else if (s->channels < avctx->channels) {
+ av_log(avctx, AV_LOG_ERROR, "ac3dec: AC3 Source channels are less than specified: output to %d channels.. (frmsize: %d)\n", s->channels, len);
+ avctx->channels = s->channels;
+ }
+ avctx->bit_rate = bit_rate;
}
}
} else if (len < s->frame_size) {
level = 1;
if (s->a52_frame(s->state, s->inbuf, &flags, &level, 384)) {
fail:
+ av_log(avctx, AV_LOG_ERROR, "Error decoding frame\n");
s->inbuf_ptr = s->inbuf;
s->frame_size = 0;
continue;
}
s->inbuf_ptr = s->inbuf;
s->frame_size = 0;
- *data_size = 6 * avctx->channels * 256 * sizeof(INT16);
+ *data_size = 6 * avctx->channels * 256 * sizeof(int16_t);
break;
}
}
{
AC3DecodeState *s = avctx->priv_data;
s->a52_free(s->state);
-#ifdef CONFIG_A52BIN
+#ifdef CONFIG_LIBA52BIN
dlclose(s->handle);
#endif
return 0;
}
-AVCodec ac3_decoder = {
+AVCodec liba52_decoder = {
"ac3",
CODEC_TYPE_AUDIO,
CODEC_ID_AC3,
projects / ffmpeg / blobdiff