highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qtrleenc: use the AVFrame API properly.

Browse Source
This commit is contained in:
Anton Khirnov 2013-11-09 10:14:46 +01:00
parent c8a525197f
commit d48c206302
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libavcodec/qtrleenc.c
View File

@ -36,7 +36,6 @@
typedef struct QtrleEncContext { typedef struct QtrleEncContext {
AVCodecContext *avctx; AVCodecContext *avctx;
AVFrame frame;
int pixel_size; int pixel_size;
AVPicture previous_frame; AVPicture previous_frame;
unsigned int max_buf_size; unsigned int max_buf_size;
@ -60,6 +59,19 @@ typedef struct QtrleEncContext {
uint8_t* skip_table; uint8_t* skip_table;
} QtrleEncContext; } QtrleEncContext;
static av_cold int qtrle_encode_end(AVCodecContext *avctx)
{
QtrleEncContext *s = avctx->priv_data;
av_frame_free(&avctx->coded_frame);
avpicture_free(&s->previous_frame);
av_free(s->rlecode_table);
av_free(s->length_table);
av_free(s->skip_table);
return 0;
}
static av_cold int qtrle_encode_init(AVCodecContext *avctx) static av_cold int qtrle_encode_init(AVCodecContext *avctx)
{ {
QtrleEncContext *s = avctx->priv_data; QtrleEncContext *s = avctx->priv_data;
@ -101,7 +113,13 @@ static av_cold int qtrle_encode_init(AVCodecContext *avctx)
+ 15 /* header + footer */ + 15 /* header + footer */
+ s->avctx->height*2 /* skip code+rle end */ + s->avctx->height*2 /* skip code+rle end */
+ s->avctx->width/MAX_RLE_BULK + 1 /* rle codes */; + s->avctx->width/MAX_RLE_BULK + 1 /* rle codes */;
avctx->coded_frame = &s->frame;
avctx->coded_frame = av_frame_alloc();
if (!avctx->coded_frame) {
qtrle_encode_end(avctx);
return AVERROR(ENOMEM);
}
return 0; return 0;
} }
@ -141,7 +159,7 @@ static void qtrle_encode_line(QtrleEncContext *s, const AVFrame *p, int line, ui
for (i = width - 1; i >= 0; i--) { for (i = width - 1; i >= 0; i--) {
if (!s->frame.key_frame && !memcmp(this_line, prev_line, s->pixel_size)) if (!s->avctx->coded_frame->key_frame && !memcmp(this_line, prev_line, s->pixel_size))
skipcount = FFMIN(skipcount + 1, MAX_RLE_SKIP); skipcount = FFMIN(skipcount + 1, MAX_RLE_SKIP);
else else
skipcount = 0; skipcount = 0;
@ -245,7 +263,7 @@ static int encode_frame(QtrleEncContext *s, const AVFrame *p, uint8_t *buf)
int end_line = s->avctx->height; int end_line = s->avctx->height;
uint8_t *orig_buf = buf; uint8_t *orig_buf = buf;
if (!s->frame.key_frame) { if (!s->avctx->coded_frame->key_frame) {
unsigned line_size = s->avctx->width * s->pixel_size; unsigned line_size = s->avctx->width * s->pixel_size;
for (start_line = 0; start_line < s->avctx->height; start_line++) for (start_line = 0; start_line < s->avctx->height; start_line++)
if (memcmp(p->data[0] + start_line*p->linesize[0], if (memcmp(p->data[0] + start_line*p->linesize[0],
@ -283,11 +301,9 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *pict, int *got_packet) const AVFrame *pict, int *got_packet)
{ {
QtrleEncContext * const s = avctx->priv_data; QtrleEncContext * const s = avctx->priv_data;
AVFrame * const p = &s->frame; AVFrame * const p = avctx->coded_frame;
int ret; int ret;
*p = *pict;
if ((ret = ff_alloc_packet(pkt, s->max_buf_size)) < 0) { if ((ret = ff_alloc_packet(pkt, s->max_buf_size)) < 0) {
/* Upper bound check for compressed data */ /* Upper bound check for compressed data */
av_log(avctx, AV_LOG_ERROR, "Error getting output packet of size %d.\n", s->max_buf_size); av_log(avctx, AV_LOG_ERROR, "Error getting output packet of size %d.\n", s->max_buf_size);
@ -307,7 +323,8 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
pkt->size = encode_frame(s, pict, pkt->data); pkt->size = encode_frame(s, pict, pkt->data);
/* save the current frame */ /* save the current frame */
av_picture_copy(&s->previous_frame, (AVPicture *)p, avctx->pix_fmt, avctx->width, avctx->height); av_picture_copy(&s->previous_frame, (const AVPicture *)pict,
avctx->pix_fmt, avctx->width, avctx->height);
if (p->key_frame) if (p->key_frame)
pkt->flags |= AV_PKT_FLAG_KEY; pkt->flags |= AV_PKT_FLAG_KEY;
@ -316,17 +333,6 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
return 0; return 0;
} }
static av_cold int qtrle_encode_end(AVCodecContext *avctx)
{
QtrleEncContext *s = avctx->priv_data;
avpicture_free(&s->previous_frame);
av_free(s->rlecode_table);
av_free(s->length_table);
av_free(s->skip_table);
return 0;
}
AVCodec ff_qtrle_encoder = { AVCodec ff_qtrle_encoder = {
.name = "qtrle", .name = "qtrle",
.long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"), .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"),