diff options
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/dca.c | 37 | ||||
| -rw-r--r-- | libavcodec/dca.h | 6 | ||||
| -rw-r--r-- | libavcodec/dca_parser.c | 37 | ||||
| -rw-r--r-- | libavcodec/dca_parser.h | 36 | ||||
| -rw-r--r-- | libavcodec/dcadec.c | 1 |
6 files changed, 44 insertions, 75 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index addf5a5ae2..32a3a7b28a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -134,7 +134,7 @@ OBJS-$(CONFIG_COMFORTNOISE_ENCODER) += cngenc.o OBJS-$(CONFIG_CSCD_DECODER) += cscd.o OBJS-$(CONFIG_CYUV_DECODER) += cyuv.o OBJS-$(CONFIG_DCA_DECODER) += dcadec.o dca.o dcadsp.o \ - dca_parser.o synth_filter.o + synth_filter.o OBJS-$(CONFIG_DFA_DECODER) += dfa.o OBJS-$(CONFIG_DNXHD_DECODER) += dnxhddec.o dnxhddata.o OBJS-$(CONFIG_DNXHD_ENCODER) += dnxhdenc.o dnxhddata.o diff --git a/libavcodec/dca.c b/libavcodec/dca.c index 0f1eeecf7b..308211f01a 100644 --- a/libavcodec/dca.c +++ b/libavcodec/dca.c @@ -19,7 +19,9 @@ */ #include <stdint.h> +#include <string.h> +#include "put_bits.h" #include "dca.h" const uint32_t avpriv_dca_sample_rates[16] = @@ -27,3 +29,38 @@ const uint32_t avpriv_dca_sample_rates[16] = 0, 8000, 16000, 32000, 0, 0, 11025, 22050, 44100, 0, 0, 12000, 24000, 48000, 96000, 192000 }; + +int ff_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst, + int max_size) +{ + uint32_t mrk; + int i, tmp; + const uint16_t *ssrc = (const uint16_t *) src; + uint16_t *sdst = (uint16_t *) dst; + PutBitContext pb; + + if ((unsigned) src_size > (unsigned) max_size) + src_size = max_size; + + mrk = AV_RB32(src); + switch (mrk) { + case DCA_MARKER_RAW_BE: + memcpy(dst, src, src_size); + return src_size; + case DCA_MARKER_RAW_LE: + for (i = 0; i < (src_size + 1) >> 1; i++) + *sdst++ = av_bswap16(*ssrc++); + return src_size; + case DCA_MARKER_14B_BE: + case DCA_MARKER_14B_LE: + init_put_bits(&pb, dst, max_size); + for (i = 0; i < (src_size + 1) >> 1; i++, src += 2) { + tmp = ((mrk == DCA_MARKER_14B_BE) ? AV_RB16(src) : AV_RL16(src)) & 0x3FFF; + put_bits(&pb, 14, tmp); + } + flush_put_bits(&pb); + return (put_bits_count(&pb) + 7) >> 3; + default: + return AVERROR_INVALIDDATA; + } +} diff --git a/libavcodec/dca.h b/libavcodec/dca.h index 76342f0ab9..0037de2816 100644 --- a/libavcodec/dca.h +++ b/libavcodec/dca.h @@ -39,4 +39,10 @@ extern av_export const uint32_t avpriv_dca_sample_rates[16]; +/** + * Convert bitstream to one representation based on sync marker + */ +int ff_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst, + int max_size); + #endif /* AVCODEC_DCA_H */ diff --git a/libavcodec/dca_parser.c b/libavcodec/dca_parser.c index ab235cf480..4a3d8125bf 100644 --- a/libavcodec/dca_parser.c +++ b/libavcodec/dca_parser.c @@ -24,9 +24,7 @@ #include "parser.h" #include "dca.h" -#include "dca_parser.h" #include "get_bits.h" -#include "put_bits.h" typedef struct DCAParseContext { ParseContext pc; @@ -103,41 +101,6 @@ static av_cold int dca_parse_init(AVCodecParserContext * s) return 0; } -int ff_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst, - int max_size) -{ - uint32_t mrk; - int i, tmp; - const uint16_t *ssrc = (const uint16_t *) src; - uint16_t *sdst = (uint16_t *) dst; - PutBitContext pb; - - if ((unsigned) src_size > (unsigned) max_size) - src_size = max_size; - - mrk = AV_RB32(src); - switch (mrk) { - case DCA_MARKER_RAW_BE: - memcpy(dst, src, src_size); - return src_size; - case DCA_MARKER_RAW_LE: - for (i = 0; i < (src_size + 1) >> 1; i++) - *sdst++ = av_bswap16(*ssrc++); - return src_size; - case DCA_MARKER_14B_BE: - case DCA_MARKER_14B_LE: - init_put_bits(&pb, dst, max_size); - for (i = 0; i < (src_size + 1) >> 1; i++, src += 2) { - tmp = ((mrk == DCA_MARKER_14B_BE) ? AV_RB16(src) : AV_RL16(src)) & 0x3FFF; - put_bits(&pb, 14, tmp); - } - flush_put_bits(&pb); - return (put_bits_count(&pb) + 7) >> 3; - default: - return AVERROR_INVALIDDATA; - } -} - static int dca_parse_params(const uint8_t *buf, int buf_size, int *duration, int *sample_rate) { diff --git a/libavcodec/dca_parser.h b/libavcodec/dca_parser.h deleted file mode 100644 index f480eab7ce..0000000000 --- a/libavcodec/dca_parser.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * DCA parser - * Copyright (C) 2004 Gildas Bazin - * Copyright (C) 2004 Benjamin Zores - * Copyright (C) 2006 Benjamin Larsson - * Copyright (C) 2007 Konstantin Shishkov - * - * This file is part of Libav. - * - * Libav 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. - * - * Libav 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 Libav; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef AVCODEC_DCA_PARSER_H -#define AVCODEC_DCA_PARSER_H - -#include <stdint.h> - -/** - * Convert bitstream to one representation based on sync marker - */ -int ff_dca_convert_bitstream(const uint8_t *src, int src_size, uint8_t *dst, - int max_size); - -#endif /* AVCODEC_DCA_PARSER_H */ diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index e53b03e8f9..0f7337574f 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -40,7 +40,6 @@ #include "dcadata.h" #include "dcahuff.h" #include "dca.h" -#include "dca_parser.h" #include "mathops.h" #include "synth_filter.h" #include "dcadsp.h" |