generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '901f9c0a32985f48672fd68594111dc55d88a57a'

Browse Source 
* commit '901f9c0a32985f48672fd68594111dc55d88a57a':
  qtrle: Properly use AVFrame API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-10-14 14:56:16 +02:00
commit 9c3f75c29d
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/qtrleenc.c
View File

@ -37,7 +37,7 @@
typedef struct QtrleEncContext { typedef struct QtrleEncContext {
AVCodecContext *avctx; AVCodecContext *avctx;
int pixel_size; int pixel_size;
AVPicture previous_frame; AVFrame *previous_frame;
unsigned int max_buf_size; unsigned int max_buf_size;
int logical_width; int logical_width;
/** /**
@ -67,7 +67,7 @@ static av_cold int qtrle_encode_end(AVCodecContext *avctx)
{ {
QtrleEncContext *s = avctx->priv_data; QtrleEncContext *s = avctx->priv_data;
avpicture_free(&s->previous_frame); av_frame_free(&s->previous_frame);
av_free(s->rlecode_table); av_free(s->rlecode_table);
av_free(s->length_table); av_free(s->length_table);
av_free(s->skip_table); av_free(s->skip_table);
@ -77,7 +77,6 @@ static av_cold int qtrle_encode_end(AVCodecContext *avctx)
static av_cold int qtrle_encode_init(AVCodecContext *avctx) static av_cold int qtrle_encode_init(AVCodecContext *avctx)
{ {
QtrleEncContext *s = avctx->priv_data; QtrleEncContext *s = avctx->priv_data;
int ret;
if (av_image_check_size(avctx->width, avctx->height, 0, avctx) < 0) { if (av_image_check_size(avctx->width, avctx->height, 0, avctx) < 0) {
return AVERROR(EINVAL); return AVERROR(EINVAL);
@ -116,9 +115,10 @@ static av_cold int qtrle_encode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_ERROR, "Error allocating memory.\n"); av_log(avctx, AV_LOG_ERROR, "Error allocating memory.\n");
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
if ((ret = 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"); av_log(avctx, AV_LOG_ERROR, "Error allocating picture\n");
return ret; return AVERROR(ENOMEM);
} }
s->max_buf_size = s->logical_width*s->avctx->height*s->pixel_size*2 /* image base material */ s->max_buf_size = s->logical_width*s->avctx->height*s->pixel_size*2 /* image base material */
@ -157,7 +157,7 @@ static void qtrle_encode_line(QtrleEncContext *s, const AVFrame *p, int line, ui
uint8_t *this_line = p-> data[0] + line*p-> linesize[0] + uint8_t *this_line = p-> data[0] + line*p-> linesize[0] +
(width - 1)*s->pixel_size; (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; (width - 1)*s->pixel_size;
s->length_table[width] = 0; s->length_table[width] = 0;
@ -329,13 +329,13 @@ static int encode_frame(QtrleEncContext *s, const AVFrame *p, uint8_t *buf)
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],
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)) line_size))
break; break;
for (end_line=s->avctx->height; end_line > start_line; end_line--) for (end_line=s->avctx->height; end_line > start_line; end_line--)
if (memcmp(p->data[0] + (end_line - 1)*p->linesize[0], 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)) line_size))
break; break;
} }
@ -382,8 +382,12 @@ static int qtrle_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
pkt->size = encode_frame(s, pict, pkt->data); pkt->size = encode_frame(s, pict, pkt->data);
/* save the current frame */ /* save the current frame */
av_picture_copy(&s->previous_frame, (const AVPicture *)pict, av_frame_unref(s->previous_frame);
avctx->pix_fmt, avctx->width, avctx->height); 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 #if FF_API_CODED_FRAME
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS