aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/qtrleenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-20 22:14:29 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-20 22:14:29 +0200
commit256430cf384d34c15a9ec579fbf48708502ab5f4 (patch)
treedced8448eba75c3a794f78a9d6124ee693a49228 /libavcodec/qtrleenc.c
parentbde7f5b135c772e0122fd5df616e6de46e157167 (diff)
parentefc618aff9d68d2ddc323a5c5f892ac71951f162 (diff)
downloadffmpeg-256430cf384d34c15a9ec579fbf48708502ab5f4.tar.gz
Merge commit 'efc618aff9d68d2ddc323a5c5f892ac71951f162'
* commit 'efc618aff9d68d2ddc323a5c5f892ac71951f162': qtrleenc: Keep coded_frame.key_frame a write-only variable Conflicts: libavcodec/qtrleenc.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/qtrleenc.c')
-rw-r--r--libavcodec/qtrleenc.c22
1 files changed, 14 insertions, 8 deletions
diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c
index d723188413..bf68d7f242 100644
--- a/libavcodec/qtrleenc.c
+++ b/libavcodec/qtrleenc.c
@@ -58,6 +58,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)
@@ -219,7 +222,7 @@ static void qtrle_encode_line(QtrleEncContext *s, const AVFrame *p, int line, ui
}
}
- 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;
@@ -330,7 +333,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->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],
@@ -368,7 +371,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_packet2(avctx, pkt, s->max_buf_size)) < 0)
@@ -376,12 +379,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);
@@ -390,7 +393,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;