Mercurial > libavcodec.hg
changeset 5022:a19b508f78d7 libavcodec
remove libdts decoder, we have a native dts decoder
| author | aurel |
|---|---|
| date | Thu, 17 May 2007 17:04:00 +0000 |
| parents | d73237575709 |
| children | ed6b3efebf1e |
| files | Makefile allcodecs.c avcodec.h dtsdec.c |
| diffstat | 4 files changed, 0 insertions(+), 281 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu May 17 16:45:55 2007 +0000 +++ b/Makefile Thu May 17 17:04:00 2007 +0000 @@ -278,7 +278,6 @@ # external codec libraries OBJS-$(CONFIG_LIBAMR) += amr.o OBJS-$(CONFIG_LIBA52) += a52dec.o -OBJS-$(CONFIG_LIBDTS) += dtsdec.o OBJS-$(CONFIG_LIBFAAC) += faac.o OBJS-$(CONFIG_LIBFAAD) += faad.o OBJS-$(CONFIG_LIBGSM) += libgsm.o
--- a/allcodecs.c Thu May 17 16:45:55 2007 +0000 +++ b/allcodecs.c Thu May 17 17:04:00 2007 +0000 @@ -178,7 +178,6 @@ REGISTER_ENCDEC (LIBAMR_NB, libamr_nb); REGISTER_ENCDEC (LIBAMR_WB, libamr_wb); REGISTER_DECODER(LIBA52, liba52); - REGISTER_DECODER(LIBDTS, libdts); REGISTER_ENCDEC (LIBGSM, libgsm); REGISTER_ENCDEC (LIBGSM_MS, libgsm_ms); REGISTER_ENCODER(LIBTHEORA, libtheora);
--- a/avcodec.h Thu May 17 16:45:55 2007 +0000 +++ b/avcodec.h Thu May 17 17:04:00 2007 +0000 @@ -2428,7 +2428,6 @@ extern AVCodec libamr_nb_encoder; extern AVCodec libamr_wb_decoder; extern AVCodec libamr_wb_encoder; -extern AVCodec libdts_decoder; extern AVCodec libgsm_decoder; extern AVCodec libgsm_encoder; extern AVCodec libgsm_ms_decoder;
--- a/dtsdec.c Thu May 17 16:45:55 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,278 +0,0 @@ -/* - * dtsdec.c : free DTS Coherent Acoustics stream decoder. - * Copyright (C) 2004 Benjamin Zores <ben@geexbox.org> - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 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 General Public License for more details. - * - * You should have received a copy of the GNU 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 - */ - -#include "avcodec.h" -#include <dts.h> - -#include <stdlib.h> -#include <string.h> - -#define BUFFER_SIZE 18726 -#define HEADER_SIZE 14 - -#define CONVERT_LEVEL 1 -#define CONVERT_BIAS 0 - -typedef struct DTSContext { - dts_state_t *state; - uint8_t buf[BUFFER_SIZE]; - uint8_t *bufptr; - uint8_t *bufpos; -} DTSContext; - -static inline int16_t -convert(sample_t s) -{ - return s * 0x7fff; -} - -static void -convert2s16_multi(sample_t *f, int16_t *s16, int flags) -{ - int i; - - switch(flags & (DTS_CHANNEL_MASK | DTS_LFE)){ - case DTS_MONO: - for(i = 0; i < 256; i++){ - s16[5*i] = s16[5*i+1] = s16[5*i+2] = s16[5*i+3] = 0; - s16[5*i+4] = convert(f[i]); - } - break; - case DTS_CHANNEL: - case DTS_STEREO: - case DTS_DOLBY: - for(i = 0; i < 256; i++){ - s16[2*i] = convert(f[i]); - s16[2*i+1] = convert(f[i+256]); - } - break; - case DTS_3F: - for(i = 0; i < 256; i++){ - s16[5*i] = convert(f[i+256]); - s16[5*i+1] = convert(f[i+512]); - s16[5*i+2] = s16[5*i+3] = 0; - s16[5*i+4] = convert(f[i]); - } - break; - case DTS_2F2R: - for(i = 0; i < 256; i++){ - s16[4*i] = convert(f[i]); - s16[4*i+1] = convert(f[i+256]); - s16[4*i+2] = convert(f[i+512]); - s16[4*i+3] = convert(f[i+768]); - } - break; - case DTS_3F2R: - for(i = 0; i < 256; i++){ - s16[5*i] = convert(f[i+256]); - s16[5*i+1] = convert(f[i+512]); - s16[5*i+2] = convert(f[i+768]); - s16[5*i+3] = convert(f[i+1024]); - s16[5*i+4] = convert(f[i]); - } - break; - case DTS_MONO | DTS_LFE: - for(i = 0; i < 256; i++){ - s16[6*i] = s16[6*i+1] = s16[6*i+2] = s16[6*i+3] = 0; - s16[6*i+4] = convert(f[i]); - s16[6*i+5] = convert(f[i+256]); - } - break; - case DTS_CHANNEL | DTS_LFE: - case DTS_STEREO | DTS_LFE: - case DTS_DOLBY | DTS_LFE: - for(i = 0; i < 256; i++){ - s16[6*i] = convert(f[i]); - s16[6*i+1] = convert(f[i+256]); - s16[6*i+2] = s16[6*i+3] = s16[6*i+4] = 0; - s16[6*i+5] = convert(f[i+512]); - } - break; - case DTS_3F | DTS_LFE: - for(i = 0; i < 256; i++){ - s16[6*i] = convert(f[i+256]); - s16[6*i+1] = convert(f[i+512]); - s16[6*i+2] = s16[6*i+3] = 0; - s16[6*i+4] = convert(f[i]); - s16[6*i+5] = convert(f[i+768]); - } - break; - case DTS_2F2R | DTS_LFE: - for(i = 0; i < 256; i++){ - s16[6*i] = convert(f[i]); - s16[6*i+1] = convert(f[i+256]); - s16[6*i+2] = convert(f[i+512]); - s16[6*i+3] = convert(f[i+768]); - s16[6*i+4] = 0; - s16[6*i+5] = convert(f[i+1024]); - } - break; - case DTS_3F2R | DTS_LFE: - for(i = 0; i < 256; i++){ - s16[6*i] = convert(f[i+256]); - s16[6*i+1] = convert(f[i+512]); - s16[6*i+2] = convert(f[i+768]); - s16[6*i+3] = convert(f[i+1024]); - s16[6*i+4] = convert(f[i]); - s16[6*i+5] = convert(f[i+1280]); - } - break; - } -} - -static int -channels_multi(int flags) -{ - switch(flags & (DTS_CHANNEL_MASK | DTS_LFE)){ - case DTS_CHANNEL: - case DTS_STEREO: - case DTS_DOLBY: - return 2; - case DTS_2F2R: - return 4; - case DTS_MONO: - case DTS_3F: - case DTS_3F2R: - return 5; - case DTS_MONO | DTS_LFE: - case DTS_CHANNEL | DTS_LFE: - case DTS_STEREO | DTS_LFE: - case DTS_DOLBY | DTS_LFE: - case DTS_3F | DTS_LFE: - case DTS_2F2R | DTS_LFE: - case DTS_3F2R | DTS_LFE: - return 6; - } - - return -1; -} - -static int -dts_decode_frame(AVCodecContext * avctx, void *data, int *data_size, - uint8_t * buff, int buff_size) -{ - DTSContext *s = avctx->priv_data; - uint8_t *start = buff; - uint8_t *end = buff + buff_size; - int16_t *out_samples = data; - int sample_rate; - int frame_length; - int flags; - int bit_rate; - int len; - level_t level; - sample_t bias; - int nblocks; - int i; - - *data_size = 0; - - while(1) { - int length; - - len = end - start; - if(!len) - break; - if(len > s->bufpos - s->bufptr) - len = s->bufpos - s->bufptr; - memcpy(s->bufptr, start, len); - s->bufptr += len; - start += len; - if(s->bufptr != s->bufpos) - return start - buff; - if(s->bufpos != s->buf + HEADER_SIZE) - break; - - length = dts_syncinfo(s->state, s->buf, &flags, &sample_rate, - &bit_rate, &frame_length); - if(!length) { - av_log(NULL, AV_LOG_INFO, "skip\n"); - for(s->bufptr = s->buf; s->bufptr < s->buf + HEADER_SIZE - 1; s->bufptr++) - s->bufptr[0] = s->bufptr[1]; - continue; - } - s->bufpos = s->buf + length; - } - - level = CONVERT_LEVEL; - bias = CONVERT_BIAS; - - flags |= DTS_ADJUST_LEVEL; - if(dts_frame(s->state, s->buf, &flags, &level, bias)) { - av_log(avctx, AV_LOG_ERROR, "dts_frame() failed\n"); - goto end; - } - - avctx->sample_rate = sample_rate; - avctx->channels = channels_multi(flags); - avctx->bit_rate = bit_rate; - - nblocks = dts_blocks_num(s->state); - - for(i = 0; i < nblocks; i++) { - if(dts_block(s->state)) { - av_log(avctx, AV_LOG_ERROR, "dts_block() failed\n"); - goto end; - } - - convert2s16_multi(dts_samples(s->state), out_samples, flags); - - out_samples += 256 * avctx->channels; - *data_size += 256 * sizeof(int16_t) * avctx->channels; - } - -end: - s->bufptr = s->buf; - s->bufpos = s->buf + HEADER_SIZE; - return start - buff; -} - -static int -dts_decode_init(AVCodecContext * avctx) -{ - DTSContext *s = avctx->priv_data; - s->bufptr = s->buf; - s->bufpos = s->buf + HEADER_SIZE; - s->state = dts_init(0); - if(s->state == NULL) - return -1; - - return 0; -} - -static int -dts_decode_end(AVCodecContext * avctx) -{ - DTSContext *s = avctx->priv_data; - dts_free(s->state); - return 0; -} - -AVCodec libdts_decoder = { - "libdts", - CODEC_TYPE_AUDIO, - CODEC_ID_DTS, - sizeof(DTSContext), - dts_decode_init, - NULL, - dts_decode_end, - dts_decode_frame, -};