typedef struct QtrleEncContext {
AVCodecContext *avctx;
- AVFrame frame;
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
* 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(&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)
{
QtrleEncContext *s = avctx->priv_data;
s->avctx=avctx;
switch (avctx->pix_fmt) {
- case PIX_FMT_RGB555BE:
+ case AV_PIX_FMT_RGB555BE:
s->pixel_size = 2;
break;
- case PIX_FMT_RGB24:
+ case AV_PIX_FMT_RGB24:
s->pixel_size = 3;
break;
- case PIX_FMT_ARGB:
+ case AV_PIX_FMT_ARGB:
s->pixel_size = 4;
break;
default:
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;
}
+ 15 /* header + footer */
+ s->avctx->height*2 /* skip code+rle end */
+ s->avctx->width/MAX_RLE_BULK + 1 /* rle codes */;
- avctx->coded_frame = &s->frame;
+
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;
for (i = width - 1; i >= 0; i--) {
- if (!s->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;
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 */
int end_line = s->avctx->height;
uint8_t *orig_buf = buf;
- if (!s->frame.key_frame) {
+ if (!s->key_frame) {
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;
- AVFrame * const p = &s->frame;
+#if FF_API_CODED_FRAME
+ enum AVPictureType pict_type;
+#endif
int ret;
- *p = *pict;
-
if ((ret = ff_alloc_packet(pkt, s->max_buf_size)) < 0) {
/* Upper bound check for compressed data */
av_log(avctx, AV_LOG_ERROR, "Error getting output packet of size %d.\n", s->max_buf_size);
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;
+#if FF_API_CODED_FRAME
+ pict_type = AV_PICTURE_TYPE_I;
+#endif
+ s->key_frame = 1;
} else {
/* P-Frame */
- p->pict_type = AV_PICTURE_TYPE_P;
- p->key_frame = 0;
+#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, (AVPicture *)p, 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 (p->key_frame)
+ if (s->key_frame)
pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
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 = {
.name = "qtrle",
+ .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"),
.type = AVMEDIA_TYPE_VIDEO,
- .id = CODEC_ID_QTRLE,
+ .id = AV_CODEC_ID_QTRLE,
.priv_data_size = sizeof(QtrleEncContext),
.init = qtrle_encode_init,
.encode2 = qtrle_encode_frame,
.close = qtrle_encode_end,
- .pix_fmts = (const enum PixelFormat[]){
- PIX_FMT_RGB24, PIX_FMT_RGB555BE, PIX_FMT_ARGB, PIX_FMT_NONE
+ .pix_fmts = (const enum AVPixelFormat[]){
+ AV_PIX_FMT_RGB24, AV_PIX_FMT_RGB555BE, AV_PIX_FMT_ARGB, AV_PIX_FMT_NONE
},
- .long_name = NULL_IF_CONFIG_SMALL("QuickTime Animation (RLE) video"),
};
projects / ffmpeg / blobdiff