mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
avcodec: add adpcm_ima_ssi encoder
Signed-off-by: Zane van Iperen <zane@zanevaniperen.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
908199802a
commit
b1189c1571
@ -71,6 +71,7 @@ version <next>:
|
||||
- gradients source video filter
|
||||
- MediaFoundation encoder wrapper
|
||||
- untile filter
|
||||
- Simon & Schuster Interactive ADPCM encoder
|
||||
|
||||
|
||||
version 4.2:
|
||||
|
@ -1108,7 +1108,7 @@ following image formats are supported:
|
||||
@item ADPCM IMA Funcom @tab @tab X
|
||||
@item ADPCM IMA High Voltage Software ALP @tab @tab X
|
||||
@item ADPCM IMA QuickTime @tab X @tab X
|
||||
@item ADPCM IMA Simon & Schuster Interactive @tab @tab X
|
||||
@item ADPCM IMA Simon & Schuster Interactive @tab X @tab X
|
||||
@item ADPCM IMA Ubisoft APM @tab @tab X
|
||||
@item ADPCM IMA Loki SDL MJPEG @tab @tab X
|
||||
@item ADPCM IMA WAV @tab X @tab X
|
||||
|
@ -865,6 +865,7 @@ OBJS-$(CONFIG_ADPCM_IMA_QT_DECODER) += adpcm.o adpcm_data.o
|
||||
OBJS-$(CONFIG_ADPCM_IMA_QT_ENCODER) += adpcmenc.o adpcm_data.o
|
||||
OBJS-$(CONFIG_ADPCM_IMA_RAD_DECODER) += adpcm.o adpcm_data.o
|
||||
OBJS-$(CONFIG_ADPCM_IMA_SSI_DECODER) += adpcm.o adpcm_data.o
|
||||
OBJS-$(CONFIG_ADPCM_IMA_SSI_ENCODER) += adpcmenc.o adpcm_data.o
|
||||
OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_DECODER) += adpcm.o adpcm_data.o
|
||||
OBJS-$(CONFIG_ADPCM_IMA_WAV_DECODER) += adpcm.o adpcm_data.o
|
||||
OBJS-$(CONFIG_ADPCM_IMA_WAV_ENCODER) += adpcmenc.o adpcm_data.o
|
||||
|
@ -77,6 +77,15 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx)
|
||||
return AVERROR(EINVAL);
|
||||
}
|
||||
|
||||
if (avctx->trellis && avctx->codec->id == AV_CODEC_ID_ADPCM_IMA_SSI) {
|
||||
/*
|
||||
* The current trellis implementation doesn't work for extended
|
||||
* runs of samples without periodic resets. Disallow it.
|
||||
*/
|
||||
av_log(avctx, AV_LOG_ERROR, "trellis not supported\n");
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
if (avctx->trellis) {
|
||||
int frontier = 1 << avctx->trellis;
|
||||
int max_paths = frontier * FREEZE_INTERVAL;
|
||||
@ -139,6 +148,10 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx)
|
||||
}
|
||||
avctx->frame_size = 512 * (avctx->sample_rate / 11025);
|
||||
break;
|
||||
case AV_CODEC_ID_ADPCM_IMA_SSI:
|
||||
avctx->frame_size = BLKSIZE * 2 / avctx->channels;
|
||||
avctx->block_align = BLKSIZE;
|
||||
break;
|
||||
default:
|
||||
ret = AVERROR(EINVAL);
|
||||
goto error;
|
||||
@ -483,6 +496,8 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
|
||||
|
||||
if (avctx->codec_id == AV_CODEC_ID_ADPCM_SWF)
|
||||
pkt_size = (2 + avctx->channels * (22 + 4 * (frame->nb_samples - 1)) + 7) / 8;
|
||||
else if (avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_SSI)
|
||||
pkt_size = (frame->nb_samples * avctx->channels) / 2;
|
||||
else
|
||||
pkt_size = avctx->block_align;
|
||||
if ((ret = ff_alloc_packet2(avctx, avpkt, pkt_size, 0)) < 0)
|
||||
@ -567,6 +582,22 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
|
||||
flush_put_bits(&pb);
|
||||
break;
|
||||
}
|
||||
case AV_CODEC_ID_ADPCM_IMA_SSI:
|
||||
{
|
||||
PutBitContext pb;
|
||||
init_put_bits(&pb, dst, pkt_size);
|
||||
|
||||
av_assert0(avctx->trellis == 0);
|
||||
|
||||
for (i = 0; i < frame->nb_samples; i++) {
|
||||
for (ch = 0; ch < avctx->channels; ch++) {
|
||||
put_bits(&pb, 4, adpcm_ima_qt_compress_sample(c->status + ch, *samples++));
|
||||
}
|
||||
}
|
||||
|
||||
flush_put_bits(&pb);
|
||||
break;
|
||||
}
|
||||
case AV_CODEC_ID_ADPCM_SWF:
|
||||
{
|
||||
PutBitContext pb;
|
||||
@ -721,6 +752,7 @@ AVCodec ff_ ## name_ ## _encoder = { \
|
||||
}
|
||||
|
||||
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");
|
||||
ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_WAV, adpcm_ima_wav, sample_fmts_p, 0, "ADPCM IMA WAV");
|
||||
ADPCM_ENCODER(AV_CODEC_ID_ADPCM_MS, adpcm_ms, sample_fmts, 0, "ADPCM Microsoft");
|
||||
ADPCM_ENCODER(AV_CODEC_ID_ADPCM_SWF, adpcm_swf, sample_fmts, 0, "ADPCM Shockwave Flash");
|
||||
|
@ -619,6 +619,7 @@ extern AVCodec ff_adpcm_ima_qt_encoder;
|
||||
extern AVCodec ff_adpcm_ima_qt_decoder;
|
||||
extern AVCodec ff_adpcm_ima_rad_decoder;
|
||||
extern AVCodec ff_adpcm_ima_ssi_decoder;
|
||||
extern AVCodec ff_adpcm_ima_ssi_encoder;
|
||||
extern AVCodec ff_adpcm_ima_smjpeg_decoder;
|
||||
extern AVCodec ff_adpcm_ima_wav_encoder;
|
||||
extern AVCodec ff_adpcm_ima_wav_decoder;
|
||||
|
@ -1475,6 +1475,7 @@ int av_get_exact_bits_per_sample(enum AVCodecID codec_id)
|
||||
case AV_CODEC_ID_ADPCM_IMA_EA_SEAD:
|
||||
case AV_CODEC_ID_ADPCM_IMA_OKI:
|
||||
case AV_CODEC_ID_ADPCM_IMA_WS:
|
||||
case AV_CODEC_ID_ADPCM_IMA_SSI:
|
||||
case AV_CODEC_ID_ADPCM_G722:
|
||||
case AV_CODEC_ID_ADPCM_YAMAHA:
|
||||
case AV_CODEC_ID_ADPCM_AICA:
|
||||
|
@ -28,7 +28,7 @@
|
||||
#include "libavutil/version.h"
|
||||
|
||||
#define LIBAVCODEC_VERSION_MAJOR 58
|
||||
#define LIBAVCODEC_VERSION_MINOR 88
|
||||
#define LIBAVCODEC_VERSION_MINOR 89
|
||||
#define LIBAVCODEC_VERSION_MICRO 100
|
||||
|
||||
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
|
||||
|
Loading…
Reference in New Issue
Block a user