X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fg726.c;h=62aeb797e8337dd5c3fef8ba3d20358b8be54c8d;hb=f26f71139faf3dfd23d0b7738178f233fe64247d;hp=f14958a55da705e51b0cff0258b8cfd9b88eb734;hpb=97f5dd1d84d2352450093a696869433b6c85db9a;p=ffmpeg diff --git a/libavcodec/g726.c b/libavcodec/g726.c index f14958a55da..62aeb797e83 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -22,7 +22,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include + #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "avcodec.h" #include "internal.h" @@ -32,7 +34,7 @@ /** * G.726 11bit float. * G.726 Standard uses rather odd 11bit floating point arithmentic for - * numerous occasions. It's a mistery to me why they did it this way + * numerous occasions. It's a mystery to me why they did it this way * instead of simply using 32bit integer arithmetic. */ typedef struct Float11 { @@ -329,11 +331,6 @@ static av_cold int g726_encode_init(AVCodecContext *avctx) g726_reset(c); - avctx->coded_frame = avcodec_alloc_frame(); - if (!avctx->coded_frame) - return AVERROR(ENOMEM); - avctx->coded_frame->key_frame = 1; - /* select a frame size that will end on a byte boundary and have a size of approximately 1024 bytes */ avctx->frame_size = ((int[]){ 4096, 2736, 2048, 1640 })[c->code_size - 2]; @@ -341,34 +338,35 @@ static av_cold int g726_encode_init(AVCodecContext *avctx) return 0; } -static av_cold int g726_encode_close(AVCodecContext *avctx) -{ - av_freep(&avctx->coded_frame); - return 0; -} - -static int g726_encode_frame(AVCodecContext *avctx, - uint8_t *dst, int buf_size, void *data) +static int g726_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, + const AVFrame *frame, int *got_packet_ptr) { G726Context *c = avctx->priv_data; - const int16_t *samples = data; + const int16_t *samples = (const int16_t *)frame->data[0]; PutBitContext pb; - int i; + int i, ret, out_size; - init_put_bits(&pb, dst, 1024*1024); + out_size = (frame->nb_samples * c->code_size + 7) / 8; + if ((ret = ff_alloc_packet(avpkt, out_size))) { + av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n"); + return ret; + } + init_put_bits(&pb, avpkt->data, avpkt->size); - for (i = 0; i < avctx->frame_size; i++) + for (i = 0; i < frame->nb_samples; i++) put_bits(&pb, c->code_size, g726_encode(c, *samples++)); flush_put_bits(&pb); - return put_bits_count(&pb)>>3; + avpkt->size = out_size; + *got_packet_ptr = 1; + return 0; } #define OFFSET(x) offsetof(G726Context, x) #define AE AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { - { "code_size", "Bits per code", OFFSET(code_size), AV_OPT_TYPE_INT, { 4 }, 2, 5, AE }, + { "code_size", "Bits per code", OFFSET(code_size), AV_OPT_TYPE_INT, { .i64 = 4 }, 2, 5, AE }, { NULL }, }; @@ -386,15 +384,15 @@ static const AVCodecDefault defaults[] = { AVCodec ff_adpcm_g726_encoder = { .name = "g726", + .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), .type = AVMEDIA_TYPE_AUDIO, - .id = CODEC_ID_ADPCM_G726, + .id = AV_CODEC_ID_ADPCM_G726, .priv_data_size = sizeof(G726Context), .init = g726_encode_init, - .encode = g726_encode_frame, - .close = g726_encode_close, - .capabilities = CODEC_CAP_SMALL_LAST_FRAME, - .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE}, - .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), + .encode2 = g726_encode_frame, + .capabilities = CODEC_CAP_SMALL_LAST_FRAME, + .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_NONE }, .priv_class = &class, .defaults = defaults, }; @@ -405,18 +403,8 @@ static av_cold int g726_decode_init(AVCodecContext *avctx) { G726Context* c = avctx->priv_data; - if (avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT && - avctx->sample_rate != 8000) { - av_log(avctx, AV_LOG_ERROR, "Only 8kHz sample rate is allowed when " - "the compliance level is strict. Reduce the compliance level " - "if you wish to decode the stream anyway.\n"); - return AVERROR(EINVAL); - } - - if(avctx->channels != 1){ - av_log(avctx, AV_LOG_ERROR, "Only mono is supported\n"); - return AVERROR(EINVAL); - } + avctx->channels = 1; + avctx->channel_layout = AV_CH_LAYOUT_MONO; c->code_size = avctx->bits_per_coded_sample; if (c->code_size < 2 || c->code_size > 5) { @@ -430,23 +418,26 @@ static av_cold int g726_decode_init(AVCodecContext *avctx) return 0; } -static int g726_decode_frame(AVCodecContext *avctx, - void *data, int *data_size, - AVPacket *avpkt) +static int g726_decode_frame(AVCodecContext *avctx, void *data, + int *got_frame_ptr, AVPacket *avpkt) { + AVFrame *frame = data; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; G726Context *c = avctx->priv_data; - int16_t *samples = data; + int16_t *samples; GetBitContext gb; - int out_samples, out_size; + int out_samples, ret; out_samples = buf_size * 8 / c->code_size; - out_size = out_samples * av_get_bytes_per_sample(avctx->sample_fmt); - if (*data_size < out_size) { - av_log(avctx, AV_LOG_ERROR, "Output buffer is too small\n"); - return AVERROR(EINVAL); + + /* get output buffer */ + frame->nb_samples = out_samples; + 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]; init_get_bits(&gb, buf, buf_size * 8); @@ -456,17 +447,26 @@ static int g726_decode_frame(AVCodecContext *avctx, if (get_bits_left(&gb) > 0) av_log(avctx, AV_LOG_ERROR, "Frame invalidly split, missing parser?\n"); - *data_size = out_size; + *got_frame_ptr = 1; + return buf_size; } +static void g726_decode_flush(AVCodecContext *avctx) +{ + G726Context *c = avctx->priv_data; + g726_reset(c); +} + AVCodec ff_adpcm_g726_decoder = { .name = "g726", + .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), .type = AVMEDIA_TYPE_AUDIO, - .id = CODEC_ID_ADPCM_G726, + .id = AV_CODEC_ID_ADPCM_G726, .priv_data_size = sizeof(G726Context), .init = g726_decode_init, .decode = g726_decode_frame, - .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM"), + .flush = g726_decode_flush, + .capabilities = CODEC_CAP_DR1, }; #endif