From e9b380a7a57bad9f872300ce61b5062a29c5242e Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 13 Feb 2012 12:00:38 +0100 Subject: pamenc: switch to encode2(). --- libavcodec/pamenc.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'libavcodec/pamenc.c') diff --git a/libavcodec/pamenc.c b/libavcodec/pamenc.c index e070ed4b3b..599b7e9a27 100644 --- a/libavcodec/pamenc.c +++ b/libavcodec/pamenc.c @@ -21,22 +21,24 @@ #include "avcodec.h" #include "bytestream.h" +#include "internal.h" #include "pnm.h" -static int pam_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, - int buf_size, void *data) +static int pam_encode_frame(AVCodecContext *avctx, AVPacket *pkt, + const AVFrame *pict, int *got_packet) { PNMContext *s = avctx->priv_data; - AVFrame *pict = data; AVFrame * const p = (AVFrame*)&s->picture; - int i, h, w, n, linesize, depth, maxval; + int i, h, w, n, linesize, depth, maxval, ret; const char *tuple_type; uint8_t *ptr; - if (buf_size < avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height) + 200) { + if ((ret = ff_alloc_packet(pkt, avpicture_get_size(avctx->pix_fmt, + avctx->width, + avctx->height) + 200)) < 0) { av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n"); - return -1; + return ret; } *p = *pict; @@ -44,8 +46,8 @@ static int pam_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, p->key_frame = 1; s->bytestream_start = - s->bytestream = outbuf; - s->bytestream_end = outbuf+buf_size; + s->bytestream = pkt->data; + s->bytestream_end = pkt->data + pkt->size; h = avctx->height; w = avctx->width; @@ -104,7 +106,11 @@ static int pam_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, ptr += linesize; } } - return s->bytestream - s->bytestream_start; + + pkt->size = s->bytestream - s->bytestream_start; + pkt->flags |= AV_PKT_FLAG_KEY; + *got_packet = 1; + return 0; } @@ -114,7 +120,7 @@ AVCodec ff_pam_encoder = { .id = CODEC_ID_PAM, .priv_data_size = sizeof(PNMContext), .init = ff_pnm_init, - .encode = pam_encode_frame, + .encode2 = pam_encode_frame, .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), }; -- cgit v1.2.3