RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libvo_amrwbenc: use AVCodec.encode2()

This commit is contained in:
Justin Ruggles 2012-02-23 17:22:42 -05:00
parent db440fa12d
commit 57a52f258e
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libavcodec/libvo-amrwbenc.c
View File

@ -21,9 +21,12 @@
#include <vo-amrwbenc/enc_if.h>
#include "avcodec.h"
#include "libavutil/avstring.h"
#include "libavutil/opt.h"
#include "avcodec.h"
#include "internal.h"
#define MAX_PACKET_SIZE (1 + (477 + 7) / 8)
typedef struct AMRWBContext {
AVClass *av_class;
@ -86,9 +89,12 @@ static av_cold int amr_wb_encode_init(AVCodecContext *avctx)
s->last_bitrate = avctx->bit_rate;
avctx->frame_size = 320;
avctx->delay = 80;
#if FF_API_OLD_ENCODE_AUDIO
avctx->coded_frame = avcodec_alloc_frame();
if (!avctx->coded_frame)
return AVERROR(ENOMEM);
#endif
s->state = E_IF_init();
@ -104,19 +110,34 @@ static int amr_wb_encode_close(AVCodecContext *avctx)
return 0;
}
static int amr_wb_encode_frame(AVCodecContext *avctx,
unsigned char *frame/*out*/,
int buf_size, void *data/*in*/)
static int amr_wb_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
const AVFrame *frame, int *got_packet_ptr)
{
AMRWBContext *s = avctx->priv_data;
int size;
const int16_t *samples = (const int16_t *)frame->data[0];
int size, ret;
if ((ret = ff_alloc_packet(avpkt, MAX_PACKET_SIZE))) {
av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n");
return ret;
}
if (s->last_bitrate != avctx->bit_rate) {
s->mode = get_wb_bitrate_mode(avctx->bit_rate, avctx);
s->last_bitrate = avctx->bit_rate;
}
size = E_IF_encode(s->state, s->mode, data, frame, s->allow_dtx);
return size;
size = E_IF_encode(s->state, s->mode, samples, avpkt->data, s->allow_dtx);
if (size <= 0 || size > MAX_PACKET_SIZE) {
av_log(avctx, AV_LOG_ERROR, "Error encoding frame\n");
return AVERROR(EINVAL);
}
if (frame->pts != AV_NOPTS_VALUE)
avpkt->pts = frame->pts - ff_samples_to_time_base(avctx, avctx->delay);
avpkt->size = size;
*got_packet_ptr = 1;
return 0;
}
AVCodec ff_libvo_amrwbenc_encoder = {
@ -125,7 +146,7 @@ AVCodec ff_libvo_amrwbenc_encoder = {
.id = CODEC_ID_AMR_WB,
.priv_data_size = sizeof(AMRWBContext),
.init = amr_wb_encode_init,
.encode = amr_wb_encode_frame,
.encode2 = amr_wb_encode_frame,
.close = amr_wb_encode_close,
.sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("Android VisualOn Adaptive Multi-Rate "