#include "libavutil/avassert.h"
#include "libavutil/bprint.h"
#include "libavutil/imgutils.h"
+#include "libavutil/stereo3d.h"
+
#include "avcodec.h"
#include "bytestream.h"
#include "internal.h"
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;
- uint8_t output[4];
+ uint8_t output[10];
// Since we might be blending alpha onto alpha, we use the following equations:
// output_alpha = foreground_alpha + (1 - foreground_alpha) * background_alpha
output_alpha = foreground_alpha + FAST_DIV255((255 - foreground_alpha) * background_alpha);
+ av_assert0(s->bpp <= 10);
+
for (b = 0; b < s->bpp - 1; ++b) {
if (output_alpha == 0) {
output[b] = 0;
for (;;) {
length = bytestream2_get_bytes_left(&s->gb);
if (length <= 0) {
+
+ if (avctx->codec_id == AV_CODEC_ID_PNG &&
+ avctx->skip_frame == AVDISCARD_ALL) {
+ av_frame_set_metadata(p, metadata);
+ return 0;
+ }
+
if (CONFIG_APNG_DECODER && avctx->codec_id == AV_CODEC_ID_APNG && length == 0) {
if (!(s->state & PNG_IDAT))
return 0;
((tag >> 8) & 0xff),
((tag >> 16) & 0xff),
((tag >> 24) & 0xff), length);
+
+ if (avctx->codec_id == AV_CODEC_ID_PNG &&
+ avctx->skip_frame == AVDISCARD_ALL) {
+ switch(tag) {
+ case MKTAG('I', 'H', 'D', 'R'):
+ case MKTAG('p', 'H', 'Y', 's'):
+ case MKTAG('t', 'E', 'X', 't'):
+ case MKTAG('I', 'D', 'A', 'T'):
+ break;
+ default:
+ goto skip_tag;
+ }
+ }
+
switch (tag) {
case MKTAG('I', 'H', 'D', 'R'):
if ((ret = decode_ihdr_chunk(avctx, s, length)) < 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;
+
+ if (mode == 0 || mode == 1) {
+ stereo3d->type = AV_STEREO3D_SIDEBYSIDE;
+ stereo3d->flags = mode ? 0 : AV_STEREO3D_FLAG_INVERT;
+ } 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', 'E', 'N', 'D'):
if (!(s->state & PNG_ALLIMAGE))
av_log(avctx, AV_LOG_ERROR, "IEND without all image\n");
}
}
exit_loop:
+ if (avctx->codec_id == AV_CODEC_ID_PNG &&
+ avctx->skip_frame == AVDISCARD_ALL) {
+ av_frame_set_metadata(p, metadata);
+ return 0;
+ }
if (s->bits_per_pixel <= 4)
handle_small_bpp(s, p);
if ((ret = decode_frame_common(avctx, s, p, avpkt)) < 0)
goto the_end;
+ if (avctx->skip_frame == AVDISCARD_ALL) {
+ *got_frame = 0;
+ ret = bytestream2_tell(&s->gb);
+ goto the_end;
+ }
+
if ((ret = av_frame_ref(data, s->picture.f)) < 0)
return ret;