mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-02-08 15:50:18 +00:00
568e9062bd
* qatar/release/0.8: (154 commits) Update Changelog for the 0.8.1 Release dca: include libavutil/mathematics.h for possibly missing M_SQRT1_2 dca: don't use av_clip_uintp2(). snow: check reference frame indices. snow: reject unsupported chroma shifts. xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns. h264: increase reference poc list from 16 to 32. h264: stricter reference limit enforcement. h264: improve parsing of broken AVC SPS Replace computations of remaining bits with calls to get_bits_left(). png: convert to bytestream2 API. roqvideo: convert to bytestream2 API. smc: port to bytestream2 API. tgq: convert to bytestream2 API. algmm: convert to bytestream2 API. jvdec: unbreak video decoding h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction. libx264: add 'stats' private option for setting 2pass stats filename. libx264: fix help text for slice-max-size option. avconv: reindent ... Conflicts: Changelog RELEASE avconv.c doc/APIchanges ffplay.c libavcodec/Makefile libavcodec/aacdec.c libavcodec/alsdec.c libavcodec/atrac3.c libavcodec/avcodec.h libavcodec/dvdata.c libavcodec/fraps.c libavcodec/golomb.h libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_direct.c libavcodec/h264_parser.c libavcodec/h264_ps.c libavcodec/h264idct_template.c libavcodec/indeo3.c libavcodec/kgv1dec.c libavcodec/kmvc.c libavcodec/mjpegbdec.c libavcodec/mmvideo.c libavcodec/mpegaudiodec.c libavcodec/mpegvideo.h libavcodec/options.c libavcodec/pngdec.c libavcodec/roqvideodec.c libavcodec/shorten.c libavcodec/svq3.c libavcodec/utils.c libavcodec/version.h libavcodec/wmadec.c libavcodec/xxan.c libavformat/Makefile libavformat/asfdec.c libavformat/dv.c libavformat/mov.c libavformat/nsvdec.c libavformat/utils.c libavformat/version.h libavutil/avutil.h libavutil/error.c libavutil/error.h libswscale/swscale.c libswscale/utils.c libswscale/x86/swscale_template.c tests/ref/acodec/g722 Merged-by: Michael Niedermayer <michaelni@gmx.at>
112 lines
3.3 KiB
C
112 lines
3.3 KiB
C
/*
|
|
* PNG image format
|
|
* Copyright (c) 2003 Fabrice Bellard
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef AVCODEC_PNG_H
|
|
#define AVCODEC_PNG_H
|
|
|
|
#include <stdint.h>
|
|
#include <zlib.h>
|
|
|
|
#include "avcodec.h"
|
|
#include "bytestream.h"
|
|
|
|
#define PNG_COLOR_MASK_PALETTE 1
|
|
#define PNG_COLOR_MASK_COLOR 2
|
|
#define PNG_COLOR_MASK_ALPHA 4
|
|
|
|
#define PNG_COLOR_TYPE_GRAY 0
|
|
#define PNG_COLOR_TYPE_PALETTE (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_PALETTE)
|
|
#define PNG_COLOR_TYPE_RGB (PNG_COLOR_MASK_COLOR)
|
|
#define PNG_COLOR_TYPE_RGB_ALPHA (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_ALPHA)
|
|
#define PNG_COLOR_TYPE_GRAY_ALPHA (PNG_COLOR_MASK_ALPHA)
|
|
|
|
#define PNG_FILTER_TYPE_LOCO 64
|
|
#define PNG_FILTER_VALUE_NONE 0
|
|
#define PNG_FILTER_VALUE_SUB 1
|
|
#define PNG_FILTER_VALUE_UP 2
|
|
#define PNG_FILTER_VALUE_AVG 3
|
|
#define PNG_FILTER_VALUE_PAETH 4
|
|
#define PNG_FILTER_VALUE_MIXED 5
|
|
|
|
#define PNG_IHDR 0x0001
|
|
#define PNG_IDAT 0x0002
|
|
#define PNG_ALLIMAGE 0x0004
|
|
#define PNG_PLTE 0x0008
|
|
|
|
#define NB_PASSES 7
|
|
|
|
extern const uint8_t ff_pngsig[8];
|
|
extern const uint8_t ff_mngsig[8];
|
|
|
|
/* Mask to determine which y pixels are valid in a pass */
|
|
extern const uint8_t ff_png_pass_ymask[NB_PASSES];
|
|
|
|
/* Mask to determine which pixels are valid in a pass */
|
|
extern const uint8_t ff_png_pass_mask[NB_PASSES];
|
|
|
|
void *ff_png_zalloc(void *opaque, unsigned int items, unsigned int size);
|
|
|
|
void ff_png_zfree(void *opaque, void *ptr);
|
|
|
|
int ff_png_get_nb_channels(int color_type);
|
|
|
|
/* compute the row size of an interleaved pass */
|
|
int ff_png_pass_row_size(int pass, int bits_per_pixel, int width);
|
|
|
|
void ff_add_png_paeth_prediction(uint8_t *dst, uint8_t *src, uint8_t *top, int w, int bpp);
|
|
|
|
typedef struct PNGDecContext {
|
|
GetByteContext gb;
|
|
AVFrame picture1, picture2;
|
|
AVFrame *current_picture, *last_picture;
|
|
|
|
int state;
|
|
int width, height;
|
|
int bit_depth;
|
|
int color_type;
|
|
int compression_type;
|
|
int interlace_type;
|
|
int filter_type;
|
|
int channels;
|
|
int bits_per_pixel;
|
|
int bpp;
|
|
|
|
uint8_t *image_buf;
|
|
int image_linesize;
|
|
uint32_t palette[256];
|
|
uint8_t *crow_buf;
|
|
uint8_t *last_row;
|
|
uint8_t *tmp_row;
|
|
int pass;
|
|
int crow_size; /* compressed row size (include filter type) */
|
|
int row_size; /* decompressed row size */
|
|
int pass_row_size; /* decompress row size of the current pass */
|
|
int y;
|
|
z_stream zstream;
|
|
|
|
void (*add_bytes_l2)(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w);
|
|
void (*add_paeth_prediction)(uint8_t *dst, uint8_t *src, uint8_t *top, int w, int bpp);
|
|
} PNGDecContext;
|
|
|
|
void ff_png_init_mmx(PNGDecContext *s);
|
|
|
|
#endif /* AVCODEC_PNG_H */
|