*/
#include "avcodec.h"
+#include "libavutil/common.h"
/** decoder context */
typedef struct EightSvxContext {
- uint8_t fib_acc;
+ AVFrame frame;
+ uint8_t fib_acc[2];
const int8_t *table;
+
+ /* buffer used to store the whole first packet.
+ data is only sent as one large packet */
+ uint8_t *data[2];
+ int data_size;
+ int data_idx;
} EightSvxContext;
static const int8_t fibonacci[16] = { -34, -21, -13, -8, -5, -3, -2, -1,
static const int8_t exponential[16] = { -128, -64, -32, -16, -8, -4, -2, -1,
0, 1, 2, 4, 8, 16, 32, 64 };
+#define MAX_FRAME_SIZE 32768
+
/**
* Delta decode the compressed values in src, and put the resulting
* decoded samples in dst.
*state = val;
}
+static void raw_decode(uint8_t *dst, const int8_t *src, int src_size)
+{
+ while (src_size--)
+ *dst++ = *src++ + 128;
+}
+
/** decode a frame */
-static int eightsvx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
- AVPacket *avpkt)
+static int eightsvx_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame_ptr, AVPacket *avpkt)
{
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
EightSvxContext *esc = avctx->priv_data;
- uint8_t *out_data = data;
- int consumed = buf_size;
+ int buf_size;
+ int ch, ret;
+ int is_compr = (avctx->codec_id != AV_CODEC_ID_PCM_S8_PLANAR);
- if(avctx->frame_number == 0) {
- if (buf_size < 2) {
+ /* for the first packet, copy data to buffer */
+ if (avpkt->data) {
+ int hdr_size = is_compr ? 2 : 0;
+ int chan_size = (avpkt->size - hdr_size * avctx->channels) / avctx->channels;
+
+ if (avpkt->size < hdr_size * avctx->channels) {
av_log(avctx, AV_LOG_ERROR, "packet size is too small\n");
return AVERROR(EINVAL);
}
- esc->fib_acc = (int8_t)buf[1] + 128;
- buf_size -= 2;
- buf += 2;
- }
+ if (esc->data[0]) {
+ av_log(avctx, AV_LOG_ERROR, "unexpected data after first packet\n");
+ return AVERROR(EINVAL);
+ }
- if (*data_size < buf_size * 2) {
- av_log(avctx, AV_LOG_ERROR, "Provided buffer with size %d is too small.\n",
- *data_size);
+ if (is_compr) {
+ esc->fib_acc[0] = avpkt->data[1] + 128;
+ if (avctx->channels == 2)
+ esc->fib_acc[1] = avpkt->data[2+chan_size+1] + 128;
+ }
+
+ esc->data_idx = 0;
+ esc->data_size = chan_size;
+ if (!(esc->data[0] = av_malloc(chan_size)))
+ return AVERROR(ENOMEM);
+ if (avctx->channels == 2) {
+ if (!(esc->data[1] = av_malloc(chan_size))) {
+ av_freep(&esc->data[0]);
+ return AVERROR(ENOMEM);
+ }
+ }
+ memcpy(esc->data[0], &avpkt->data[hdr_size], chan_size);
+ if (avctx->channels == 2)
+ memcpy(esc->data[1], &avpkt->data[2*hdr_size+chan_size], chan_size);
+ }
+ if (!esc->data[0]) {
+ av_log(avctx, AV_LOG_ERROR, "unexpected empty packet\n");
return AVERROR(EINVAL);
}
- delta_decode(out_data, buf, buf_size, &esc->fib_acc, esc->table);
+ /* decode next piece of data from the buffer */
+ buf_size = FFMIN(MAX_FRAME_SIZE, esc->data_size - esc->data_idx);
+ if (buf_size <= 0) {
+ *got_frame_ptr = 0;
+ return avpkt->size;
+ }
+
+ /* get output buffer */
+ esc->frame.nb_samples = buf_size * (is_compr + 1);
+ if ((ret = avctx->get_buffer(avctx, &esc->frame)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return ret;
+ }
+
+ for (ch = 0; ch < avctx->channels; ch++) {
+ if (is_compr) {
+ delta_decode(esc->frame.data[ch], &esc->data[ch][esc->data_idx],
+ buf_size, &esc->fib_acc[ch], esc->table);
+ } else {
+ raw_decode(esc->frame.data[ch], &esc->data[ch][esc->data_idx],
+ buf_size);
+ }
+ }
+
+ esc->data_idx += buf_size;
- *data_size = buf_size * 2;
+ *got_frame_ptr = 1;
+ *(AVFrame *)data = esc->frame;
- return consumed;
+ return avpkt->size;
}
/** initialize 8svx decoder */
{
EightSvxContext *esc = avctx->priv_data;
+ if (avctx->channels < 1 || avctx->channels > 2) {
+ av_log(avctx, AV_LOG_ERROR, "8SVX does not support more than 2 channels\n");
+ return AVERROR(EINVAL);
+ }
+
switch(avctx->codec->id) {
- case CODEC_ID_8SVX_FIB:
+ case AV_CODEC_ID_8SVX_FIB:
esc->table = fibonacci;
break;
- case CODEC_ID_8SVX_EXP:
+ case AV_CODEC_ID_8SVX_EXP:
esc->table = exponential;
break;
+ case AV_CODEC_ID_PCM_S8_PLANAR:
+ break;
default:
return -1;
}
- avctx->sample_fmt = AV_SAMPLE_FMT_U8;
+ avctx->sample_fmt = AV_SAMPLE_FMT_U8P;
+
+ avcodec_get_frame_defaults(&esc->frame);
+ avctx->coded_frame = &esc->frame;
+
+ return 0;
+}
+
+static av_cold int eightsvx_decode_close(AVCodecContext *avctx)
+{
+ EightSvxContext *esc = avctx->priv_data;
+
+ av_freep(&esc->data[0]);
+ av_freep(&esc->data[1]);
+
return 0;
}
AVCodec ff_eightsvx_fib_decoder = {
.name = "8svx_fib",
.type = AVMEDIA_TYPE_AUDIO,
- .id = CODEC_ID_8SVX_FIB,
+ .id = AV_CODEC_ID_8SVX_FIB,
.priv_data_size = sizeof (EightSvxContext),
.init = eightsvx_decode_init,
+ .close = eightsvx_decode_close,
.decode = eightsvx_decode_frame,
+ .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("8SVX fibonacci"),
+ .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P,
+ AV_SAMPLE_FMT_NONE },
};
AVCodec ff_eightsvx_exp_decoder = {
.name = "8svx_exp",
.type = AVMEDIA_TYPE_AUDIO,
- .id = CODEC_ID_8SVX_EXP,
+ .id = AV_CODEC_ID_8SVX_EXP,
.priv_data_size = sizeof (EightSvxContext),
.init = eightsvx_decode_init,
+ .close = eightsvx_decode_close,
.decode = eightsvx_decode_frame,
+ .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("8SVX exponential"),
+ .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P,
+ AV_SAMPLE_FMT_NONE },
+};
+
+AVCodec ff_pcm_s8_planar_decoder = {
+ .name = "pcm_s8_planar",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = AV_CODEC_ID_PCM_S8_PLANAR,
+ .priv_data_size = sizeof(EightSvxContext),
+ .init = eightsvx_decode_init,
+ .close = eightsvx_decode_close,
+ .decode = eightsvx_decode_frame,
+ .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("PCM signed 8-bit planar"),
+ .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_U8P,
+ AV_SAMPLE_FMT_NONE },
};
projects / ffmpeg / blobdiff