typedef struct QtrleEncContext {
AVCodecContext *avctx;
int pixel_size;
- AVPicture previous_frame;
+ AVFrame *previous_frame;
unsigned int max_buf_size;
/**
* This array will contain at ith position the value of the best RLE code
{
QtrleEncContext *s = avctx->priv_data;
- av_frame_free(&avctx->coded_frame);
-
- avpicture_free(&s->previous_frame);
+ av_frame_free(&s->previous_frame);
av_free(s->rlecode_table);
av_free(s->length_table);
av_free(s->skip_table);
av_log(avctx, AV_LOG_ERROR, "Error allocating memory.\n");
return -1;
}
- if (avpicture_alloc(&s->previous_frame, avctx->pix_fmt, avctx->width, avctx->height) < 0) {
+ s->previous_frame = av_frame_alloc();
+ if (!s->previous_frame) {
av_log(avctx, AV_LOG_ERROR, "Error allocating picture\n");
return -1;
}
+ s->avctx->height*2 /* skip code+rle end */
+ s->avctx->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;
}
/* We will use it to compute the best bulk copy sequence */
unsigned int bulkcount;
- /* This will be the number of pixels equal to the preivous frame one's
+ /* This will be the number of pixels equal to the previous frame one's
* starting from the ith pixel */
unsigned int skipcount;
/* This will be the number of consecutive equal pixels in the current
uint8_t *this_line = p-> data[0] + line*p-> linesize[0] +
(width - 1)*s->pixel_size;
- uint8_t *prev_line = s->previous_frame.data[0] + line*s->previous_frame.linesize[0] +
+ uint8_t *prev_line = s->previous_frame->data[0] + line * s->previous_frame->linesize[0] +
(width - 1)*s->pixel_size;
s->length_table[width] = 0;
prev_line -= s->pixel_size;
}
- /* Good ! Now we have the best sequence for this line, let's ouput it */
+ /* Good! Now we have the best sequence for this line, let's output it. */
/* We do a special case for the first pixel so that we avoid testing it in
* the whole loop */
unsigned line_size = s->avctx->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],
- s->previous_frame.data[0] + start_line*s->previous_frame.linesize[0],
+ s->previous_frame->data[0] + start_line * s->previous_frame->linesize[0],
line_size))
break;
for (end_line=s->avctx->height; end_line > start_line; end_line--)
if (memcmp(p->data[0] + (end_line - 1)*p->linesize[0],
- s->previous_frame.data[0] + (end_line - 1)*s->previous_frame.linesize[0],
+ s->previous_frame->data[0] + (end_line - 1) * s->previous_frame->linesize[0],
line_size))
break;
}
const AVFrame *pict, int *got_packet)
{
QtrleEncContext * const s = avctx->priv_data;
+#if FF_API_CODED_FRAME
enum AVPictureType pict_type;
+#endif
int ret;
if ((ret = ff_alloc_packet(pkt, s->max_buf_size)) < 0) {
if (avctx->gop_size == 0 || (s->avctx->frame_number % avctx->gop_size) == 0) {
/* I-Frame */
+#if FF_API_CODED_FRAME
pict_type = AV_PICTURE_TYPE_I;
+#endif
s->key_frame = 1;
} else {
/* P-Frame */
+#if FF_API_CODED_FRAME
pict_type = AV_PICTURE_TYPE_P;
+#endif
s->key_frame = 0;
}
pkt->size = encode_frame(s, pict, pkt->data);
/* save the current frame */
- av_picture_copy(&s->previous_frame, (const AVPicture *)pict,
- avctx->pix_fmt, avctx->width, avctx->height);
+ av_frame_unref(s->previous_frame);
+ ret = av_frame_ref(s->previous_frame, pict);
+ if (ret < 0) {
+ av_log(avctx, AV_LOG_ERROR, "cannot add reference\n");
+ return ret;
+ }
+#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;