#include "libavutil/imgutils.h"
#include "avcodec.h"
#include "bytestream.h"
+#include "internal.h"
#include "png.h"
#include "pngdsp.h"
typedef struct PNGDecContext {
PNGDSPContext dsp;
- const uint8_t *bytestream;
- const uint8_t *bytestream_start;
- const uint8_t *bytestream_end;
+ GetByteContext gb;
AVFrame picture1, picture2;
AVFrame *current_picture, *last_picture;
static int png_decode_idat(PNGDecContext *s, int length)
{
int ret;
- s->zstream.avail_in = length;
- s->zstream.next_in = s->bytestream;
- s->bytestream += length;
-
- if(s->bytestream > s->bytestream_end)
- return -1;
+ s->zstream.avail_in = FFMIN(length, bytestream2_get_bytes_left(&s->gb));
+ s->zstream.next_in = s->gb.buffer;
+ bytestream2_skip(&s->gb, length);
/* decode one line if possible */
while (s->zstream.avail_in > 0) {
}
static int decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
+ void *data, int *got_frame,
AVPacket *avpkt)
{
const uint8_t *buf = avpkt->data;
avctx->coded_frame= s->current_picture;
p = s->current_picture;
- s->bytestream_start=
- s->bytestream= buf;
- s->bytestream_end= buf + buf_size;
-
/* check signature */
- if (memcmp(s->bytestream, ff_pngsig, 8) != 0 &&
- memcmp(s->bytestream, ff_mngsig, 8) != 0)
+ if (buf_size < 8 ||
+ memcmp(buf, ff_pngsig, 8) != 0 &&
+ memcmp(buf, ff_mngsig, 8) != 0)
return -1;
- s->bytestream+= 8;
+
+ bytestream2_init(&s->gb, buf + 8, buf_size - 8);
s->y=
s->state=0;
// memset(s, 0, sizeof(PNGDecContext));
if (ret != Z_OK)
return -1;
for(;;) {
- int tag32;
- if (s->bytestream >= s->bytestream_end)
+ if (bytestream2_get_bytes_left(&s->gb) <= 0)
goto fail;
- length = bytestream_get_be32(&s->bytestream);
+ length = bytestream2_get_be32(&s->gb);
if (length > 0x7fffffff)
goto fail;
- tag32 = bytestream_get_be32(&s->bytestream);
- tag = av_bswap32(tag32);
+ tag = bytestream2_get_le32(&s->gb);
av_dlog(avctx, "png: tag=%c%c%c%c length=%u\n",
(tag & 0xff),
((tag >> 8) & 0xff),
case MKTAG('I', 'H', 'D', 'R'):
if (length != 13)
goto fail;
- s->width = bytestream_get_be32(&s->bytestream);
- s->height = bytestream_get_be32(&s->bytestream);
+ s->width = bytestream2_get_be32(&s->gb);
+ s->height = bytestream2_get_be32(&s->gb);
if(av_image_check_size(s->width, s->height, 0, avctx)){
s->width= s->height= 0;
goto fail;
}
- s->bit_depth = *s->bytestream++;
- s->color_type = *s->bytestream++;
- s->compression_type = *s->bytestream++;
- s->filter_type = *s->bytestream++;
- s->interlace_type = *s->bytestream++;
- s->bytestream += 4; /* crc */
+ s->bit_depth = bytestream2_get_byte(&s->gb);
+ 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->state |= PNG_IHDR;
av_dlog(avctx, "width=%d height=%d depth=%d color_type=%d compression_type=%d filter_type=%d interlace_type=%d\n",
s->width, s->height, s->bit_depth, s->color_type,
if (s->bit_depth == 8 &&
s->color_type == PNG_COLOR_TYPE_RGB) {
- avctx->pix_fmt = PIX_FMT_RGB24;
+ avctx->pix_fmt = AV_PIX_FMT_RGB24;
} else if (s->bit_depth == 8 &&
s->color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
- avctx->pix_fmt = PIX_FMT_RGB32;
+ avctx->pix_fmt = AV_PIX_FMT_RGB32;
} else if (s->bit_depth == 8 &&
s->color_type == PNG_COLOR_TYPE_GRAY) {
- avctx->pix_fmt = PIX_FMT_GRAY8;
+ avctx->pix_fmt = AV_PIX_FMT_GRAY8;
} else if (s->bit_depth == 16 &&
s->color_type == PNG_COLOR_TYPE_GRAY) {
- avctx->pix_fmt = PIX_FMT_GRAY16BE;
+ avctx->pix_fmt = AV_PIX_FMT_GRAY16BE;
} else if (s->bit_depth == 16 &&
s->color_type == PNG_COLOR_TYPE_RGB) {
- avctx->pix_fmt = PIX_FMT_RGB48BE;
+ avctx->pix_fmt = AV_PIX_FMT_RGB48BE;
} else if (s->bit_depth == 1 &&
s->color_type == PNG_COLOR_TYPE_GRAY) {
- avctx->pix_fmt = PIX_FMT_MONOBLACK;
- } else if (s->color_type == PNG_COLOR_TYPE_PALETTE) {
- avctx->pix_fmt = PIX_FMT_PAL8;
- } else if (s->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
- avctx->pix_fmt = PIX_FMT_Y400A;
+ avctx->pix_fmt = AV_PIX_FMT_MONOBLACK;
+ } else if (s->bit_depth == 8 &&
+ s->color_type == PNG_COLOR_TYPE_PALETTE) {
+ avctx->pix_fmt = AV_PIX_FMT_PAL8;
+ } else if (s->bit_depth == 8 &&
+ s->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
+ avctx->pix_fmt = AV_PIX_FMT_Y400A;
} else {
goto fail;
}
avctx->release_buffer(avctx, p);
p->reference= 0;
- if(avctx->get_buffer(avctx, p) < 0){
+ if(ff_get_buffer(avctx, p) < 0){
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
goto fail;
}
s->state |= PNG_IDAT;
if (png_decode_idat(s, length) < 0)
goto fail;
- s->bytestream += 4; /* crc */
+ bytestream2_skip(&s->gb, 4); /* crc */
break;
case MKTAG('P', 'L', 'T', 'E'):
{
/* read the palette */
n = length / 3;
for(i=0;i<n;i++) {
- r = *s->bytestream++;
- g = *s->bytestream++;
- b = *s->bytestream++;
+ r = bytestream2_get_byte(&s->gb);
+ g = bytestream2_get_byte(&s->gb);
+ b = bytestream2_get_byte(&s->gb);
s->palette[i] = (0xff << 24) | (r << 16) | (g << 8) | b;
}
for(;i<256;i++) {
s->palette[i] = (0xff << 24);
}
s->state |= PNG_PLTE;
- s->bytestream += 4; /* crc */
+ bytestream2_skip(&s->gb, 4); /* crc */
}
break;
case MKTAG('t', 'R', 'N', 'S'):
!(s->state & PNG_PLTE))
goto skip_tag;
for(i=0;i<length;i++) {
- v = *s->bytestream++;
+ v = bytestream2_get_byte(&s->gb);
s->palette[i] = (s->palette[i] & 0x00ffffff) | (v << 24);
}
- s->bytestream += 4; /* crc */
+ bytestream2_skip(&s->gb, 4); /* crc */
}
break;
case MKTAG('I', 'E', 'N', 'D'):
if (!(s->state & PNG_ALLIMAGE))
goto fail;
- s->bytestream += 4; /* crc */
+ bytestream2_skip(&s->gb, 4); /* crc */
goto exit_loop;
default:
/* skip tag */
skip_tag:
- s->bytestream += length + 4;
+ bytestream2_skip(&s->gb, length + 4);
break;
}
}
}
*picture= *s->current_picture;
- *data_size = sizeof(AVFrame);
+ *got_frame = 1;
- ret = s->bytestream - s->bytestream_start;
+ ret = bytestream2_tell(&s->gb);
the_end:
inflateEnd(&s->zstream);
av_free(crow_buf_base);
AVCodec ff_png_decoder = {
.name = "png",
.type = AVMEDIA_TYPE_VIDEO,
- .id = CODEC_ID_PNG,
+ .id = AV_CODEC_ID_PNG,
.priv_data_size = sizeof(PNGDecContext),
.init = png_dec_init,
.close = png_dec_end,
.decode = decode_frame,
.capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
- .long_name = NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"),
+ .long_name = NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"),
};
projects / ffmpeg / blobdiff