virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-17 20:17:55 +02:00
Code Issues Releases Activity

avcodec: add adpcm_argo encoder

Browse Source 
Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
This commit is contained in:
Zane van Iperen 2020-07-27 00:23:14 +10:00
parent 5d1e1dd6bd
commit 62da99e1d0
No known key found for this signature in database
GPG Key ID: 68616B2D8AC4DCC5
7 changed files with 91 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -11,6 +11,7 @@ version <next>:
- Rayman 2 APM muxer
- AV1 encoding support SVT-AV1
- Cineform HD encoder
- ADPCM Argonaut Games encoder
version 4.3:

2
doc/general.texi
View File

@ -1098,7 +1098,7 @@ following image formats are supported:
@item ACELP.KELVIN @tab @tab X
@item ADPCM 4X Movie @tab @tab X
@item APDCM Yamaha AICA @tab @tab X
@item ADPCM Argonaut Games @tab @tab X
@item ADPCM Argonaut Games @tab X @tab X
@item ADPCM CDROM XA @tab @tab X
@item ADPCM Creative Technology @tab @tab X
@tab 16 -> 4, 8 -> 4, 8 -> 3, 8 -> 2

1
libavcodec/Makefile
View File

@ -837,6 +837,7 @@ OBJS-$(CONFIG_ADPCM_AFC_DECODER) += adpcm.o adpcm_data.o
OBJS-$(CONFIG_ADPCM_AGM_DECODER) += adpcm.o adpcm_data.o
OBJS-$(CONFIG_ADPCM_AICA_DECODER) += adpcm.o adpcm_data.o
OBJS-$(CONFIG_ADPCM_ARGO_DECODER) += adpcm.o adpcm_data.o
OBJS-$(CONFIG_ADPCM_ARGO_ENCODER) += adpcm.o adpcmenc.o
OBJS-$(CONFIG_ADPCM_CT_DECODER) += adpcm.o adpcm_data.o
OBJS-$(CONFIG_ADPCM_DTK_DECODER) += adpcm.o adpcm_data.o
OBJS-$(CONFIG_ADPCM_EA_DECODER) += adpcm.o adpcm_data.o

86
libavcodec/adpcmenc.c
View File

