*/
/**
- * @file libgsm.c
+ * @file libavcodec/libgsm.c
* Interface to libgsm for gsm encoding/decoding
*/
if(!avctx->sample_rate)
avctx->sample_rate= 8000;
+
+ avctx->sample_fmt = SAMPLE_FMT_S16;
}else{
if (avctx->sample_rate != 8000) {
av_log(avctx, AV_LOG_ERROR, "Sample rate 8000Hz required for GSM, got %dHz\n",
}
static av_cold int libgsm_close(AVCodecContext *avctx) {
+ av_freep(&avctx->coded_frame);
gsm_destroy(avctx->priv_data);
avctx->priv_data = NULL;
return 0;
libgsm_init,
libgsm_encode_frame,
libgsm_close,
- .long_name = "libgsm GSM",
+ .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
+ .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
};
AVCodec libgsm_ms_encoder = {
libgsm_init,
libgsm_encode_frame,
libgsm_close,
- .long_name = "libgsm GSM Microsoft variant",
+ .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE},
+ .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
};
static int libgsm_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size) {
+ AVPacket *avpkt) {
+ const 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) {
NULL,
libgsm_close,
libgsm_decode_frame,
- .long_name = "libgsm GSM",
+ .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM"),
};
AVCodec libgsm_ms_decoder = {
NULL,
libgsm_close,
libgsm_decode_frame,
- .long_name = "libgsm GSM Microsoft variant",
+ .long_name = NULL_IF_CONFIG_SMALL("libgsm GSM Microsoft variant"),
};