#include "libavutil/avassert.h"
#include "libavutil/bprint.h"
+#include "libavutil/crc.h"
#include "libavutil/imgutils.h"
+#include "libavutil/intreadwrite.h"
#include "libavutil/stereo3d.h"
#include "libavutil/mastering_display_metadata.h"
AVCodecContext *avctx;
GetByteContext gb;
- ThreadFrame previous_picture;
ThreadFrame last_picture;
ThreadFrame picture;
+ AVDictionary *frame_metadata;
+
+ uint8_t iccp_name[82];
+ uint8_t *iccp_data;
+ size_t iccp_data_len;
+
+ int stereo_mode;
+
+ int have_chrm;
+ uint32_t white_point[2];
+ uint32_t display_primaries[3][2];
+
enum PNGHeaderState hdr_state;
enum PNGImageState pic_state;
int width, height;
int has_trns;
uint8_t transparent_color_be[6];
- uint8_t *image_buf;
- int image_linesize;
+ uint8_t *background_buf;
+ unsigned background_buf_allocated;
uint32_t palette[256];
uint8_t *crow_buf;
uint8_t *last_row;
}
/* NOTE: 'dst' can be equal to 'last' */
-static void png_filter_row(PNGDSPContext *dsp, uint8_t *dst, int filter_type,
- uint8_t *src, uint8_t *last, int size, int bpp)
+void ff_png_filter_row(PNGDSPContext *dsp, uint8_t *dst, int filter_type,
+ uint8_t *src, uint8_t *last, int size, int bpp)
{
int i, p, r, g, b, a;
YUV2RGB(rgb8, uint8_t)
YUV2RGB(rgb16, uint16_t)
+static int percent_missing(PNGDecContext *s)
+{
+ if (s->interlace_type) {
+ return 100 - 100 * s->pass / (NB_PASSES - 1);
+ } else {
+ return 100 - 100 * s->y / s->cur_h;
+ }
+}
+
/* process exactly one decompressed row */
-static void png_handle_row(PNGDecContext *s)
+static void png_handle_row(PNGDecContext *s, uint8_t *dst, ptrdiff_t dst_stride)
{
uint8_t *ptr, *last_row;
int got_line;
if (!s->interlace_type) {
- ptr = s->image_buf + s->image_linesize * (s->y + s->y_offset) + s->x_offset * s->bpp;
+ ptr = dst + dst_stride * (s->y + s->y_offset) + s->x_offset * s->bpp;
if (s->y == 0)
last_row = s->last_row;
else
- last_row = ptr - s->image_linesize;
+ last_row = ptr - dst_stride;
- png_filter_row(&s->dsp, ptr, s->crow_buf[0], s->crow_buf + 1,
- last_row, s->row_size, s->bpp);
+ ff_png_filter_row(&s->dsp, ptr, s->crow_buf[0], s->crow_buf + 1,
+ last_row, s->row_size, s->bpp);
/* loco lags by 1 row so that it doesn't interfere with top prediction */
if (s->filter_type == PNG_FILTER_TYPE_LOCO && s->y > 0) {
if (s->bit_depth == 16) {
- deloco_rgb16((uint16_t *)(ptr - s->image_linesize), s->row_size / 2,
+ deloco_rgb16((uint16_t *)(ptr - dst_stride), s->row_size / 2,
s->color_type == PNG_COLOR_TYPE_RGB_ALPHA);
} else {
- deloco_rgb8(ptr - s->image_linesize, s->row_size,
+ deloco_rgb8(ptr - dst_stride, s->row_size,
s->color_type == PNG_COLOR_TYPE_RGB_ALPHA);
}
}
} else {
got_line = 0;
for (;;) {
- ptr = s->image_buf + s->image_linesize * (s->y + s->y_offset) + s->x_offset * s->bpp;
+ ptr = dst + dst_stride * (s->y + s->y_offset) + s->x_offset * s->bpp;
if ((ff_png_pass_ymask[s->pass] << (s->y & 7)) & 0x80) {
/* if we already read one row, it is time to stop to
* wait for the next one */
if (got_line)
break;
- png_filter_row(&s->dsp, s->tmp_row, s->crow_buf[0], s->crow_buf + 1,
- s->last_row, s->pass_row_size, s->bpp);
+ ff_png_filter_row(&s->dsp, s->tmp_row, s->crow_buf[0], s->crow_buf + 1,
+ s->last_row, s->pass_row_size, s->bpp);
FFSWAP(uint8_t *, s->last_row, s->tmp_row);
FFSWAP(unsigned int, s->last_row_size, s->tmp_row_size);
got_line = 1;
}
}
-static int png_decode_idat(PNGDecContext *s, int length)
+static int png_decode_idat(PNGDecContext *s, GetByteContext *gb,
+ uint8_t *dst, ptrdiff_t dst_stride)
{
int ret;
- s->zstream.avail_in = FFMIN(length, bytestream2_get_bytes_left(&s->gb));
- s->zstream.next_in = (unsigned char *)s->gb.buffer;
- bytestream2_skip(&s->gb, length);
+ s->zstream.avail_in = bytestream2_get_bytes_left(gb);
+ s->zstream.next_in = gb->buffer;
/* decode one line if possible */
while (s->zstream.avail_in > 0) {
}
if (s->zstream.avail_out == 0) {
if (!(s->pic_state & PNG_ALLIMAGE)) {
- png_handle_row(s);
+ png_handle_row(s, dst, dst_stride);
}
s->zstream.avail_out = s->crow_size;
s->zstream.next_out = s->crow_buf;
}
if (ret == Z_STREAM_END && s->zstream.avail_in > 0) {
- av_log(NULL, AV_LOG_WARNING,
+ av_log(s->avctx, AV_LOG_WARNING,
"%d undecompressed bytes left in buffer\n", s->zstream.avail_in);
return 0;
}
zstream.opaque = NULL;
if (inflateInit(&zstream) != Z_OK)
return AVERROR_EXTERNAL;
- zstream.next_in = (unsigned char *)data;
+ zstream.next_in = data;
zstream.avail_in = data_end - data;
av_bprint_init(bp, 0, AV_BPRINT_SIZE_UNLIMITED);
return out;
}
-static int decode_text_chunk(PNGDecContext *s, uint32_t length, int compressed,
- AVDictionary **dict)
+static int decode_text_chunk(PNGDecContext *s, GetByteContext *gb, int compressed)
{
int ret, method;
- const uint8_t *data = s->gb.buffer;
- const uint8_t *data_end = data + length;
+ const uint8_t *data = gb->buffer;
+ const uint8_t *data_end = gb->buffer_end;
const uint8_t *keyword = data;
const uint8_t *keyword_end = memchr(keyword, 0, data_end - keyword);
uint8_t *kw_utf8 = NULL, *text, *txt_utf8 = NULL;
return AVERROR(ENOMEM);
}
- av_dict_set(dict, kw_utf8, txt_utf8,
+ av_dict_set(&s->frame_metadata, kw_utf8, txt_utf8,
AV_DICT_DONT_STRDUP_KEY | AV_DICT_DONT_STRDUP_VAL);
return 0;
}
static int decode_ihdr_chunk(AVCodecContext *avctx, PNGDecContext *s,
- uint32_t length)
+ GetByteContext *gb)
{
- if (length != 13)
+ if (bytestream2_get_bytes_left(gb) != 13)
return AVERROR_INVALIDDATA;
if (s->pic_state & PNG_IDAT) {
return AVERROR_INVALIDDATA;
}
- s->width = s->cur_w = bytestream2_get_be32(&s->gb);
- s->height = s->cur_h = bytestream2_get_be32(&s->gb);
+ s->width = s->cur_w = bytestream2_get_be32(gb);
+ s->height = s->cur_h = bytestream2_get_be32(gb);
if (av_image_check_size(s->width, s->height, 0, avctx)) {
s->cur_w = s->cur_h = s->width = s->height = 0;
av_log(avctx, AV_LOG_ERROR, "Invalid image size\n");
return AVERROR_INVALIDDATA;
}
- s->bit_depth = bytestream2_get_byte(&s->gb);
+ s->bit_depth = bytestream2_get_byte(gb);
if (s->bit_depth != 1 && s->bit_depth != 2 && s->bit_depth != 4 &&
s->bit_depth != 8 && s->bit_depth != 16) {
av_log(avctx, AV_LOG_ERROR, "Invalid bit depth\n");
goto error;
}
- s->color_type = bytestream2_get_byte(&s->gb);
- s->compression_type = bytestream2_get_byte(&s->gb);
- s->filter_type = bytestream2_get_byte(&s->gb);
- s->interlace_type = bytestream2_get_byte(&s->gb);
- bytestream2_skip(&s->gb, 4); /* crc */
+ s->color_type = bytestream2_get_byte(gb);
+ s->compression_type = bytestream2_get_byte(gb);
+ if (s->compression_type) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid compression method %d\n", s->compression_type);
+ goto error;
+ }
+ s->filter_type = bytestream2_get_byte(gb);
+ s->interlace_type = bytestream2_get_byte(gb);
s->hdr_state |= PNG_IHDR;
if (avctx->debug & FF_DEBUG_PICT_INFO)
av_log(avctx, AV_LOG_DEBUG, "width=%d height=%d depth=%d color_type=%d "
return AVERROR_INVALIDDATA;
}
-static int decode_phys_chunk(AVCodecContext *avctx, PNGDecContext *s)
+static int decode_phys_chunk(AVCodecContext *avctx, PNGDecContext *s,
+ GetByteContext *gb)
{
if (s->pic_state & PNG_IDAT) {
av_log(avctx, AV_LOG_ERROR, "pHYs after IDAT\n");
return AVERROR_INVALIDDATA;
}
- avctx->sample_aspect_ratio.num = bytestream2_get_be32(&s->gb);
- avctx->sample_aspect_ratio.den = bytestream2_get_be32(&s->gb);
+ avctx->sample_aspect_ratio.num = bytestream2_get_be32(gb);
+ avctx->sample_aspect_ratio.den = bytestream2_get_be32(gb);
if (avctx->sample_aspect_ratio.num < 0 || avctx->sample_aspect_ratio.den < 0)
avctx->sample_aspect_ratio = (AVRational){ 0, 1 };
- bytestream2_skip(&s->gb, 1); /* unit specifier */
- bytestream2_skip(&s->gb, 4); /* crc */
+ bytestream2_skip(gb, 1); /* unit specifier */
return 0;
}
static int decode_idat_chunk(AVCodecContext *avctx, PNGDecContext *s,
- uint32_t length, AVFrame *p)
+ GetByteContext *gb, AVFrame *p)
{
int ret;
size_t byte_depth = s->bit_depth > 8 ? 2 : 1;
s->bpp += byte_depth;
}
+ ff_thread_release_buffer(avctx, &s->picture);
if ((ret = ff_thread_get_buffer(avctx, &s->picture, AV_GET_BUFFER_FLAG_REF)) < 0)
return ret;
- if (avctx->codec_id == AV_CODEC_ID_APNG && s->last_dispose_op != APNG_DISPOSE_OP_PREVIOUS) {
- ff_thread_release_buffer(avctx, &s->previous_picture);
- if ((ret = ff_thread_get_buffer(avctx, &s->previous_picture, AV_GET_BUFFER_FLAG_REF)) < 0)
- return ret;
- }
+
p->pict_type = AV_PICTURE_TYPE_I;
p->key_frame = 1;
p->interlaced_frame = !!s->interlace_type;
}
ff_dlog(avctx, "row_size=%d crow_size =%d\n",
s->row_size, s->crow_size);
- s->image_buf = p->data[0];
- s->image_linesize = p->linesize[0];
+
/* copy the palette if needed */
if (avctx->pix_fmt == AV_PIX_FMT_PAL8)
memcpy(p->data[1], s->palette, 256 * sizeof(uint32_t));
if (s->has_trns && s->color_type != PNG_COLOR_TYPE_PALETTE)
s->bpp -= byte_depth;
- ret = png_decode_idat(s, length);
+ ret = png_decode_idat(s, gb, p->data[0], p->linesize[0]);
if (s->has_trns && s->color_type != PNG_COLOR_TYPE_PALETTE)
s->bpp += byte_depth;
if (ret < 0)
return ret;
- bytestream2_skip(&s->gb, 4); /* crc */
-
return 0;
}
static int decode_plte_chunk(AVCodecContext *avctx, PNGDecContext *s,
- uint32_t length)
+ GetByteContext *gb)
{
+ int length = bytestream2_get_bytes_left(gb);
int n, i, r, g, b;
if ((length % 3) != 0 || length > 256 * 3)
/* read the palette */
n = length / 3;
for (i = 0; i < n; i++) {
- r = bytestream2_get_byte(&s->gb);
- g = bytestream2_get_byte(&s->gb);
- b = bytestream2_get_byte(&s->gb);
+ r = bytestream2_get_byte(gb);
+ g = bytestream2_get_byte(gb);
+ b = bytestream2_get_byte(gb);
s->palette[i] = (0xFFU << 24) | (r << 16) | (g << 8) | b;
}
for (; i < 256; i++)
s->palette[i] = (0xFFU << 24);
s->hdr_state |= PNG_PLTE;
- bytestream2_skip(&s->gb, 4); /* crc */
return 0;
}
static int decode_trns_chunk(AVCodecContext *avctx, PNGDecContext *s,
- uint32_t length)
+ GetByteContext *gb)
{
+ int length = bytestream2_get_bytes_left(gb);
int v, i;
if (!(s->hdr_state & PNG_IHDR)) {
return AVERROR_INVALIDDATA;
for (i = 0; i < length; i++) {
- unsigned v = bytestream2_get_byte(&s->gb);
+ unsigned v = bytestream2_get_byte(gb);
s->palette[i] = (s->palette[i] & 0x00ffffff) | (v << 24);
}
} else if (s->color_type == PNG_COLOR_TYPE_GRAY || s->color_type == PNG_COLOR_TYPE_RGB) {
for (i = 0; i < length / 2; i++) {
/* only use the least significant bits */
- v = av_mod_uintp2(bytestream2_get_be16(&s->gb), s->bit_depth);
+ v = av_mod_uintp2(bytestream2_get_be16(gb), s->bit_depth);
if (s->bit_depth > 8)
AV_WB16(&s->transparent_color_be[2 * i], v);
return AVERROR_INVALIDDATA;
}
- bytestream2_skip(&s->gb, 4); /* crc */
s->has_trns = 1;
return 0;
}
-static int decode_iccp_chunk(PNGDecContext *s, int length, AVFrame *f)
+static int decode_iccp_chunk(PNGDecContext *s, GetByteContext *gb, AVFrame *f)
{
int ret, cnt = 0;
- uint8_t *data, profile_name[82];
AVBPrint bp;
- AVFrameSideData *sd;
- while ((profile_name[cnt++] = bytestream2_get_byte(&s->gb)) && cnt < 81);
+ while ((s->iccp_name[cnt++] = bytestream2_get_byte(gb)) && cnt < 81);
if (cnt > 80) {
av_log(s->avctx, AV_LOG_ERROR, "iCCP with invalid name!\n");
- return AVERROR_INVALIDDATA;
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
}
- length = FFMAX(length - cnt, 0);
-
- if (bytestream2_get_byte(&s->gb) != 0) {
+ if (bytestream2_get_byte(gb) != 0) {
av_log(s->avctx, AV_LOG_ERROR, "iCCP with invalid compression!\n");
- return AVERROR_INVALIDDATA;
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
}
- length = FFMAX(length - 1, 0);
-
- if ((ret = decode_zbuf(&bp, s->gb.buffer, s->gb.buffer + length)) < 0)
+ if ((ret = decode_zbuf(&bp, gb->buffer, gb->buffer_end)) < 0)
return ret;
- ret = av_bprint_finalize(&bp, (char **)&data);
+ av_freep(&s->iccp_data);
+ ret = av_bprint_finalize(&bp, (char **)&s->iccp_data);
if (ret < 0)
return ret;
-
- sd = av_frame_new_side_data(f, AV_FRAME_DATA_ICC_PROFILE, bp.len);
- if (!sd) {
- av_free(data);
- return AVERROR(ENOMEM);
- }
-
- av_dict_set(&sd->metadata, "name", profile_name, 0);
- memcpy(sd->data, data, bp.len);
- av_free(data);
-
- /* ICC compressed data and CRC */
- bytestream2_skip(&s->gb, length + 4);
+ s->iccp_data_len = bp.len;
return 0;
+fail:
+ s->iccp_name[0] = 0;
+ return ret;
}
static void handle_small_bpp(PNGDecContext *s, AVFrame *p)
pd[8*i + 1]= (pd[i]>>6) & 1;
pd[8*i + 0]= pd[i]>>7;
}
- pd += s->image_linesize;
+ pd += p->linesize[0];
}
} else if (s->bits_per_pixel == 2) {
int i, j;
pd[4*i + 0]= ( pd[i]>>6 )*0x55;
}
}
- pd += s->image_linesize;
+ pd += p->linesize[0];
}
} else if (s->bits_per_pixel == 4) {
int i, j;
pd[2*i + 0] = (pd[i] >> 4) * 0x11;
}
}
- pd += s->image_linesize;
+ pd += p->linesize[0];
}
}
}
static int decode_fctl_chunk(AVCodecContext *avctx, PNGDecContext *s,
- uint32_t length)
+ GetByteContext *gb)
{
uint32_t sequence_number;
int cur_w, cur_h, x_offset, y_offset, dispose_op, blend_op;
- if (length != 26)
+ if (bytestream2_get_bytes_left(gb) != 26)
return AVERROR_INVALIDDATA;
if (!(s->hdr_state & PNG_IHDR)) {
return AVERROR_INVALIDDATA;
}
+ if (s->pic_state & PNG_IDAT) {
+ av_log(avctx, AV_LOG_ERROR, "fctl after IDAT\n");
+ return AVERROR_INVALIDDATA;
+ }
+
s->last_w = s->cur_w;
s->last_h = s->cur_h;
s->last_x_offset = s->x_offset;
s->last_y_offset = s->y_offset;
s->last_dispose_op = s->dispose_op;
- sequence_number = bytestream2_get_be32(&s->gb);
- cur_w = bytestream2_get_be32(&s->gb);
- cur_h = bytestream2_get_be32(&s->gb);
- x_offset = bytestream2_get_be32(&s->gb);
- y_offset = bytestream2_get_be32(&s->gb);
- bytestream2_skip(&s->gb, 4); /* delay_num (2), delay_den (2) */
- dispose_op = bytestream2_get_byte(&s->gb);
- blend_op = bytestream2_get_byte(&s->gb);
- bytestream2_skip(&s->gb, 4); /* crc */
+ sequence_number = bytestream2_get_be32(gb);
+ cur_w = bytestream2_get_be32(gb);
+ cur_h = bytestream2_get_be32(gb);
+ x_offset = bytestream2_get_be32(gb);
+ y_offset = bytestream2_get_be32(gb);
+ bytestream2_skip(gb, 4); /* delay_num (2), delay_den (2) */
+ dispose_op = bytestream2_get_byte(gb);
+ blend_op = bytestream2_get_byte(gb);
if (sequence_number == 0 &&
(cur_w != s->width ||
return AVERROR_INVALIDDATA;
}
- if ((sequence_number == 0 || !s->previous_picture.f->data[0]) &&
+ if ((sequence_number == 0 || !s->last_picture.f->data[0]) &&
dispose_op == APNG_DISPOSE_OP_PREVIOUS) {
// No previous frame to revert to for the first frame
// Spec says to just treat it as a APNG_DISPOSE_OP_BACKGROUND
for (j = 0; j < s->height; j++) {
for (i = 0; i < ls; i++)
pd[i] += pd_last[i];
- pd += s->image_linesize;
- pd_last += s->image_linesize;
+ pd += p->linesize[0];
+ pd_last += s->last_picture.f->linesize[0];
}
}
static int handle_p_frame_apng(AVCodecContext *avctx, PNGDecContext *s,
AVFrame *p)
{
+ uint8_t *dst = p->data[0];
+ ptrdiff_t dst_stride = p->linesize[0];
+ const uint8_t *src = s->last_picture.f->data[0];
+ ptrdiff_t src_stride = s->last_picture.f->linesize[0];
+
size_t x, y;
- uint8_t *buffer;
if (s->blend_op == APNG_BLEND_OP_OVER &&
avctx->pix_fmt != AV_PIX_FMT_RGBA &&
return AVERROR_PATCHWELCOME;
}
- buffer = av_malloc_array(s->image_linesize, s->height);
- if (!buffer)
- return AVERROR(ENOMEM);
+ ff_thread_await_progress(&s->last_picture, INT_MAX, 0);
+ // need to reset a rectangle to background:
+ if (s->last_dispose_op == APNG_DISPOSE_OP_BACKGROUND) {
+ av_fast_malloc(&s->background_buf, &s->background_buf_allocated,
+ src_stride * p->height);
+ if (!s->background_buf)
+ return AVERROR(ENOMEM);
- // Do the disposal operation specified by the last frame on the frame
- if (s->last_dispose_op != APNG_DISPOSE_OP_PREVIOUS) {
- ff_thread_await_progress(&s->last_picture, INT_MAX, 0);
- memcpy(buffer, s->last_picture.f->data[0], s->image_linesize * s->height);
+ memcpy(s->background_buf, src, src_stride * p->height);
- if (s->last_dispose_op == APNG_DISPOSE_OP_BACKGROUND)
- for (y = s->last_y_offset; y < s->last_y_offset + s->last_h; ++y)
- memset(buffer + s->image_linesize * y + s->bpp * s->last_x_offset, 0, s->bpp * s->last_w);
+ for (y = s->last_y_offset; y < s->last_y_offset + s->last_h; y++) {
+ memset(s->background_buf + src_stride * y +
+ s->bpp * s->last_x_offset, 0, s->bpp * s->last_w);
+ }
- memcpy(s->previous_picture.f->data[0], buffer, s->image_linesize * s->height);
- ff_thread_report_progress(&s->previous_picture, INT_MAX, 0);
- } else {
- ff_thread_await_progress(&s->previous_picture, INT_MAX, 0);
- memcpy(buffer, s->previous_picture.f->data[0], s->image_linesize * s->height);
+ src = s->background_buf;
}
- // Perform blending
- if (s->blend_op == APNG_BLEND_OP_SOURCE) {
- for (y = s->y_offset; y < s->y_offset + s->cur_h; ++y) {
- size_t row_start = s->image_linesize * y + s->bpp * s->x_offset;
- memcpy(buffer + row_start, p->data[0] + row_start, s->bpp * s->cur_w);
- }
- } else { // APNG_BLEND_OP_OVER
+ // copy unchanged rectangles from the last frame
+ for (y = 0; y < s->y_offset; y++)
+ memcpy(dst + y * dst_stride, src + y * src_stride, p->width * s->bpp);
+ for (y = s->y_offset; y < s->y_offset + s->cur_h; y++) {
+ memcpy(dst + y * dst_stride, src + y * src_stride, s->x_offset * s->bpp);
+ memcpy(dst + y * dst_stride + (s->x_offset + s->cur_w) * s->bpp,
+ src + y * src_stride + (s->x_offset + s->cur_w) * s->bpp,
+ (p->width - s->cur_w - s->x_offset) * s->bpp);
+ }
+ for (y = s->y_offset + s->cur_h; y < p->height; y++)
+ memcpy(dst + y * dst_stride, src + y * src_stride, p->width * s->bpp);
+
+ if (s->blend_op == APNG_BLEND_OP_OVER) {
+ // Perform blending
for (y = s->y_offset; y < s->y_offset + s->cur_h; ++y) {
- uint8_t *foreground = p->data[0] + s->image_linesize * y + s->bpp * s->x_offset;
- uint8_t *background = buffer + s->image_linesize * y + s->bpp * s->x_offset;
+ uint8_t *foreground = dst + dst_stride * y + s->bpp * s->x_offset;
+ const uint8_t *background = src + src_stride * y + s->bpp * s->x_offset;
for (x = s->x_offset; x < s->x_offset + s->cur_w; ++x, foreground += s->bpp, background += s->bpp) {
size_t b;
uint8_t foreground_alpha, background_alpha, output_alpha;
break;
}
- if (foreground_alpha == 0)
+ if (foreground_alpha == 255)
continue;
- if (foreground_alpha == 255) {
- memcpy(background, foreground, s->bpp);
+ if (foreground_alpha == 0) {
+ memcpy(foreground, background, s->bpp);
continue;
}
if (avctx->pix_fmt == AV_PIX_FMT_PAL8) {
// TODO: Alpha blending with PAL8 will likely need the entire image converted over to RGBA first
avpriv_request_sample(avctx, "Alpha blending palette samples");
- background[0] = foreground[0];
continue;
}
}
}
output[b] = output_alpha;
- memcpy(background, output, s->bpp);
+ memcpy(foreground, output, s->bpp);
}
}
}
- // Copy blended buffer into the frame and free
- memcpy(p->data[0], buffer, s->image_linesize * s->height);
- av_free(buffer);
-
return 0;
}
static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s,
- AVFrame *p, AVPacket *avpkt)
+ AVFrame *p, const AVPacket *avpkt)
{
- AVDictionary **metadatap = NULL;
+ const AVCRC *crc_tab = av_crc_get_table(AV_CRC_32_IEEE_LE);
uint32_t tag, length;
int decode_next_dat = 0;
int i, ret;
for (;;) {
+ GetByteContext gb_chunk;
+
length = bytestream2_get_bytes_left(&s->gb);
if (length <= 0) {
}
length = bytestream2_get_be32(&s->gb);
- if (length > 0x7fffffff || length > bytestream2_get_bytes_left(&s->gb)) {
+ if (length > 0x7fffffff || length + 8 > bytestream2_get_bytes_left(&s->gb)) {
av_log(avctx, AV_LOG_ERROR, "chunk too big\n");
ret = AVERROR_INVALIDDATA;
goto fail;
}
+ if (avctx->err_recognition & (AV_EF_CRCCHECK | AV_EF_IGNORE_ERR)) {
+ uint32_t crc_sig = AV_RB32(s->gb.buffer + length + 4);
+ uint32_t crc_cal = ~av_crc(crc_tab, UINT32_MAX, s->gb.buffer, length + 4);
+ if (crc_sig ^ crc_cal) {
+ av_log(avctx, AV_LOG_ERROR, "CRC mismatch in chunk");
+ if (avctx->err_recognition & AV_EF_EXPLODE) {
+ av_log(avctx, AV_LOG_ERROR, ", quitting\n");
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
+ }
+ av_log(avctx, AV_LOG_ERROR, ", skipping\n");
+ bytestream2_skip(&s->gb, length + 8); /* tag */
+ }
+ }
tag = bytestream2_get_le32(&s->gb);
if (avctx->debug & FF_DEBUG_STARTCODE)
av_log(avctx, AV_LOG_DEBUG, "png: tag=%s length=%u\n",
av_fourcc2str(tag), length);
+ bytestream2_init(&gb_chunk, s->gb.buffer, length);
+ bytestream2_skip(&s->gb, length + 4);
+
if (avctx->codec_id == AV_CODEC_ID_PNG &&
avctx->skip_frame == AVDISCARD_ALL) {
switch(tag) {
case MKTAG('t', 'R', 'N', 'S'):
break;
default:
- goto skip_tag;
+ continue;
}
}
- metadatap = &p->metadata;
switch (tag) {
case MKTAG('I', 'H', 'D', 'R'):
- if ((ret = decode_ihdr_chunk(avctx, s, length)) < 0)
+ if ((ret = decode_ihdr_chunk(avctx, s, &gb_chunk)) < 0)
goto fail;
break;
case MKTAG('p', 'H', 'Y', 's'):
- if ((ret = decode_phys_chunk(avctx, s)) < 0)
+ if ((ret = decode_phys_chunk(avctx, s, &gb_chunk)) < 0)
goto fail;
break;
case MKTAG('f', 'c', 'T', 'L'):
if (!CONFIG_APNG_DECODER || avctx->codec_id != AV_CODEC_ID_APNG)
- goto skip_tag;
- if ((ret = decode_fctl_chunk(avctx, s, length)) < 0)
+ continue;
+ if ((ret = decode_fctl_chunk(avctx, s, &gb_chunk)) < 0)
goto fail;
decode_next_dat = 1;
break;
case MKTAG('f', 'd', 'A', 'T'):
if (!CONFIG_APNG_DECODER || avctx->codec_id != AV_CODEC_ID_APNG)
- goto skip_tag;
- if (!decode_next_dat) {
+ continue;
+ if (!decode_next_dat || bytestream2_get_bytes_left(&gb_chunk) < 4) {
ret = AVERROR_INVALIDDATA;
goto fail;
}
- bytestream2_get_be32(&s->gb);
- length -= 4;
+ bytestream2_get_be32(&gb_chunk);
/* fallthrough */
case MKTAG('I', 'D', 'A', 'T'):
if (CONFIG_APNG_DECODER && avctx->codec_id == AV_CODEC_ID_APNG && !decode_next_dat)
- goto skip_tag;
- if ((ret = decode_idat_chunk(avctx, s, length, p)) < 0)
+ continue;
+ if ((ret = decode_idat_chunk(avctx, s, &gb_chunk, p)) < 0)
goto fail;
break;
case MKTAG('P', 'L', 'T', 'E'):
- if (decode_plte_chunk(avctx, s, length) < 0)
- goto skip_tag;
+ decode_plte_chunk(avctx, s, &gb_chunk);
break;
case MKTAG('t', 'R', 'N', 'S'):
- if (decode_trns_chunk(avctx, s, length) < 0)
- goto skip_tag;
+ decode_trns_chunk(avctx, s, &gb_chunk);
break;
case MKTAG('t', 'E', 'X', 't'):
- if (decode_text_chunk(s, length, 0, metadatap) < 0)
+ if (decode_text_chunk(s, &gb_chunk, 0) < 0)
av_log(avctx, AV_LOG_WARNING, "Broken tEXt chunk\n");
- bytestream2_skip(&s->gb, length + 4);
break;
case MKTAG('z', 'T', 'X', 't'):
- if (decode_text_chunk(s, length, 1, metadatap) < 0)
+ if (decode_text_chunk(s, &gb_chunk, 1) < 0)
av_log(avctx, AV_LOG_WARNING, "Broken zTXt chunk\n");
- bytestream2_skip(&s->gb, length + 4);
break;
case MKTAG('s', 'T', 'E', 'R'): {
- int mode = bytestream2_get_byte(&s->gb);
- AVStereo3D *stereo3d = av_stereo3d_create_side_data(p);
- if (!stereo3d)
- goto fail;
+ int mode = bytestream2_get_byte(&gb_chunk);
if (mode == 0 || mode == 1) {
- stereo3d->type = AV_STEREO3D_SIDEBYSIDE;
- stereo3d->flags = mode ? 0 : AV_STEREO3D_FLAG_INVERT;
+ s->stereo_mode = mode;
} else {
av_log(avctx, AV_LOG_WARNING,
"Unknown value in sTER chunk (%d)\n", mode);
}
- bytestream2_skip(&s->gb, 4); /* crc */
break;
}
case MKTAG('i', 'C', 'C', 'P'): {
- if (decode_iccp_chunk(s, length, p) < 0)
+ if ((ret = decode_iccp_chunk(s, &gb_chunk, p)) < 0)
goto fail;
break;
}
case MKTAG('c', 'H', 'R', 'M'): {
- AVMasteringDisplayMetadata *mdm = av_mastering_display_metadata_create_side_data(p);
- if (!mdm) {
- ret = AVERROR(ENOMEM);
- goto fail;
- }
+ s->have_chrm = 1;
- mdm->white_point[0] = av_make_q(bytestream2_get_be32(&s->gb), 100000);
- mdm->white_point[1] = av_make_q(bytestream2_get_be32(&s->gb), 100000);
+ s->white_point[0] = bytestream2_get_be32(&gb_chunk);
+ s->white_point[1] = bytestream2_get_be32(&gb_chunk);
/* RGB Primaries */
for (i = 0; i < 3; i++) {
- mdm->display_primaries[i][0] = av_make_q(bytestream2_get_be32(&s->gb), 100000);
- mdm->display_primaries[i][1] = av_make_q(bytestream2_get_be32(&s->gb), 100000);
+ s->display_primaries[i][0] = bytestream2_get_be32(&gb_chunk);
+ s->display_primaries[i][1] = bytestream2_get_be32(&gb_chunk);
}
- mdm->has_primaries = 1;
- bytestream2_skip(&s->gb, 4); /* crc */
break;
}
case MKTAG('g', 'A', 'M', 'A'): {
AVBPrint bp;
char *gamma_str;
- int num = bytestream2_get_be32(&s->gb);
+ int num = bytestream2_get_be32(&gb_chunk);
av_bprint_init(&bp, 0, AV_BPRINT_SIZE_UNLIMITED);
av_bprintf(&bp, "%i/%i", num, 100000);
if (ret < 0)
return ret;
- av_dict_set(&p->metadata, "gamma", gamma_str, AV_DICT_DONT_STRDUP_VAL);
+ av_dict_set(&s->frame_metadata, "gamma", gamma_str, AV_DICT_DONT_STRDUP_VAL);
- bytestream2_skip(&s->gb, 4); /* crc */
break;
}
case MKTAG('I', 'E', 'N', 'D'):
ret = AVERROR_INVALIDDATA;
goto fail;
}
- bytestream2_skip(&s->gb, 4); /* crc */
goto exit_loop;
- default:
- /* skip tag */
-skip_tag:
- bytestream2_skip(&s->gb, length + 4);
- break;
}
}
exit_loop:
return 0;
}
+ if (percent_missing(s) > avctx->discard_damaged_percentage)
+ return AVERROR_INVALIDDATA;
+
if (s->bits_per_pixel <= 4)
handle_small_bpp(s, p);
av_assert0(s->bit_depth > 1);
for (y = 0; y < s->height; ++y) {
- uint8_t *row = &s->image_buf[s->image_linesize * y];
-
- /* since we're updating in-place, we have to go from right to left */
- for (x = s->width; x > 0; --x) {
- uint8_t *pixel = &row[s->bpp * (x - 1)];
- memmove(pixel, &row[raw_bpp * (x - 1)], raw_bpp);
+ uint8_t *row = &p->data[0][p->linesize[0] * y];
+
+ if (s->bpp == 2 && byte_depth == 1) {
+ uint8_t *pixel = &row[2 * s->width - 1];
+ uint8_t *rowp = &row[1 * s->width - 1];
+ int tcolor = s->transparent_color_be[0];
+ for (x = s->width; x > 0; --x) {
+ *pixel-- = *rowp == tcolor ? 0 : 0xff;
+ *pixel-- = *rowp--;
+ }
+ } else if (s->bpp == 4 && byte_depth == 1) {
+ uint8_t *pixel = &row[4 * s->width - 1];
+ uint8_t *rowp = &row[3 * s->width - 1];
+ int tcolor = AV_RL24(s->transparent_color_be);
+ for (x = s->width; x > 0; --x) {
+ *pixel-- = AV_RL24(rowp-2) == tcolor ? 0 : 0xff;
+ *pixel-- = *rowp--;
+ *pixel-- = *rowp--;
+ *pixel-- = *rowp--;
+ }
+ } else {
+ /* since we're updating in-place, we have to go from right to left */
+ for (x = s->width; x > 0; --x) {
+ uint8_t *pixel = &row[s->bpp * (x - 1)];
+ memmove(pixel, &row[raw_bpp * (x - 1)], raw_bpp);
- if (!memcmp(pixel, s->transparent_color_be, raw_bpp)) {
- memset(&pixel[raw_bpp], 0, byte_depth);
- } else {
- memset(&pixel[raw_bpp], 0xff, byte_depth);
+ if (!memcmp(pixel, s->transparent_color_be, raw_bpp)) {
+ memset(&pixel[raw_bpp], 0, byte_depth);
+ } else {
+ memset(&pixel[raw_bpp], 0xff, byte_depth);
+ }
}
}
}
}
}
ff_thread_report_progress(&s->picture, INT_MAX, 0);
- ff_thread_report_progress(&s->previous_picture, INT_MAX, 0);
return 0;
fail:
ff_thread_report_progress(&s->picture, INT_MAX, 0);
- ff_thread_report_progress(&s->previous_picture, INT_MAX, 0);
+ return ret;
+}
+
+static void clear_frame_metadata(PNGDecContext *s)
+{
+ av_freep(&s->iccp_data);
+ s->iccp_data_len = 0;
+ s->iccp_name[0] = 0;
+
+ s->stereo_mode = -1;
+
+ s->have_chrm = 0;
+
+ av_dict_free(&s->frame_metadata);
+}
+
+static int output_frame(PNGDecContext *s, AVFrame *f,
+ const AVFrame *src)
+{
+ int ret;
+
+ ret = av_frame_ref(f, src);
+ if (ret < 0)
+ return ret;
+
+ if (s->iccp_data) {
+ AVFrameSideData *sd = av_frame_new_side_data(f, AV_FRAME_DATA_ICC_PROFILE, s->iccp_data_len);
+ if (!sd) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ memcpy(sd->data, s->iccp_data, s->iccp_data_len);
+
+ av_dict_set(&sd->metadata, "name", s->iccp_name, 0);
+ }
+
+ if (s->stereo_mode >= 0) {
+ AVStereo3D *stereo3d = av_stereo3d_create_side_data(f);
+ if (!stereo3d) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+
+ stereo3d->type = AV_STEREO3D_SIDEBYSIDE;
+ stereo3d->flags = s->stereo_mode ? 0 : AV_STEREO3D_FLAG_INVERT;
+ }
+
+ if (s->have_chrm) {
+ AVMasteringDisplayMetadata *mdm = av_mastering_display_metadata_create_side_data(f);
+ if (!mdm) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+
+ mdm->white_point[0] = av_make_q(s->white_point[0], 100000);
+ mdm->white_point[1] = av_make_q(s->white_point[1], 100000);
+
+ /* RGB Primaries */
+ for (int i = 0; i < 3; i++) {
+ mdm->display_primaries[i][0] = av_make_q(s->display_primaries[i][0], 100000);
+ mdm->display_primaries[i][1] = av_make_q(s->display_primaries[i][1], 100000);
+ }
+
+ mdm->has_primaries = 1;
+ }
+
+ FFSWAP(AVDictionary*, f->metadata, s->frame_metadata);
+
+ return 0;
+fail:
+ av_frame_unref(f);
return ret;
}
PNGDecContext *const s = avctx->priv_data;
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
- AVFrame *p;
+ AVFrame *dst_frame = data;
+ AVFrame *p = s->picture.f;
int64_t sig;
int ret;
- ff_thread_release_buffer(avctx, &s->last_picture);
- FFSWAP(ThreadFrame, s->picture, s->last_picture);
- p = s->picture.f;
+ clear_frame_metadata(s);
bytestream2_init(&s->gb, buf, buf_size);
goto the_end;
}
- if ((ret = av_frame_ref(data, s->picture.f)) < 0)
+ ret = output_frame(s, dst_frame, s->picture.f);
+ if (ret < 0)
goto the_end;
+ if (!(avctx->active_thread_type & FF_THREAD_FRAME)) {
+ ff_thread_release_buffer(avctx, &s->last_picture);
+ FFSWAP(ThreadFrame, s->picture, s->last_picture);
+ }
+
*got_frame = 1;
ret = bytestream2_tell(&s->gb);
AVPacket *avpkt)
{
PNGDecContext *const s = avctx->priv_data;
+ AVFrame *dst_frame = data;
int ret;
- AVFrame *p;
+ AVFrame *p = s->picture.f;
- ff_thread_release_buffer(avctx, &s->last_picture);
- FFSWAP(ThreadFrame, s->picture, s->last_picture);
- p = s->picture.f;
+ clear_frame_metadata(s);
if (!(s->hdr_state & PNG_IHDR)) {
if (!avctx->extradata_size)
ret = AVERROR_INVALIDDATA;
goto end;
}
- if ((ret = av_frame_ref(data, s->picture.f)) < 0)
+
+ ret = output_frame(s, dst_frame, s->picture.f);
+ if (ret < 0)
goto end;
+ if (!(avctx->active_thread_type & FF_THREAD_FRAME)) {
+ if (s->dispose_op == APNG_DISPOSE_OP_PREVIOUS) {
+ ff_thread_release_buffer(avctx, &s->picture);
+ } else if (s->dispose_op == APNG_DISPOSE_OP_NONE) {
+ ff_thread_release_buffer(avctx, &s->last_picture);
+ FFSWAP(ThreadFrame, s->picture, s->last_picture);
+ }
+ }
+
*got_frame = 1;
ret = bytestream2_tell(&s->gb);
{
PNGDecContext *psrc = src->priv_data;
PNGDecContext *pdst = dst->priv_data;
+ ThreadFrame *src_frame = NULL;
int ret;
if (dst == src)
return 0;
- ff_thread_release_buffer(dst, &pdst->picture);
- if (psrc->picture.f->data[0] &&
- (ret = ff_thread_ref_frame(&pdst->picture, &psrc->picture)) < 0)
- return ret;
if (CONFIG_APNG_DECODER && dst->codec_id == AV_CODEC_ID_APNG) {
+
pdst->width = psrc->width;
pdst->height = psrc->height;
pdst->bit_depth = psrc->bit_depth;
memcpy(pdst->palette, psrc->palette, sizeof(pdst->palette));
pdst->hdr_state |= psrc->hdr_state;
+ }
- ff_thread_release_buffer(dst, &pdst->last_picture);
- if (psrc->last_picture.f->data[0] &&
- (ret = ff_thread_ref_frame(&pdst->last_picture, &psrc->last_picture)) < 0)
- return ret;
+ src_frame = psrc->dispose_op == APNG_DISPOSE_OP_NONE ?
+ &psrc->picture : &psrc->last_picture;
- ff_thread_release_buffer(dst, &pdst->previous_picture);
- if (psrc->previous_picture.f->data[0] &&
- (ret = ff_thread_ref_frame(&pdst->previous_picture, &psrc->previous_picture)) < 0)
+ ff_thread_release_buffer(dst, &pdst->last_picture);
+ if (src_frame && src_frame->f->data[0]) {
+ ret = ff_thread_ref_frame(&pdst->last_picture, src_frame);
+ if (ret < 0)
return ret;
}
avctx->color_range = AVCOL_RANGE_JPEG;
s->avctx = avctx;
- s->previous_picture.f = av_frame_alloc();
s->last_picture.f = av_frame_alloc();
s->picture.f = av_frame_alloc();
- if (!s->previous_picture.f || !s->last_picture.f || !s->picture.f) {
- av_frame_free(&s->previous_picture.f);
+ if (!s->last_picture.f || !s->picture.f) {
av_frame_free(&s->last_picture.f);
av_frame_free(&s->picture.f);
return AVERROR(ENOMEM);
}
- if (!avctx->internal->is_copy) {
- avctx->internal->allocate_progress = 1;
- ff_pngdsp_init(&s->dsp);
- }
+ ff_pngdsp_init(&s->dsp);
return 0;
}
{
PNGDecContext *s = avctx->priv_data;
- ff_thread_release_buffer(avctx, &s->previous_picture);
- av_frame_free(&s->previous_picture.f);
ff_thread_release_buffer(avctx, &s->last_picture);
av_frame_free(&s->last_picture.f);
ff_thread_release_buffer(avctx, &s->picture);
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);
return 0;
}
#if CONFIG_APNG_DECODER
-AVCodec ff_apng_decoder = {
+const AVCodec ff_apng_decoder = {
.name = "apng",
.long_name = NULL_IF_CONFIG_SMALL("APNG (Animated Portable Network Graphics) image"),
.type = AVMEDIA_TYPE_VIDEO,
.init = png_dec_init,
.close = png_dec_end,
.decode = decode_frame_apng,
- .init_thread_copy = ONLY_IF_THREADS_ENABLED(png_dec_init),
.update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context),
.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/,
- .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE |
+ FF_CODEC_CAP_ALLOCATE_PROGRESS,
};
#endif
#if CONFIG_PNG_DECODER
-AVCodec ff_png_decoder = {
+const AVCodec ff_png_decoder = {
.name = "png",
.long_name = NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"),
.type = AVMEDIA_TYPE_VIDEO,
.init = png_dec_init,
.close = png_dec_end,
.decode = decode_frame_png,
- .init_thread_copy = ONLY_IF_THREADS_ENABLED(png_dec_init),
.update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context),
.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/,
- .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | FF_CODEC_CAP_INIT_THREADSAFE,
+ .caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | FF_CODEC_CAP_INIT_THREADSAFE |
+ FF_CODEC_CAP_ALLOCATE_PROGRESS,
};
#endif
projects / ffmpeg / blobdiff