highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tiff: K&R formatting cosmetics

Browse Source
This commit is contained in:
Diego Biurrun 2013-06-01 15:35:11 +02:00
parent f849a77e67
commit 46ce9ded96
3 changed files with 239 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libavcodec/tiff.c
View File

@ -25,19 +25,20 @@
* @author Konstantin Shishkov * @author Konstantin Shishkov
*/ */
#include "avcodec.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 "faxcompr.h"
#include "internal.h"
#include "mathops.h"
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "avcodec.h"
#include "faxcompr.h"
#include "internal.h"
#include "lzw.h"
#include "mathops.h"
#include "tiff.h"
typedef struct TiffContext { typedef struct TiffContext {
AVCodecContext *avctx; AVCodecContext *avctx;
@ -78,10 +79,14 @@ static unsigned tget_long(const uint8_t **p, int le)
static unsigned tget(const uint8_t **p, int type, int le) static unsigned tget(const uint8_t **p, int type, int le)
{ {
switch (type) { switch (type) {
case TIFF_BYTE : return *(*p)++; case TIFF_BYTE:
case TIFF_SHORT: return tget_short(p, le); return *(*p)++;
case TIFF_LONG : return tget_long(p, le); case TIFF_SHORT:
default : return UINT_MAX; return tget_short(p, le);
case TIFF_LONG:
return tget_long(p, le);
default:
return UINT_MAX;
} }
} }
@ -151,8 +156,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);
@ -339,12 +345,11 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start,
buf = start + off; buf = start + off;
} }
} else { } else {
if (count <= 4 && type_sizes[type] * count <= 4) { if (count <= 4 && type_sizes[type] * count <= 4)
buf -= 4; buf -= 4;
} else { else
buf = start + off; buf = start + off;
} }
}
if (buf && (buf < start || buf > end_buf)) { if (buf && (buf < start || buf > end_buf)) {
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
@ -546,8 +551,7 @@ static int decode_frame(AVCodecContext *avctx,
const uint8_t *orig_buf = buf, *end_buf = buf + buf_size; const uint8_t *orig_buf = buf, *end_buf = buf + buf_size;
unsigned off; unsigned off;
int id, le, ret; int id, le, ret;
int i, j, entries; int i, j, entries, stride;
int stride;
unsigned soff, ssize; unsigned soff, ssize;
uint8_t *dst; uint8_t *dst;
@ -678,6 +682,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),
@ -685,5 +690,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"),
}; };

84
libavcodec/tiffenc.c
View File

