* GSM decoder
*/
+#include "libavutil/channel_layout.h"
#include "avcodec.h"
#include "get_bits.h"
+#include "internal.h"
#include "msgsmdec.h"
#include "gsmdec_template.c"
static av_cold int gsm_init(AVCodecContext *avctx)
{
- GSMContext *s = avctx->priv_data;
-
- avctx->channels = 1;
- if (!avctx->sample_rate)
- avctx->sample_rate = 8000;
- 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;
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:
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 int gsm_decode_frame(AVCodecContext *avctx, void *data,
int *got_frame_ptr, AVPacket *avpkt)
{
- GSMContext *s = avctx->priv_data;
+ AVFrame *frame = data;
int res;
GetBitContext gb;
const uint8_t *buf = avpkt->data;
}
/* get output buffer */
- s->frame.nb_samples = avctx->frame_size;
- if ((res = avctx->get_buffer(avctx, &s->frame)) < 0) {
+ frame->nb_samples = avctx->frame_size;
+ if ((res = ff_get_buffer(avctx, frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return res;
}
- samples = (int16_t *)s->frame.data[0];
+ samples = (int16_t *)frame->data[0];
switch (avctx->codec_id) {
- case CODEC_ID_GSM:
+ case AV_CODEC_ID_GSM:
init_get_bits(&gb, buf, buf_size * 8);
if (get_bits(&gb, 4) != 0xd)
av_log(avctx, AV_LOG_WARNING, "Missing GSM magic!\n");
if (res < 0)
return res;
break;
- case CODEC_ID_GSM_MS:
+ case AV_CODEC_ID_GSM_MS:
res = ff_msgsm_decode_block(avctx, samples, buf);
if (res < 0)
return res;
}
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ *got_frame_ptr = 1;
return avctx->block_align;
}
AVCodec ff_gsm_decoder = {
.name = "gsm",
.type = AVMEDIA_TYPE_AUDIO,
- .id = CODEC_ID_GSM,
+ .id = AV_CODEC_ID_GSM,
.priv_data_size = sizeof(GSMContext),
.init = gsm_init,
.decode = gsm_decode_frame,
AVCodec ff_gsm_ms_decoder = {
.name = "gsm_ms",
.type = AVMEDIA_TYPE_AUDIO,
- .id = CODEC_ID_GSM_MS,
+ .id = AV_CODEC_ID_GSM_MS,
.priv_data_size = sizeof(GSMContext),
.init = gsm_init,
.decode = gsm_decode_frame,