Calling av_frame_make_writable() from decoders is tricky, especially
when frame threading is used. It is much simpler and safer to just make
a private copy of the frame.
This is not expected to have a major performance impact, since
APNG_DISPOSE_OP_BACKGROUND is not used often and
av_frame_make_writable() would typically make a copy anyway.
Found-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
int has_trns;
uint8_t transparent_color_be[6];
int has_trns;
uint8_t transparent_color_be[6];
+ uint8_t *background_buf;
+ unsigned background_buf_allocated;
uint32_t palette[256];
uint8_t *crow_buf;
uint8_t *last_row;
uint32_t palette[256];
uint8_t *crow_buf;
uint8_t *last_row;
ff_thread_await_progress(&s->last_picture, INT_MAX, 0);
// need to reset a rectangle to background:
ff_thread_await_progress(&s->last_picture, INT_MAX, 0);
// need to reset a rectangle to background:
- // create a new writable copy
if (s->last_dispose_op == APNG_DISPOSE_OP_BACKGROUND) {
if (s->last_dispose_op == APNG_DISPOSE_OP_BACKGROUND) {
- int ret = av_frame_make_writable(s->last_picture.f);
- if (ret < 0)
- return ret;
+ av_fast_malloc(&s->background_buf, &s->background_buf_allocated,
+ src_stride * p->height);
+ if (!s->background_buf)
+ return AVERROR(ENOMEM);
- src = s->last_picture.f->data[0];
- src_stride = s->last_picture.f->linesize[0];
+ memcpy(s->background_buf, src, src_stride * p->height);
for (y = s->last_y_offset; y < s->last_y_offset + s->last_h; y++) {
for (y = s->last_y_offset; y < s->last_y_offset + s->last_h; y++) {
- memset(s->last_picture.f->data[0] + src_stride * y +
+ memset(s->background_buf + src_stride * y +
s->bpp * s->last_x_offset, 0, s->bpp * s->last_w);
}
s->bpp * s->last_x_offset, 0, s->bpp * s->last_w);
}
+
+ src = s->background_buf;
}
// copy unchanged rectangles from the last frame
}
// copy unchanged rectangles from the last frame
s->last_row_size = 0;
av_freep(&s->tmp_row);
s->tmp_row_size = 0;
s->last_row_size = 0;
av_freep(&s->tmp_row);
s->tmp_row_size = 0;
+ av_freep(&s->background_buf);
av_freep(&s->iccp_data);
av_dict_free(&s->frame_metadata);
av_freep(&s->iccp_data);
av_dict_free(&s->frame_metadata);