* Will contain at ith position the number of consecutive pixels equal to the previous
* frame starting from pixel i */
uint8_t* skip_table;
+
+ /** Encoded frame is a key frame */
+ int key_frame;
} 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);
+ s->avctx->height*2 /* skip code+rle end */
+ s->logical_width/MAX_RLE_BULK + 1 /* rle codes */;
- avctx->coded_frame = av_frame_alloc();
- if (!avctx->coded_frame) {
- qtrle_encode_end(avctx);
- return AVERROR(ENOMEM);
- }
-
return 0;
}
}
}
- if (!s->avctx->coded_frame->key_frame && !memcmp(this_line, prev_line, s->pixel_size))
+ if (!s->key_frame && !memcmp(this_line, prev_line, s->pixel_size))
skipcount = FFMIN(skipcount + 1, MAX_RLE_SKIP);
else
skipcount = 0;
int end_line = s->avctx->height;
uint8_t *orig_buf = buf;
- if (!s->avctx->coded_frame->key_frame) {
+ if (!s->key_frame) {
unsigned line_size = s->logical_width * s->pixel_size;
for (start_line = 0; start_line < s->avctx->height; start_line++)
if (memcmp(p->data[0] + start_line*p->linesize[0],
const AVFrame *pict, int *got_packet)
{
QtrleEncContext * const s = avctx->priv_data;
- AVFrame * const p = avctx->coded_frame;
+ enum AVPictureType pict_type;
int ret;
if ((ret = ff_alloc_packet2(avctx, pkt, s->max_buf_size)) < 0)
if (avctx->gop_size == 0 || (s->avctx->frame_number % avctx->gop_size) == 0) {
/* I-Frame */
- p->pict_type = AV_PICTURE_TYPE_I;
- p->key_frame = 1;
+ pict_type = AV_PICTURE_TYPE_I;
+ s->key_frame = 1;
} else {
/* P-Frame */
- p->pict_type = AV_PICTURE_TYPE_P;
- p->key_frame = 0;
+ pict_type = AV_PICTURE_TYPE_P;
+ s->key_frame = 0;
}
pkt->size = encode_frame(s, pict, pkt->data);
av_picture_copy(&s->previous_frame, (const AVPicture *)pict,
avctx->pix_fmt, avctx->width, avctx->height);
- if (p->key_frame)
+#if FF_API_CODED_FRAME
+FF_DISABLE_DEPRECATION_WARNINGS
+ avctx->coded_frame->key_frame = s->key_frame;
+ avctx->coded_frame->pict_type = pict_type;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
+ if (s->key_frame)
pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;