@ -25,20 +25,20 @@
* @author Bartlomiej Wolowiec * @author Bartlomiej Wolowiec
*/ */
#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/log.h"
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "avcodec.h"
#include "bytestream.h" #include "bytestream.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
@ -60,16 +60,15 @@ typedef struct TiffEncoderContext {
int photometric_interpretation; ///< photometric interpretation int photometric_interpretation; ///< photometric interpretation
int strips; ///< number of strips int strips; ///< number of strips
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
} TiffEncoderContext; } TiffEncoderContext;
/** /**
* Check free space in buffer * Check free space in buffer
* @param s Tiff context * @param s Tiff context
@ -114,9 +113,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;
@ -138,7 +136,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);
@ -157,7 +156,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:
@ -177,7 +175,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:
@ -242,17 +241,15 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
case AV_PIX_FMT_PAL8: case AV_PIX_FMT_PAL8:
pfd = av_pix_fmt_desc_get(avctx->pix_fmt); pfd = av_pix_fmt_desc_get(avctx->pix_fmt);
s->bpp = av_get_bits_per_pixel(pfd); s->bpp = av_get_bits_per_pixel(pfd);
if (pfd->flags & AV_PIX_FMT_FLAG_PAL) { if (pfd->flags & AV_PIX_FMT_FLAG_PAL)
s->photometric_interpretation = 3; s->photometric_interpretation = 3;
} else if (pfd->flags & AV_PIX_FMT_FLAG_RGB) { else if (pfd->flags & AV_PIX_FMT_FLAG_RGB)
s->photometric_interpretation = 2; s->photometric_interpretation = 2;
} else { else
s->photometric_interpretation = 1; s->photometric_interpretation = 1;
}
s->bpp_tab_size = pfd->nb_components; s->bpp_tab_size = pfd->nb_components;
for (i = 0; i < s->bpp_tab_size; i++) { for (i = 0; i < s->bpp_tab_size; i++)
bpp_tab[i] = s->bpp / s->bpp_tab_size; bpp_tab[i] = s->bpp / s->bpp_tab_size;
}
break; break;
case AV_PIX_FMT_MONOBLACK: case AV_PIX_FMT_MONOBLACK:
s->bpp = 1; s->bpp = 1;
@ -269,9 +266,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;
av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt,
&shift_h, &shift_v);
s->bpp = 8 + (16 >> (shift_h + shift_v)); s->bpp = 8 + (16 >> (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;
@ -284,17 +280,22 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
return -1; return -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 (!pkt->data && if (!pkt->data &&
(ret = av_new_packet(pkt, avctx->width * avctx->height * s->bpp * 2 + (ret = av_new_packet(pkt,
avctx->width * avctx->height * s->bpp * 2 +
avctx->height * 4 + FF_MIN_BUFFER_SIZE)) < 0) { avctx->height * 4 + FF_MIN_BUFFER_SIZE)) < 0) {
av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n"); av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n");
return ret; return ret;
@ -321,8 +322,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) {
yuv_line = av_malloc(bytes_per_row); yuv_line = av_malloc(bytes_per_row);
if (yuv_line == NULL) { if (yuv_line == NULL) {
@ -351,8 +352,7 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
pack_yuv(s, yuv_line, j); pack_yuv(s, yuv_line, j);
memcpy(zbuf + zn, yuv_line, bytes_per_row); memcpy(zbuf + zn, 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;
@ -367,7 +367,6 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
strip_sizes[0] = ptr - pkt->data - strip_offsets[0]; strip_sizes[0] = ptr - pkt->data - strip_offsets[0];
} else } else
#endif #endif
{
if (s->compr == TIFF_LZW) { if (s->compr == TIFF_LZW) {
s->lzws = av_malloc(ff_lzw_encode_state_size); s->lzws = av_malloc(ff_lzw_encode_state_size);
if (!s->lzws) { if (!s->lzws) {
@ -378,7 +377,8 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
for (i = 0; i < s->height; i++) { for (i = 0; i < s->height; i++) {
if (strip_sizes[i / s->rps] == 0) { if (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);
} }
strip_offsets[i / s->rps] = ptr - pkt->data; strip_offsets[i / s->rps] = ptr - pkt->data;
@ -387,8 +387,7 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
pack_yuv(s, yuv_line, i); pack_yuv(s, yuv_line, i);
ret = encode_strip(s, yuv_line, ptr, bytes_per_row, s->compr); ret = encode_strip(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) {
@ -397,7 +396,8 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
} }
strip_sizes[i / s->rps] += ret; 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);
strip_sizes[(i / s->rps)] += ret; strip_sizes[(i / s->rps)] += ret;
ptr += ret; ptr += ret;
@ -405,7 +405,6 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
} }
if (s->compr == TIFF_LZW) if (s->compr == TIFF_LZW)
av_free(s->lzws); av_free(s->lzws);
}
s->num_entries = 0; s->num_entries = 0;
@ -449,7 +448,8 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
add_entry(s, TIFF_YCBCR_SUBSAMPLING, TIFF_SHORT, 2, s->subsampling); add_entry(s, TIFF_YCBCR_SUBSAMPLING, TIFF_SHORT, 2, s->subsampling);
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);
@ -492,6 +492,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),
@ -504,6 +505,5 @@ AVCodec ff_tiff_encoder = {
AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P,
AV_PIX_FMT_NONE AV_PIX_FMT_NONE
}, },
.long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
.priv_class = &tiffenc_class, .priv_class = &tiffenc_class,
}; };