From 645e75992d8876a5e0aa056739885d3afd08d431 Mon Sep 17 00:00:00 2001 From: Reimar Döffinger Date: Sat, 2 Oct 2010 09:51:26 +0000 Subject: Fix GSM decoding: regular GSM and MSGSM do not use the same bitstream endianness, so they cannot reuse the same code without a lot of function call overhead. Thus use templating to compile two different binaries. Originally committed as revision 25312 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/msgsmdec.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 libavcodec/msgsmdec.c (limited to 'libavcodec/msgsmdec.c') diff --git a/libavcodec/msgsmdec.c b/libavcodec/msgsmdec.c new file mode 100644 index 0000000000..e759451c83 --- /dev/null +++ b/libavcodec/msgsmdec.c @@ -0,0 +1,37 @@ +/* + * gsm 06.10 decoder, Microsoft variant + * Copyright (c) 2010 Reimar Döffinger + * + * 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 + */ + +#define ALT_BITSTREAM_READER_LE +#include "avcodec.h" +#include "msgsmdec.h" +#include "gsmdec_template.c" + +int ff_msgsm_decode_block(AVCodecContext *avctx, int16_t *samples, + const uint8_t *buf) +{ + int res; + GetBitContext gb; + init_get_bits(&gb, buf, GSM_MS_BLOCK_SIZE * 8); + res = gsm_decode_block(avctx, samples, &gb); + if (res < 0) + return res; + return gsm_decode_block(avctx, samples + GSM_FRAME_SIZE, &gb); +} -- cgit v1.2.3