generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee'

Browse Source 
* commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee':
  tiff: K&R formatting cosmetics

Conflicts:
	libavcodec/tiff.c
	libavcodec/tiff.h
	libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-06-03 11:44:11 +02:00
commit 7cb5467a52
3 changed files with 238 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libavcodec/tiff.c
View File

@ -24,22 +24,23 @@
* @author Konstantin Shishkov * @author Konstantin Shishkov
*/ */
#include "avcodec.h"
#include "bytestream.h"
#include "config.h" #include "config.h"
#if CONFIG_ZLIB #if CONFIG_ZLIB
#include <zlib.h> #include <zlib.h>
#endif #endif
#include "lzw.h"
#include "tiff.h"
#include "tiff_data.h"
#include "faxcompr.h"
#include "internal.h"
#include "mathops.h"
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/avstring.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/avstring.h" #include "avcodec.h"
#include "bytestream.h"
#include "faxcompr.h"
#include "internal.h"
#include "lzw.h"
#include "mathops.h"
#include "tiff.h"
#include "tiff_data.h"
typedef struct TiffContext { typedef struct TiffContext {
AVCodecContext *avctx; AVCodecContext *avctx;
@ -90,10 +91,14 @@ static double tget_double(GetByteContext *gb, int le)
static unsigned tget(GetByteContext *gb, int type, int le) static unsigned tget(GetByteContext *gb, int type, int le)
{ {
switch (type) { switch (type) {
case TIFF_BYTE : return bytestream2_get_byte(gb); case TIFF_BYTE:
case TIFF_SHORT: return tget_short(gb, le); return bytestream2_get_byte(gb);
case TIFF_LONG : return tget_long(gb, le); case TIFF_SHORT:
default : return UINT_MAX; return tget_short(gb, le);
case TIFF_LONG:
return tget_long(gb, le);
default:
return UINT_MAX;
} }
} }
@ -488,8 +493,9 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
return ret; return ret;
} }
} }
if (s->compr == TIFF_CCITT_RLE || s->compr == TIFF_G3 if (s->compr == TIFF_CCITT_RLE ||
|| s->compr == TIFF_G4) { s->compr == TIFF_G3 ||
s->compr == TIFF_G4) {
int i, ret = 0; int i, ret = 0;
uint8_t *src2 = av_malloc((unsigned)size + uint8_t *src2 = av_malloc((unsigned)size +
FF_INPUT_BUFFER_PADDING_SIZE); FF_INPUT_BUFFER_PADDING_SIZE);
@ -706,12 +712,11 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
bytestream2_seek(&s->gb, off, SEEK_SET); bytestream2_seek(&s->gb, off, SEEK_SET);
} }
} else { } else {
if (count <= 4 && type_sizes[type] * count <= 4) { if (count <= 4 && type_sizes[type] * count <= 4)
bytestream2_seek(&s->gb, -4, SEEK_CUR); bytestream2_seek(&s->gb, -4, SEEK_CUR);
} else { else
bytestream2_seek(&s->gb, off, SEEK_SET); bytestream2_seek(&s->gb, off, SEEK_SET);
} }
}
switch (tag) { switch (tag) {
case TIFF_WIDTH: case TIFF_WIDTH:
@ -1046,8 +1051,7 @@ static int decode_frame(AVCodecContext *avctx,
AVFrame *const p = data; AVFrame *const p = data;
unsigned off; unsigned off;
int id, le, ret, plane, planes; int id, le, ret, plane, planes;
int i, j, entries; int i, j, entries, stride;
int stride;
unsigned soff, ssize; unsigned soff, ssize;
uint8_t *dst; uint8_t *dst;
GetByteContext stripsizes; GetByteContext stripsizes;
@ -1244,6 +1248,7 @@ static av_cold int tiff_end(AVCodecContext *avctx)
AVCodec ff_tiff_decoder = { AVCodec ff_tiff_decoder = {
.name = "tiff", .name = "tiff",
.long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_TIFF, .id = AV_CODEC_ID_TIFF,
.priv_data_size = sizeof(TiffContext), .priv_data_size = sizeof(TiffContext),
@ -1251,5 +1256,4 @@ AVCodec ff_tiff_decoder = {
.close = tiff_end, .close = tiff_end,
.decode = decode_frame, .decode = decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
}; };

73
libavcodec/tiffenc.c
View File

@ -25,22 +25,22 @@
* @author Bartlomiej Wolowiec * @author Bartlomiej Wolowiec
*/ */
#include "libavutil/imgutils.h"
#include "libavutil/log.h"
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "avcodec.h"
#include "config.h" #include "config.h"
#if CONFIG_ZLIB #if CONFIG_ZLIB
#include <zlib.h> #include <zlib.h>
#endif #endif
#include "libavutil/imgutils.h"
#include "libavutil/log.h"
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#include "internal.h" #include "internal.h"
#include "tiff.h"
#include "rle.h"
#include "lzw.h" #include "lzw.h"
#include "put_bits.h" #include "put_bits.h"
#include "rle.h"
#include "tiff.h"
#define TIFF_MAX_ENTRY 32 #define TIFF_MAX_ENTRY 32
@ -68,17 +68,16 @@ typedef struct TiffEncoderContext {
uint8_t *yuv_line; uint8_t *yuv_line;
unsigned int yuv_line_size; unsigned int yuv_line_size;
int rps; ///< row per strip int rps; ///< row per strip
uint8_t entries[TIFF_MAX_ENTRY*12]; ///< entires in header uint8_t entries[TIFF_MAX_ENTRY * 12]; ///< entries in header
int num_entries; ///< number of entires int num_entries; ///< number of entries
uint8_t **buf; ///< actual position in buffer uint8_t **buf; ///< actual position in buffer
uint8_t *buf_start; ///< pointer to first byte in buffer uint8_t *buf_start; ///< pointer to first byte in buffer
int buf_size; ///< buffer size int buf_size; ///< buffer size
uint16_t subsampling[2]; ///< YUV subsampling factors uint16_t subsampling[2]; ///< YUV subsampling factors
struct LZWEncodeState *lzws; ///< LZW Encode state struct LZWEncodeState *lzws; ///< LZW encode state
uint32_t dpi; ///< image resolution in DPI uint32_t dpi; ///< image resolution in DPI
} TiffEncoderContext; } TiffEncoderContext;
/** /**
* Check free space in buffer. * Check free space in buffer.
* *
@ -125,9 +124,8 @@ static void tnput(uint8_t ** p, int n, const uint8_t * val, enum TiffTypes type,
* @param count the number of values * @param count the number of values
* @param ptr_val pointer to values * @param ptr_val pointer to values
*/ */
static void add_entry(TiffEncoderContext * s, static void add_entry(TiffEncoderContext *s, enum TiffTags tag,
enum TiffTags tag, enum TiffTypes type, int count, enum TiffTypes type, int count, const void *ptr_val)
const void *ptr_val)
{ {
uint8_t *entries_ptr = s->entries + 12 * s->num_entries; uint8_t *entries_ptr = s->entries + 12 * s->num_entries;
@ -149,7 +147,8 @@ static void add_entry(TiffEncoderContext * s,
} }
static void add_entry1(TiffEncoderContext *s, static void add_entry1(TiffEncoderContext *s,
enum TiffTags tag, enum TiffTypes type, int val){ enum TiffTags tag, enum TiffTypes type, int val)
{
uint16_t w = val; uint16_t w = val;
uint32_t dw = val; uint32_t dw = val;
add_entry(s, tag, type, 1, type == TIFF_SHORT ? (void *)&w : (void *)&dw); add_entry(s, tag, type, 1, type == TIFF_SHORT ? (void *)&w : (void *)&dw);
@ -168,7 +167,6 @@ static void add_entry1(TiffEncoderContext * s,
static int encode_strip(TiffEncoderContext *s, const int8_t *src, static int encode_strip(TiffEncoderContext *s, const int8_t *src,
uint8_t *dst, int n, int compr) uint8_t *dst, int n, int compr)
{ {
switch (compr) { switch (compr) {
#if CONFIG_ZLIB #if CONFIG_ZLIB
case TIFF_DEFLATE: case TIFF_DEFLATE:
@ -188,7 +186,8 @@ static int encode_strip(TiffEncoderContext * s, const int8_t * src,
memcpy(dst, src, n); memcpy(dst, src, n);
return n; return n;
case TIFF_PACKBITS: case TIFF_PACKBITS:
return ff_rle_encode(dst, s->buf_size - (*s->buf - s->buf_start), src, 1, n, 2, 0xff, -1, 0); return ff_rle_encode(dst, s->buf_size - (*s->buf - s->buf_start),
src, 1, n, 2, 0xff, -1, 0);
case TIFF_LZW: case TIFF_LZW:
return ff_lzw_encode(s->lzws, src, n); return ff_lzw_encode(s->lzws, src, n);
default: default:
@ -292,8 +291,8 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
case AV_PIX_FMT_YUV444P: case AV_PIX_FMT_YUV444P:
case AV_PIX_FMT_YUV410P: case AV_PIX_FMT_YUV410P:
case AV_PIX_FMT_YUV411P: case AV_PIX_FMT_YUV411P:
av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &shift_h, &shift_v);
s->photometric_interpretation = 6; s->photometric_interpretation = 6;
avcodec_get_chroma_sub_sample(avctx->pix_fmt, &shift_h, &shift_v);
s->subsampling[0] = 1 << shift_h; s->subsampling[0] = 1 << shift_h;
s->subsampling[1] = 1 << shift_v; s->subsampling[1] = 1 << shift_v;
is_yuv = 1; is_yuv = 1;
@ -307,16 +306,21 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
for (i = 0; i < s->bpp_tab_size; i++) for (i = 0; i < s->bpp_tab_size; i++)
bpp_tab[i] = desc->comp[i].depth_minus1 + 1; bpp_tab[i] = desc->comp[i].depth_minus1 + 1;
if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE || s->compr == TIFF_LZW) if (s->compr == TIFF_DEFLATE ||
//best choose for DEFLATE s->compr == TIFF_ADOBE_DEFLATE ||
s->compr == TIFF_LZW)
// best choice for DEFLATE
s->rps = s->height; s->rps = s->height;
else else
s->rps = FFMAX(8192 / (((s->width * s->bpp) >> 3) + 1), 1); // suggest size of strip // suggest size of strip
s->rps = ((s->rps - 1) / s->subsampling[1] + 1) * s->subsampling[1]; // round rps up s->rps = FFMAX(8192 / (((s->width * s->bpp) >> 3) + 1), 1);
// round rps up
s->rps = ((s->rps - 1) / s->subsampling[1] + 1) * s->subsampling[1];
strips = (s->height - 1) / s->rps + 1; strips = (s->height - 1) / s->rps + 1;
if ((ret = ff_alloc_packet2(avctx, pkt, avctx->width * avctx->height * s->bpp * 2 + if ((ret = ff_alloc_packet2(avctx, pkt,
avctx->width * avctx->height * s->bpp * 2 +
avctx->height * 4 + FF_MIN_BUFFER_SIZE)) < 0) avctx->height * 4 + FF_MIN_BUFFER_SIZE)) < 0)
return ret; return ret;
ptr = pkt->data; ptr = pkt->data;
@ -342,8 +346,8 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
goto fail; goto fail;
} }
bytes_per_row = (((s->width - 1)/s->subsampling[0] + 1) * s->bpp bytes_per_row = (((s->width - 1) / s->subsampling[0] + 1) * s->bpp *
* s->subsampling[0] * s->subsampling[1] + 7) >> 3; s->subsampling[0] * s->subsampling[1] + 7) >> 3;
if (is_yuv) { if (is_yuv) {
av_fast_padded_malloc(&s->yuv_line, &s->yuv_line_size, bytes_per_row); av_fast_padded_malloc(&s->yuv_line, &s->yuv_line_size, bytes_per_row);
if (s->yuv_line == NULL) { if (s->yuv_line == NULL) {
@ -372,8 +376,7 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
pack_yuv(s, s->yuv_line, j); pack_yuv(s, s->yuv_line, j);
memcpy(zbuf + zn, s->yuv_line, bytes_per_row); memcpy(zbuf + zn, s->yuv_line, bytes_per_row);
j += s->subsampling[1] - 1; j += s->subsampling[1] - 1;
} } else
else
memcpy(zbuf + j * bytes_per_row, memcpy(zbuf + j * bytes_per_row,
p->data[0] + j * p->linesize[0], bytes_per_row); p->data[0] + j * p->linesize[0], bytes_per_row);
zn += bytes_per_row; zn += bytes_per_row;
@ -399,7 +402,8 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
for (i = 0; i < s->height; i++) { for (i = 0; i < s->height; i++) {
if (s->strip_sizes[i / s->rps] == 0) { if (s->strip_sizes[i / s->rps] == 0) {
if (s->compr == TIFF_LZW) { if (s->compr == TIFF_LZW) {
ff_lzw_encode_init(s->lzws, ptr, s->buf_size - (*s->buf - s->buf_start), ff_lzw_encode_init(s->lzws, ptr,
s->buf_size - (*s->buf - s->buf_start),
12, FF_LZW_TIFF, put_bits); 12, FF_LZW_TIFF, put_bits);
} }
s->strip_offsets[i / s->rps] = ptr - pkt->data; s->strip_offsets[i / s->rps] = ptr - pkt->data;
@ -408,8 +412,7 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
pack_yuv(s, s->yuv_line, i); pack_yuv(s, s->yuv_line, i);
ret = encode_strip(s, s->yuv_line, ptr, bytes_per_row, s->compr); ret = encode_strip(s, s->yuv_line, ptr, bytes_per_row, s->compr);
i += s->subsampling[1] - 1; i += s->subsampling[1] - 1;
} } else
else
ret = encode_strip(s, p->data[0] + i * p->linesize[0], ret = encode_strip(s, p->data[0] + i * p->linesize[0],
ptr, bytes_per_row, s->compr); ptr, bytes_per_row, s->compr);
if (ret < 0) { if (ret < 0) {
@ -418,7 +421,8 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
} }
s->strip_sizes[i / s->rps] += ret; s->strip_sizes[i / s->rps] += ret;
ptr += ret; ptr += ret;
if(s->compr == TIFF_LZW && (i==s->height-1 || i%s->rps == s->rps-1)){ if (s->compr == TIFF_LZW &&
(i == s->height - 1 || i % s->rps == s->rps - 1)) {
ret = ff_lzw_encode_flush(s->lzws, flush_put_bits); ret = ff_lzw_encode_flush(s->lzws, flush_put_bits);
s->strip_sizes[(i / s->rps)] += ret; s->strip_sizes[(i / s->rps)] += ret;
ptr += ret; ptr += ret;
@ -474,7 +478,8 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
add_entry1(s, TIFF_YCBCR_POSITIONING, TIFF_SHORT, 2); add_entry1(s, TIFF_YCBCR_POSITIONING, TIFF_SHORT, 2);
add_entry(s, TIFF_REFERENCE_BW, TIFF_RATIONAL, 6, refbw); add_entry(s, TIFF_REFERENCE_BW, TIFF_RATIONAL, 6, refbw);
} }
bytestream_put_le32(&offset, ptr - pkt->data); // write offset to dir // write offset to dir
bytestream_put_le32(&offset, ptr - pkt->data);
if (check_size(s, 6 + s->num_entries * 12)) { if (check_size(s, 6 + s->num_entries * 12)) {
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
@ -526,6 +531,7 @@ static const AVClass tiffenc_class = {
AVCodec ff_tiff_encoder = { AVCodec ff_tiff_encoder = {
.name = "tiff", .name = "tiff",
.long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_TIFF, .id = AV_CODEC_ID_TIFF,
.priv_data_size = sizeof(TiffEncoderContext), .priv_data_size = sizeof(TiffEncoderContext),
@ -541,6 +547,5 @@ AVCodec ff_tiff_encoder = {
AV_PIX_FMT_RGBA, AV_PIX_FMT_RGBA64LE, AV_PIX_FMT_RGBA, AV_PIX_FMT_RGBA64LE,
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
}, },
.long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
.priv_class = &tiffenc_class, .priv_class = &tiffenc_class,
}; };