RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2015-07-20 22:14:29 +02:00
parent bde7f5b135 efc618aff9
commit 256430cf38
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/qtrleenc.c
View File

@ -58,6 +58,9 @@ typedef struct QtrleEncContext {
* Will contain at ith position the number of consecutive pixels equal to the previous * Will contain at ith position the number of consecutive pixels equal to the previous
* frame starting from pixel i */ * frame starting from pixel i */
uint8_t* skip_table; uint8_t* skip_table;
/** Encoded frame is a key frame */
int key_frame;
} QtrleEncContext; } QtrleEncContext;
static av_cold int qtrle_encode_end(AVCodecContext *avctx) 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); skipcount = FFMIN(skipcount + 1, MAX_RLE_SKIP);
else else
skipcount = 0; skipcount = 0;
@ -330,7 +333,7 @@ static int encode_frame(QtrleEncContext *s, const AVFrame *p, uint8_t *buf)
int end_line = s->avctx->height; int end_line = s->avctx->height;
uint8_t *orig_buf = buf; 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; unsigned line_size = s->logical_width * s->pixel_size;
for (start_line = 0; start_line < s->avctx->height; start_line++) for (start_line = 0; start_line < s->avctx->height; start_line++)
if (memcmp(p->data[0] + start_line*p->linesize[0], 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) const AVFrame *pict, int *got_packet)
{ {
QtrleEncContext * const s = avctx->priv_data; QtrleEncContext * const s = avctx->priv_data;
AVFrame * const p = avctx->coded_frame; enum AVPictureType pict_type;
int ret; int ret;
if ((ret = ff_alloc_packet2(avctx, pkt, s->max_buf_size)) < 0) 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) { if (avctx->gop_size == 0 || (s->avctx->frame_number % avctx->gop_size) == 0) {
/* I-Frame */ /* I-Frame */
p->pict_type = AV_PICTURE_TYPE_I; pict_type = AV_PICTURE_TYPE_I;
p->key_frame = 1; s->key_frame = 1;
} else { } else {
/* P-Frame */ /* P-Frame */
p->pict_type = AV_PICTURE_TYPE_P; pict_type = AV_PICTURE_TYPE_P;
p->key_frame = 0; s->key_frame = 0;
} }
pkt->size = encode_frame(s, pict, pkt->data); 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, av_picture_copy(&s->previous_frame, (const AVPicture *)pict,
avctx->pix_fmt, avctx->width, avctx->height); 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; pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1; *got_packet = 1;