| @@ -57,6 +57,9 @@ typedef struct QtrleEncContext { | |||
| * 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) | |||
| @@ -159,7 +162,7 @@ static void qtrle_encode_line(QtrleEncContext *s, const AVFrame *p, int line, ui | |||
| for (i = width - 1; i >= 0; i--) { | |||
| 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; | |||
| @@ -263,7 +266,7 @@ static int encode_frame(QtrleEncContext *s, const AVFrame *p, uint8_t *buf) | |||
| 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->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], | |||
| @@ -301,7 +304,7 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt, | |||
| 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_packet(pkt, s->max_buf_size)) < 0) { | |||
| @@ -312,12 +315,12 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt, | |||
| 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); | |||
| @@ -326,7 +329,10 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt, | |||
| av_picture_copy(&s->previous_frame, (const AVPicture *)pict, | |||
| avctx->pix_fmt, avctx->width, avctx->height); | |||
| if (p->key_frame) | |||
| avctx->coded_frame->key_frame = s->key_frame; | |||
| avctx->coded_frame->pict_type = pict_type; | |||
| if (s->key_frame) | |||
| pkt->flags |= AV_PKT_FLAG_KEY; | |||
| *got_packet = 1; | |||