// The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
-#include "avcodec.h"
#include <gsm/gsm.h>
-// gsm.h misses some essential constants
-#define GSM_BLOCK_SIZE 33
-#define GSM_MS_BLOCK_SIZE 65
-#define GSM_FRAME_SIZE 160
+#include "libavutil/channel_layout.h"
+#include "libavutil/common.h"
+#include "avcodec.h"
+#include "internal.h"
+#include "gsm.h"
static av_cold int libgsm_encode_init(AVCodecContext *avctx) {
if (avctx->channels > 1) {
avctx->priv_data = gsm_create();
switch(avctx->codec_id) {
- case CODEC_ID_GSM:
+ case AV_CODEC_ID_GSM:
avctx->frame_size = GSM_FRAME_SIZE;
avctx->block_align = GSM_BLOCK_SIZE;
break;
- case CODEC_ID_GSM_MS: {
+ case AV_CODEC_ID_GSM_MS: {
int one = 1;
gsm_option(avctx->priv_data, GSM_OPT_WAV49, &one);
avctx->frame_size = 2*GSM_FRAME_SIZE;
}
}
+#if FF_API_OLD_ENCODE_AUDIO
avctx->coded_frame= avcodec_alloc_frame();
- avctx->coded_frame->key_frame= 1;
+ if (!avctx->coded_frame) {
+ gsm_destroy(avctx->priv_data);
+ return AVERROR(ENOMEM);
+ }
+#endif
return 0;
}
static av_cold int libgsm_encode_close(AVCodecContext *avctx) {
+#if FF_API_OLD_ENCODE_AUDIO
av_freep(&avctx->coded_frame);
+#endif
gsm_destroy(avctx->priv_data);
avctx->priv_data = NULL;
return 0;
}
-static int libgsm_encode_frame(AVCodecContext *avctx,
- unsigned char *frame, int buf_size, void *data) {
- // we need a full block
- if(buf_size < avctx->block_align) return 0;
+static int libgsm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
+ const AVFrame *frame, int *got_packet_ptr)
+{
+ int ret;
+ gsm_signal *samples = (gsm_signal *)frame->data[0];
+ struct gsm_state *state = avctx->priv_data;
+
+ if ((ret = ff_alloc_packet(avpkt, avctx->block_align))) {
+ av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n");
+ return ret;
+ }
switch(avctx->codec_id) {
- case CODEC_ID_GSM:
- gsm_encode(avctx->priv_data,data,frame);
+ case AV_CODEC_ID_GSM:
+ gsm_encode(state, samples, avpkt->data);
break;
- case CODEC_ID_GSM_MS:
- gsm_encode(avctx->priv_data,data,frame);
- gsm_encode(avctx->priv_data,((short*)data)+GSM_FRAME_SIZE,frame+32);
+ case AV_CODEC_ID_GSM_MS:
+ gsm_encode(state, samples, avpkt->data);
+ gsm_encode(state, samples + GSM_FRAME_SIZE, avpkt->data + 32);
}
- return avctx->block_align;
+
+ *got_packet_ptr = 1;
+ return 0;
}
AVCodec ff_libgsm_encoder = {
.name = "libgsm",
.type = AVMEDIA_TYPE_AUDIO,
- .id = CODEC_ID_GSM,
+ .id = AV_CODEC_ID_GSM,
.init = libgsm_encode_init,
- .encode = libgsm_encode_frame,
+ .encode2 = libgsm_encode_frame,
.close = libgsm_encode_close,
- .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
- .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
+ .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
+ AV_SAMPLE_FMT_NONE },
+ .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
};
AVCodec ff_libgsm_ms_encoder = {
.name = "libgsm_ms",
.type = AVMEDIA_TYPE_AUDIO,
- .id = CODEC_ID_GSM_MS,
+ .id = AV_CODEC_ID_GSM_MS,
.init = libgsm_encode_init,
- .encode = libgsm_encode_frame,
+ .encode2 = libgsm_encode_frame,
.close = libgsm_encode_close,
- .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
- .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
+ .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
+ AV_SAMPLE_FMT_NONE },
+ .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
};
-static av_cold int libgsm_decode_init(AVCodecContext *avctx) {
- if (avctx->channels > 1) {
- av_log(avctx, AV_LOG_ERROR, "Mono required for GSM, got %d channels\n",
- avctx->channels);
- return -1;
- }
-
- if (!avctx->channels)
- avctx->channels = 1;
+typedef struct LibGSMDecodeContext {
+ AVFrame frame;
+ struct gsm_state *state;
+} LibGSMDecodeContext;
- if (!avctx->sample_rate)
- avctx->sample_rate = 8000;
+static av_cold int libgsm_decode_init(AVCodecContext *avctx) {
+ LibGSMDecodeContext *s = avctx->priv_data;
- avctx->sample_fmt = AV_SAMPLE_FMT_S16;
+ avctx->channels = 1;
+ avctx->channel_layout = AV_CH_LAYOUT_MONO;
+ avctx->sample_rate = 8000;
+ avctx->sample_fmt = AV_SAMPLE_FMT_S16;
- avctx->priv_data = gsm_create();
+ s->state = gsm_create();
switch(avctx->codec_id) {
- case CODEC_ID_GSM:
+ case AV_CODEC_ID_GSM:
avctx->frame_size = GSM_FRAME_SIZE;
avctx->block_align = GSM_BLOCK_SIZE;
break;
- case CODEC_ID_GSM_MS: {
+ case AV_CODEC_ID_GSM_MS: {
int one = 1;
- gsm_option(avctx->priv_data, GSM_OPT_WAV49, &one);
+ gsm_option(s->state, GSM_OPT_WAV49, &one);
avctx->frame_size = 2 * GSM_FRAME_SIZE;
avctx->block_align = GSM_MS_BLOCK_SIZE;
}
}
+ avcodec_get_frame_defaults(&s->frame);
+ avctx->coded_frame = &s->frame;
+
return 0;
}
static av_cold int libgsm_decode_close(AVCodecContext *avctx) {
- gsm_destroy(avctx->priv_data);
- avctx->priv_data = NULL;
+ LibGSMDecodeContext *s = avctx->priv_data;
+
+ gsm_destroy(s->state);
+ s->state = NULL;
return 0;
}
-static int libgsm_decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
- AVPacket *avpkt) {
+static int libgsm_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame_ptr, AVPacket *avpkt)
+{
+ int i, ret;
+ LibGSMDecodeContext *s = avctx->priv_data;
uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
- *data_size = 0; /* In case of error */
- if(buf_size < avctx->block_align) return -1;
- switch(avctx->codec_id) {
- case CODEC_ID_GSM:
- if(gsm_decode(avctx->priv_data,buf,data)) return -1;
- *data_size = GSM_FRAME_SIZE*sizeof(int16_t);
- break;
- case CODEC_ID_GSM_MS:
- if(gsm_decode(avctx->priv_data,buf,data) ||
- gsm_decode(avctx->priv_data,buf+33,((int16_t*)data)+GSM_FRAME_SIZE)) return -1;
- *data_size = GSM_FRAME_SIZE*sizeof(int16_t)*2;
+ int16_t *samples;
+
+ if (buf_size < avctx->block_align) {
+ av_log(avctx, AV_LOG_ERROR, "Packet is too small\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ /* get output buffer */
+ s->frame.nb_samples = avctx->frame_size;
+ if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return ret;
}
+ samples = (int16_t *)s->frame.data[0];
+
+ for (i = 0; i < avctx->frame_size / GSM_FRAME_SIZE; i++) {
+ if ((ret = gsm_decode(s->state, buf, samples)) < 0)
+ return -1;
+ buf += GSM_BLOCK_SIZE;
+ samples += GSM_FRAME_SIZE;
+ }
+
+ *got_frame_ptr = 1;
+ *(AVFrame *)data = s->frame;
+
return avctx->block_align;
}
+static void libgsm_flush(AVCodecContext *avctx) {
+ LibGSMDecodeContext *s = avctx->priv_data;
+ int one = 1;
+
+ gsm_destroy(s->state);
+ s->state = gsm_create();
+ if (avctx->codec_id == AV_CODEC_ID_GSM_MS)
+ gsm_option(s->state, GSM_OPT_WAV49, &one);
+}
+
AVCodec ff_libgsm_decoder = {
.name = "libgsm",
.type = AVMEDIA_TYPE_AUDIO,
- .id = CODEC_ID_GSM,
+ .id = AV_CODEC_ID_GSM,
+ .priv_data_size = sizeof(LibGSMDecodeContext),
.init = libgsm_decode_init,
.close = libgsm_decode_close,
.decode = libgsm_decode_frame,
- .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
+ .flush = libgsm_flush,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
};
AVCodec ff_libgsm_ms_decoder = {
.name = "libgsm_ms",
.type = AVMEDIA_TYPE_AUDIO,
- .id = CODEC_ID_GSM_MS,
+ .id = AV_CODEC_ID_GSM_MS,
+ .priv_data_size = sizeof(LibGSMDecodeContext),
.init = libgsm_decode_init,
.close = libgsm_decode_close,
.decode = libgsm_decode_frame,
- .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
+ .flush = libgsm_flush,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
};
projects / ffmpeg / blobdiff