/*
* G.726 ADPCM audio codec
- * Copyright (c) 2004 Roman Shaposhnik.
+ * Copyright (c) 2004 Roman Shaposhnik
*
* This is a very straightforward rendition of the G.726
* Section 4 "Computational Details".
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * 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.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * 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 FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <limits.h>
#include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
+#include "put_bits.h"
/**
* G.726 11bit float.
}
typedef struct G726Tables {
- int bits; /**< bits per sample */
const int* quant; /**< quantization table */
const int16_t* iquant; /**< inverse quantization table */
const int16_t* W; /**< special table #1 ;-) */
6, 6, 5, 4, 3, 2, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 };
static const G726Tables G726Tables_pool[] =
- {{ 2, quant_tbl16, iquant_tbl16, W_tbl16, F_tbl16 },
- { 3, quant_tbl24, iquant_tbl24, W_tbl24, F_tbl24 },
- { 4, quant_tbl32, iquant_tbl32, W_tbl32, F_tbl32 },
- { 5, quant_tbl40, iquant_tbl40, W_tbl40, F_tbl40 }};
+ {{ quant_tbl16, iquant_tbl16, W_tbl16, F_tbl16 },
+ { quant_tbl24, iquant_tbl24, W_tbl24, F_tbl24 },
+ { quant_tbl32, iquant_tbl32, W_tbl32, F_tbl32 },
+ { quant_tbl40, iquant_tbl40, W_tbl40, F_tbl40 }};
/**
if (sign)
i = ~i;
- if (c->tbls.bits != 2 && i == 0) /* I'm not sure this is a good idea */
+ if (c->code_size != 2 && i == 0) /* I'm not sure this is a good idea */
i = 0xff;
return i;
{
int dq, re_signal, pk0, fa1, i, tr, ylint, ylfrac, thr2, al, dq0;
Float11 f;
- int I_sig= I >> (c->tbls.bits - 1);
+ int I_sig= I >> (c->code_size - 1);
dq = inverse_quant(c, I);
c->td = c->a[1] < -11776;
/* Update Ap */
- c->dms += ((c->tbls.F[I]<<9) - c->dms) >> 5;
- c->dml += ((c->tbls.F[I]<<11) - c->dml) >> 7;
+ c->dms += (c->tbls.F[I]<<4) + ((- c->dms) >> 5);
+ c->dml += (c->tbls.F[I]<<4) + ((- c->dml) >> 7);
if (tr)
c->ap = 256;
- else if (c->y > 1535 && !c->td && abs((c->dms << 2) - c->dml) < (c->dml >> 3))
+ else {
c->ap += (-c->ap) >> 4;
- else
- c->ap += (0x200 - c->ap) >> 4;
+ if (c->y <= 1535 || c->td || abs((c->dms << 2) - c->dml) >= (c->dml >> 3))
+ c->ap += 0x20;
+ }
/* Update Yu and Yl */
c->yu = av_clip(c->y + c->tbls.W[I] + ((-c->y)>>5), 544, 5120);
return 0;
}
-#ifdef CONFIG_ENCODERS
+#if CONFIG_ADPCM_G726_ENCODER
static int16_t g726_encode(G726Context* c, int16_t sig)
{
uint8_t i;
- i = quant(c, sig/4 - c->se) & ((1<<c->tbls.bits) - 1);
+ i = quant(c, sig/4 - c->se) & ((1<<c->code_size) - 1);
g726_decode(c, i);
return i;
}
static av_cold int g726_init(AVCodecContext * avctx)
{
G726Context* c = avctx->priv_data;
- unsigned int index= (avctx->bit_rate + avctx->sample_rate/2) / avctx->sample_rate - 2;
+ unsigned int index;
+
+ if (avctx->sample_rate <= 0) {
+ av_log(avctx, AV_LOG_ERROR, "Samplerate is invalid\n");
+ return -1;
+ }
+
+ index = (avctx->bit_rate + avctx->sample_rate/2) / avctx->sample_rate - 2;
if (avctx->bit_rate % avctx->sample_rate && avctx->codec->encode) {
av_log(avctx, AV_LOG_ERROR, "Bitrate - Samplerate combination is invalid\n");
return -1;
}
g726_reset(c, index);
- c->code_size = c->tbls.bits;
+ c->code_size = index+2;
avctx->coded_frame = avcodec_alloc_frame();
if (!avctx->coded_frame)
return AVERROR(ENOMEM);
avctx->coded_frame->key_frame = 1;
+ if (avctx->codec->decode)
+ avctx->sample_fmt = AV_SAMPLE_FMT_S16;
+
+ /* select a frame size that will end on a byte boundary and have a size of
+ approximately 1024 bytes */
+ if (avctx->codec->encode)
+ avctx->frame_size = ((int[]){ 4096, 2736, 2048, 1640 })[index];
+
return 0;
}
return 0;
}
-#ifdef CONFIG_ENCODERS
+#if CONFIG_ADPCM_G726_ENCODER
static int g726_encode_frame(AVCodecContext *avctx,
uint8_t *dst, int buf_size, void *data)
{
G726Context *c = avctx->priv_data;
- short *samples = data;
+ const short *samples = data;
PutBitContext pb;
+ int i;
init_put_bits(&pb, dst, 1024*1024);
- for (; buf_size; buf_size--)
+ for (i = 0; i < avctx->frame_size; i++)
put_bits(&pb, c->code_size, g726_encode(c, *samples++));
flush_put_bits(&pb);
static int g726_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- const uint8_t *buf, int buf_size)
+ AVPacket *avpkt)
{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
G726Context *c = avctx->priv_data;
short *samples = data;
GetBitContext gb;
return buf_size;
}
-#ifdef CONFIG_ENCODERS
-AVCodec adpcm_g726_encoder = {
+#if CONFIG_ADPCM_G726_ENCODER
+AVCodec ff_adpcm_g726_encoder = {
"g726",
- CODEC_TYPE_AUDIO,
+ AVMEDIA_TYPE_AUDIO,
CODEC_ID_ADPCM_G726,
sizeof(G726Context),
g726_init,
g726_encode_frame,
g726_close,
NULL,
+ .capabilities = CODEC_CAP_SMALL_LAST_FRAME,
+ .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"),
};
-#endif //CONFIG_ENCODERS
+#endif
-AVCodec adpcm_g726_decoder = {
+AVCodec ff_adpcm_g726_decoder = {
"g726",
- CODEC_TYPE_AUDIO,
+ AVMEDIA_TYPE_AUDIO,
CODEC_ID_ADPCM_G726,
sizeof(G726Context),
g726_init,