[SCM] libav/experimental: libgsm: Split decoder and encoder
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:03:54 UTC 2014
The following commit has been merged in the experimental branch:
commit b4edbe9a0eb48423fbf249b0ca7fb62838bdb7f5
Author: Nidhi Makhijani <nidhimj22 at gmail.com>
Date: Tue Jul 8 09:03:35 2014 +0530
libgsm: Split decoder and encoder
Signed-off-by: Diego Biurrun <diego at biurrun.de>
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 7da6b7e..75837b2 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -597,10 +597,10 @@ OBJS-$(CONFIG_WTV_DEMUXER) += mpeg4audio.o mpegaudiodata.o
OBJS-$(CONFIG_LIBFAAC_ENCODER) += libfaac.o
OBJS-$(CONFIG_LIBFDK_AAC_DECODER) += libfdk-aacdec.o
OBJS-$(CONFIG_LIBFDK_AAC_ENCODER) += libfdk-aacenc.o
-OBJS-$(CONFIG_LIBGSM_DECODER) += libgsm.o
-OBJS-$(CONFIG_LIBGSM_ENCODER) += libgsm.o
-OBJS-$(CONFIG_LIBGSM_MS_DECODER) += libgsm.o
-OBJS-$(CONFIG_LIBGSM_MS_ENCODER) += libgsm.o
+OBJS-$(CONFIG_LIBGSM_DECODER) += libgsmdec.o
+OBJS-$(CONFIG_LIBGSM_ENCODER) += libgsmenc.o
+OBJS-$(CONFIG_LIBGSM_MS_DECODER) += libgsmdec.o
+OBJS-$(CONFIG_LIBGSM_MS_ENCODER) += libgsmenc.o
OBJS-$(CONFIG_LIBILBC_DECODER) += libilbc.o
OBJS-$(CONFIG_LIBILBC_ENCODER) += libilbc.o
OBJS-$(CONFIG_LIBMP3LAME_ENCODER) += libmp3lame.o mpegaudiodecheader.o
diff --git a/libavcodec/libgsm.c b/libavcodec/libgsmdec.c
similarity index 56%
copy from libavcodec/libgsm.c
copy to libavcodec/libgsmdec.c
index dfab005..da95cc7 100644
--- a/libavcodec/libgsm.c
+++ b/libavcodec/libgsmdec.c
@@ -1,5 +1,5 @@
/*
- * Interface to libgsm for gsm encoding/decoding
+ * Interface to libgsm for GSM decoding
* Copyright (c) 2005 Alban Bedel <albeu at free.fr>
* Copyright (c) 2006, 2007 Michel Bardiaux <mbardiaux at mediaxim.be>
*
@@ -22,7 +22,7 @@
/**
* @file
- * Interface to libgsm for gsm encoding/decoding
+ * Interface to libgsm for GSM decoding
*/
// The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
@@ -36,106 +36,11 @@
#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) {
- av_log(avctx, AV_LOG_ERROR, "Mono required for GSM, got %d channels\n",
- avctx->channels);
- return -1;
- }
-
- if (avctx->sample_rate != 8000) {
- av_log(avctx, AV_LOG_ERROR, "Sample rate 8000Hz required for GSM, got %dHz\n",
- avctx->sample_rate);
- if (avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL)
- return -1;
- }
- if (avctx->bit_rate != 13000 /* Official */ &&
- avctx->bit_rate != 13200 /* Very common */ &&
- avctx->bit_rate != 0 /* Unknown; a.o. mov does not set bitrate when decoding */ ) {
- av_log(avctx, AV_LOG_ERROR, "Bitrate 13000bps required for GSM, got %dbps\n",
- avctx->bit_rate);
- if (avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL)
- return -1;
- }
-
- avctx->priv_data = gsm_create();
-
- switch(avctx->codec_id) {
- case AV_CODEC_ID_GSM:
- avctx->frame_size = GSM_FRAME_SIZE;
- avctx->block_align = GSM_BLOCK_SIZE;
- break;
- 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;
- avctx->block_align = GSM_MS_BLOCK_SIZE;
- }
- }
-
- return 0;
-}
-
-static av_cold int libgsm_encode_close(AVCodecContext *avctx) {
- gsm_destroy(avctx->priv_data);
- avctx->priv_data = NULL;
- 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 AV_CODEC_ID_GSM:
- gsm_encode(state, samples, avpkt->data);
- break;
- case AV_CODEC_ID_GSM_MS:
- gsm_encode(state, samples, avpkt->data);
- gsm_encode(state, samples + GSM_FRAME_SIZE, avpkt->data + 32);
- }
-
- *got_packet_ptr = 1;
- return 0;
-}
-
-
-AVCodec ff_libgsm_encoder = {
- .name = "libgsm",
- .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
- .type = AVMEDIA_TYPE_AUDIO,
- .id = AV_CODEC_ID_GSM,
- .init = libgsm_encode_init,
- .encode2 = libgsm_encode_frame,
- .close = libgsm_encode_close,
- .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
- AV_SAMPLE_FMT_NONE },
-};
-
-AVCodec ff_libgsm_ms_encoder = {
- .name = "libgsm_ms",
- .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
- .type = AVMEDIA_TYPE_AUDIO,
- .id = AV_CODEC_ID_GSM_MS,
- .init = libgsm_encode_init,
- .encode2 = libgsm_encode_frame,
- .close = libgsm_encode_close,
- .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
- AV_SAMPLE_FMT_NONE },
-};
-
typedef struct LibGSMDecodeContext {
struct gsm_state *state;
} LibGSMDecodeContext;
diff --git a/libavcodec/libgsm.c b/libavcodec/libgsmenc.c
similarity index 57%
rename from libavcodec/libgsm.c
rename to libavcodec/libgsmenc.c
index dfab005..8f51321 100644
--- a/libavcodec/libgsm.c
+++ b/libavcodec/libgsmenc.c
@@ -1,5 +1,5 @@
/*
- * Interface to libgsm for gsm encoding/decoding
+ * Interface to libgsm for GSM encoding
* Copyright (c) 2005 Alban Bedel <albeu at free.fr>
* Copyright (c) 2006, 2007 Michel Bardiaux <mbardiaux at mediaxim.be>
*
@@ -22,7 +22,7 @@
/**
* @file
- * Interface to libgsm for gsm encoding/decoding
+ * Interface to libgsm for GSM encoding
*/
// The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
@@ -34,8 +34,8 @@
#include <gsm/gsm.h>
#endif
-#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
+
#include "avcodec.h"
#include "internal.h"
#include "gsm.h"
@@ -135,112 +135,3 @@ AVCodec ff_libgsm_ms_encoder = {
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE },
};
-
-typedef struct LibGSMDecodeContext {
- struct gsm_state *state;
-} LibGSMDecodeContext;
-
-static av_cold int libgsm_decode_init(AVCodecContext *avctx) {
- LibGSMDecodeContext *s = avctx->priv_data;
-
- avctx->channels = 1;
- avctx->channel_layout = AV_CH_LAYOUT_MONO;
- avctx->sample_rate = 8000;
- avctx->sample_fmt = AV_SAMPLE_FMT_S16;
-
- s->state = gsm_create();
-
- switch(avctx->codec_id) {
- case AV_CODEC_ID_GSM:
- avctx->frame_size = GSM_FRAME_SIZE;
- avctx->block_align = GSM_BLOCK_SIZE;
- break;
- case AV_CODEC_ID_GSM_MS: {
- int one = 1;
- gsm_option(s->state, GSM_OPT_WAV49, &one);
- avctx->frame_size = 2 * GSM_FRAME_SIZE;
- avctx->block_align = GSM_MS_BLOCK_SIZE;
- }
- }
-
- return 0;
-}
-
-static av_cold int libgsm_decode_close(AVCodecContext *avctx) {
- LibGSMDecodeContext *s = avctx->priv_data;
-
- gsm_destroy(s->state);
- s->state = NULL;
- return 0;
-}
-
-static int libgsm_decode_frame(AVCodecContext *avctx, void *data,
- int *got_frame_ptr, AVPacket *avpkt)
-{
- int i, ret;
- LibGSMDecodeContext *s = avctx->priv_data;
- AVFrame *frame = data;
- uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
- 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 */
- frame->nb_samples = avctx->frame_size;
- if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
- av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return ret;
- }
- samples = (int16_t *)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;
-
- 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",
- .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
- .type = AVMEDIA_TYPE_AUDIO,
- .id = AV_CODEC_ID_GSM,
- .priv_data_size = sizeof(LibGSMDecodeContext),
- .init = libgsm_decode_init,
- .close = libgsm_decode_close,
- .decode = libgsm_decode_frame,
- .flush = libgsm_flush,
- .capabilities = CODEC_CAP_DR1,
-};
-
-AVCodec ff_libgsm_ms_decoder = {
- .name = "libgsm_ms",
- .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
- .type = AVMEDIA_TYPE_AUDIO,
- .id = AV_CODEC_ID_GSM_MS,
- .priv_data_size = sizeof(LibGSMDecodeContext),
- .init = libgsm_decode_init,
- .close = libgsm_decode_close,
- .decode = libgsm_decode_frame,
- .flush = libgsm_flush,
- .capabilities = CODEC_CAP_DR1,
-};
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list