diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-02-12 09:32:40 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-02-20 07:50:44 +0100 |
| commit | 1ea575504654331aae7d6d87edfcf4caa98822d6 (patch) | |
| tree | 3522bdfab0ebf8ae7f6b3285ec577962e6c677ab /libavcodec/pnmenc.c | |
| parent | bc9c70e5a33b988a2cb2e42777dc976dafd6e849 (diff) | |
| download | ffmpeg-1ea575504654331aae7d6d87edfcf4caa98822d6.tar.gz | |
pnmenc: switch to encode2().
Diffstat (limited to 'libavcodec/pnmenc.c')
| -rw-r--r-- | libavcodec/pnmenc.c | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index a27a278d47..40621c852e 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -21,21 +21,23 @@ #include "avcodec.h" #include "bytestream.h" +#include "internal.h" #include "pnm.h" -static int pnm_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, - int buf_size, void *data) +static int pnm_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, h1, c, n, linesize; + int i, h, h1, c, n, linesize, ret; uint8_t *ptr, *ptr1, *ptr2; - 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; @@ -43,8 +45,8 @@ static int pnm_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; h1 = h; @@ -108,7 +110,11 @@ static int pnm_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, ptr2 += p->linesize[2]; } } - return s->bytestream - s->bytestream_start; + pkt->size = s->bytestream - s->bytestream_start; + pkt->flags |= AV_PKT_FLAG_KEY; + *got_packet = 1; + + return 0; } @@ -119,7 +125,7 @@ AVCodec ff_pgm_encoder = { .id = CODEC_ID_PGM, .priv_data_size = sizeof(PNMContext), .init = ff_pnm_init, - .encode = pnm_encode_frame, + .encode2 = pnm_encode_frame, .pix_fmts = (const enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), }; @@ -132,7 +138,7 @@ AVCodec ff_pgmyuv_encoder = { .id = CODEC_ID_PGMYUV, .priv_data_size = sizeof(PNMContext), .init = ff_pnm_init, - .encode = pnm_encode_frame, + .encode2 = pnm_encode_frame, .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), }; @@ -145,7 +151,7 @@ AVCodec ff_ppm_encoder = { .id = CODEC_ID_PPM, .priv_data_size = sizeof(PNMContext), .init = ff_pnm_init, - .encode = pnm_encode_frame, + .encode2 = pnm_encode_frame, .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB48BE, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), }; @@ -158,7 +164,7 @@ AVCodec ff_pbm_encoder = { .id = CODEC_ID_PBM, .priv_data_size = sizeof(PNMContext), .init = ff_pnm_init, - .encode = pnm_encode_frame, + .encode2 = pnm_encode_frame, .pix_fmts = (const enum PixelFormat[]){PIX_FMT_MONOWHITE, PIX_FMT_NONE}, .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), }; |