har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pcxenc: use the AVFrame API properly.

Browse Source
This commit is contained in:
Anton Khirnov 2013-11-09 10:14:46 +01:00
parent 7ca97aa7ee
commit 863a670e48
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libavcodec/pcxenc.c
View File

@ -30,22 +30,26 @@
#include "bytestream.h" #include "bytestream.h"
#include "internal.h" #include "internal.h"
typedef struct PCXContext {
AVFrame picture;
} PCXContext;
static const uint32_t monoblack_pal[16] = { 0x000000, 0xFFFFFF }; static const uint32_t monoblack_pal[16] = { 0x000000, 0xFFFFFF };
static av_cold int pcx_encode_init(AVCodecContext *avctx) static av_cold int pcx_encode_init(AVCodecContext *avctx)
{ {
PCXContext *s = avctx->priv_data; avctx->coded_frame = av_frame_alloc();
if (!avctx->coded_frame)
return AVERROR(ENOMEM);
avcodec_get_frame_defaults(&s->picture); avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
avctx->coded_frame = &s->picture; avctx->coded_frame->key_frame = 1;
return 0; return 0;
} }
static av_cold int pcx_encode_close(AVCodecContext *avctx)
{
av_frame_free(&avctx->coded_frame);
return 0;
}
/** /**
* PCX run-length encoder * PCX run-length encoder
* @param dst output buffer * @param dst output buffer
@ -99,8 +103,6 @@ static int pcx_rle_encode( uint8_t *dst, int dst_size,
static int pcx_encode_frame(AVCodecContext *avctx, AVPacket *pkt, static int pcx_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *frame, int *got_packet) const AVFrame *frame, int *got_packet)
{ {
PCXContext *s = avctx->priv_data;
AVFrame *const pict = &s->picture;
const uint8_t *buf_end; const uint8_t *buf_end;
uint8_t *buf; uint8_t *buf;
@ -108,10 +110,6 @@ static int pcx_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const uint32_t *pal = NULL; const uint32_t *pal = NULL;
const uint8_t *src; const uint8_t *src;
*pict = *frame;
pict->pict_type = AV_PICTURE_TYPE_I;
pict->key_frame = 1;
if (avctx->width > 65535 || avctx->height > 65535) { if (avctx->width > 65535 || avctx->height > 65535) {
av_log(avctx, AV_LOG_ERROR, "image dimensions do not fit in 16 bits\n"); av_log(avctx, AV_LOG_ERROR, "image dimensions do not fit in 16 bits\n");
return -1; return -1;
@ -130,7 +128,7 @@ static int pcx_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
case AV_PIX_FMT_PAL8: case AV_PIX_FMT_PAL8:
bpp = 8; bpp = 8;
nplanes = 1; nplanes = 1;
pal = (uint32_t *)pict->data[1]; pal = (uint32_t *)frame->data[1];
break; break;
case AV_PIX_FMT_MONOBLACK: case AV_PIX_FMT_MONOBLACK:
bpp = 1; bpp = 1;
@ -172,7 +170,7 @@ static int pcx_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
while (buf - pkt->data < 128) while (buf - pkt->data < 128)
*buf++= 0; *buf++= 0;
src = pict->data[0]; src = frame->data[0];
for (y = 0; y < avctx->height; y++) { for (y = 0; y < avctx->height; y++) {
if ((written = pcx_rle_encode(buf, buf_end - buf, if ((written = pcx_rle_encode(buf, buf_end - buf,
@ -181,7 +179,7 @@ static int pcx_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
return -1; return -1;
} }
buf += written; buf += written;
src += pict->linesize[0]; src += frame->linesize[0];
} }
if (nplanes == 1 && bpp == 8) { if (nplanes == 1 && bpp == 8) {
@ -207,8 +205,8 @@ AVCodec ff_pcx_encoder = {
.long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"), .long_name = NULL_IF_CONFIG_SMALL("PC Paintbrush PCX image"),
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_PCX, .id = AV_CODEC_ID_PCX,
.priv_data_size = sizeof(PCXContext),
.init = pcx_encode_init, .init = pcx_encode_init,
.close = pcx_encode_close,
.encode2 = pcx_encode_frame, .encode2 = pcx_encode_frame,
.pix_fmts = (const enum AVPixelFormat[]){ .pix_fmts = (const enum AVPixelFormat[]){
AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB24,