@ -78,7 +78,8 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx)
}
if (avctx->codec->id == AV_CODEC_ID_ADPCM_IMA_SSI ||
avctx->codec->id == AV_CODEC_ID_ADPCM_IMA_APM) {
avctx->codec->id == AV_CODEC_ID_ADPCM_IMA_APM ||
avctx->codec->id == AV_CODEC_ID_ADPCM_ARGO) {
/*
* The current trellis implementation doesn't work for extended
* runs of samples without periodic resets. Disallow it.
@ -156,6 +157,10 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx)
return AVERROR(ENOMEM);
avctx->extradata_size = 28;
break;
case AV_CODEC_ID_ADPCM_ARGO:
avctx->frame_size = 32;
avctx->block_align = 17 * avctx->channels;
break;
default:
return AVERROR(EINVAL);
}
@ -481,6 +486,46 @@ static void adpcm_compress_trellis(AVCodecContext *avctx,
c->idelta = nodes[0]->step;
}
static inline int adpcm_argo_compress_nibble(const ADPCMChannelStatus *cs, int16_t s,
int shift, int flag)
{
int nibble;
if (flag)
nibble = 4 * s - 8 * cs->sample1 + 4 * cs->sample2;
else
nibble = 4 * s - 4 * cs->sample1;
return (nibble >> shift) & 0x0F;
}
static int64_t adpcm_argo_compress_block(ADPCMChannelStatus *cs, PutBitContext *pb,
const int16_t *samples, int nsamples,
int shift, int flag)
{
int64_t error = 0;
if (pb) {
put_bits(pb, 4, shift - 2);
put_bits(pb, 1, 0);
put_bits(pb, 1, !!flag);
put_bits(pb, 2, 0);
}
for (int n = 0; n < nsamples; n++) {
/* Compress the nibble, then expand it to see how much precision we've lost. */
int nibble = adpcm_argo_compress_nibble(cs, samples[n], shift, flag);
int16_t sample = ff_adpcm_argo_expand_nibble(cs, nibble, shift, flag);
error += abs(samples[n] - sample);
if (pb)
put_bits(pb, 4, nibble);
}
return error;
}
static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
const AVFrame *frame, int *got_packet_ptr)
{
@ -741,6 +786,44 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
flush_put_bits(&pb);
break;
}
case AV_CODEC_ID_ADPCM_ARGO:
{
PutBitContext pb;
init_put_bits(&pb, dst, pkt_size);
av_assert0(frame->nb_samples == 32);
for (ch = 0; ch < avctx->channels; ch++) {
int64_t error = INT64_MAX, tmperr = INT64_MAX;
int shift = 2, flag = 0;
int saved1 = c->status[ch].sample1;
int saved2 = c->status[ch].sample2;
/* Find the optimal coefficients, bail early if we find a perfect result. */
for (int s = 2; s < 18 && tmperr != 0; s++) {
for (int f = 0; f < 2 && tmperr != 0; f++) {
c->status[ch].sample1 = saved1;
c->status[ch].sample2 = saved2;
tmperr = adpcm_argo_compress_block(c->status + ch, NULL, samples_p[ch],
frame->nb_samples, s, f);
if (tmperr < error) {
shift = s;
flag = f;
error = tmperr;
}
}
}
/* Now actually do the encode. */
c->status[ch].sample1 = saved1;
c->status[ch].sample2 = saved2;
adpcm_argo_compress_block(c->status + ch, &pb, samples_p[ch],
frame->nb_samples, shift, flag);
}
flush_put_bits(&pb);
break;
}
default:
return AVERROR(EINVAL);
}
@ -773,6 +856,7 @@ AVCodec ff_ ## name_ ## _encoder = { \
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP, \
}
ADPCM_ENCODER(AV_CODEC_ID_ADPCM_ARGO, adpcm_argo, sample_fmts_p, 0, "ADPCM Argonaut Games");
ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_APM, adpcm_ima_apm, sample_fmts, AV_CODEC_CAP_SMALL_LAST_FRAME, "ADPCM IMA Ubisoft APM");
ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_QT, adpcm_ima_qt, sample_fmts_p, 0, "ADPCM IMA QuickTime");
ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_SSI, adpcm_ima_ssi, sample_fmts, AV_CODEC_CAP_SMALL_LAST_FRAME, "ADPCM IMA Simon & Schuster Interactive");

1
libavcodec/allcodecs.c
View File

@ -591,6 +591,7 @@ extern AVCodec ff_adpcm_afc_decoder;
extern AVCodec ff_adpcm_agm_decoder;
extern AVCodec ff_adpcm_aica_decoder;
extern AVCodec ff_adpcm_argo_decoder;
extern AVCodec ff_adpcm_argo_encoder;
extern AVCodec ff_adpcm_ct_decoder;
extern AVCodec ff_adpcm_dtk_decoder;
extern AVCodec ff_adpcm_ea_decoder;

1
libavcodec/utils.c
View File

@ -1479,6 +1479,7 @@ int av_get_exact_bits_per_sample(enum AVCodecID codec_id)
switch (codec_id) {
case AV_CODEC_ID_8SVX_EXP:
case AV_CODEC_ID_8SVX_FIB:
case AV_CODEC_ID_ADPCM_ARGO:
case AV_CODEC_ID_ADPCM_CT:
case AV_CODEC_ID_ADPCM_IMA_APC:
case AV_CODEC_ID_ADPCM_IMA_APM:

2
libavcodec/version.h
View File

@ -28,7 +28,7 @@
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 99
#define LIBAVCODEC_VERSION_MINOR 100
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \