mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-23 19:30:05 +00:00
Merge commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee'
* 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
commit
7cb5467a52
@ -24,22 +24,23 @@
|
||||
* @author Konstantin Shishkov
|
||||
*/
|
||||
|
||||
#include "avcodec.h"
|
||||
#include "bytestream.h"
|
||||
#include "config.h"
|
||||
#if CONFIG_ZLIB
|
||||
#include <zlib.h>
|
||||
#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/avstring.h"
|
||||
#include "libavutil/intreadwrite.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 {
|
||||
AVCodecContext *avctx;
|
||||
@ -90,10 +91,14 @@ static double tget_double(GetByteContext *gb, int le)
|
||||
static unsigned tget(GetByteContext *gb, int type, int le)
|
||||
{
|
||||
switch (type) {
|
||||
case TIFF_BYTE : return bytestream2_get_byte(gb);
|
||||
case TIFF_SHORT: return tget_short(gb, le);
|
||||
case TIFF_LONG : return tget_long(gb, le);
|
||||
default : return UINT_MAX;
|
||||
case TIFF_BYTE:
|
||||
return bytestream2_get_byte(gb);
|
||||
case TIFF_SHORT:
|
||||
return tget_short(gb, le);
|
||||
case TIFF_LONG:
|
||||
return tget_long(gb, le);
|
||||
default:
|
||||
return UINT_MAX;
|
||||
}
|
||||
}
|
||||
|
||||
@ -462,7 +467,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
|
||||
}
|
||||
src = zbuf;
|
||||
for (line = 0; line < lines; line++) {
|
||||
if(s->bpp < 8 && s->avctx->pix_fmt == AV_PIX_FMT_PAL8){
|
||||
if(s->bpp < 8 && s->avctx->pix_fmt == AV_PIX_FMT_PAL8) {
|
||||
horizontal_fill(s->bpp, dst, 1, src, 0, width, 0);
|
||||
}else{
|
||||
memcpy(dst, src, width);
|
||||
@ -488,8 +493,9 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride,
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
if (s->compr == TIFF_CCITT_RLE || s->compr == TIFF_G3
|
||||
|| s->compr == TIFF_G4) {
|
||||
if (s->compr == TIFF_CCITT_RLE ||
|
||||
s->compr == TIFF_G3 ||
|
||||
s->compr == TIFF_G4) {
|
||||
int i, ret = 0;
|
||||
uint8_t *src2 = av_malloc((unsigned)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);
|
||||
}
|
||||
} else {
|
||||
if (count <= 4 && type_sizes[type] * count <= 4) {
|
||||
if (count <= 4 && type_sizes[type] * count <= 4)
|
||||
bytestream2_seek(&s->gb, -4, SEEK_CUR);
|
||||
} else {
|
||||
else
|
||||
bytestream2_seek(&s->gb, off, SEEK_SET);
|
||||
}
|
||||
}
|
||||
|
||||
switch (tag) {
|
||||
case TIFF_WIDTH:
|
||||
@ -1046,8 +1051,7 @@ static int decode_frame(AVCodecContext *avctx,
|
||||
AVFrame *const p = data;
|
||||
unsigned off;
|
||||
int id, le, ret, plane, planes;
|
||||
int i, j, entries;
|
||||
int stride;
|
||||
int i, j, entries, stride;
|
||||
unsigned soff, ssize;
|
||||
uint8_t *dst;
|
||||
GetByteContext stripsizes;
|
||||
@ -1055,7 +1059,7 @@ static int decode_frame(AVCodecContext *avctx,
|
||||
|
||||
bytestream2_init(&s->gb, avpkt->data, avpkt->size);
|
||||
|
||||
//parse image header
|
||||
// parse image header
|
||||
if (avpkt->size < 8)
|
||||
return AVERROR_INVALIDDATA;
|
||||
id = bytestream2_get_le16u(&s->gb);
|
||||
@ -1244,6 +1248,7 @@ static av_cold int tiff_end(AVCodecContext *avctx)
|
||||
|
||||
AVCodec ff_tiff_decoder = {
|
||||
.name = "tiff",
|
||||
.long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
|
||||
.type = AVMEDIA_TYPE_VIDEO,
|
||||
.id = AV_CODEC_ID_TIFF,
|
||||
.priv_data_size = sizeof(TiffContext),
|
||||
@ -1251,5 +1256,4 @@ AVCodec ff_tiff_decoder = {
|
||||
.close = tiff_end,
|
||||
.decode = decode_frame,
|
||||
.capabilities = CODEC_CAP_DR1,
|
||||
.long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
|
||||
};
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
#include <stdint.h>
|
||||
|
||||
/** abridged list of TIFF tags */
|
||||
enum TiffTags{
|
||||
enum TiffTags {
|
||||
TIFF_SUBFILE = 0xfe,
|
||||
TIFF_WIDTH = 0x100,
|
||||
TIFF_HEIGHT,
|
||||
@ -77,14 +77,14 @@ enum TiffTags{
|
||||
TIFF_COPYRIGHT = 0x8298,
|
||||
TIFF_MODEL_TIEPOINT = 0x8482,
|
||||
TIFF_MODEL_PIXEL_SCALE = 0x830E,
|
||||
TIFF_MODEL_TRANSFORMATION = 0x8480,
|
||||
TIFF_MODEL_TRANSFORMATION= 0x8480,
|
||||
TIFF_GEO_KEY_DIRECTORY = 0x87AF,
|
||||
TIFF_GEO_DOUBLE_PARAMS = 0x87B0,
|
||||
TIFF_GEO_ASCII_PARAMS = 0x87B1
|
||||
};
|
||||
|
||||
/** list of TIFF compression types */
|
||||
enum TiffCompr{
|
||||
enum TiffCompr {
|
||||
TIFF_RAW = 1,
|
||||
TIFF_CCITT_RLE,
|
||||
TIFF_G3,
|
||||
@ -97,7 +97,7 @@ enum TiffCompr{
|
||||
TIFF_DEFLATE = 0x80B2
|
||||
};
|
||||
|
||||
enum TiffTypes{
|
||||
enum TiffTypes {
|
||||
TIFF_BYTE = 1,
|
||||
TIFF_STRING,
|
||||
TIFF_SHORT,
|
||||
|
||||
@ -25,22 +25,22 @@
|
||||
* @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"
|
||||
#if CONFIG_ZLIB
|
||||
#include <zlib.h>
|
||||
#endif
|
||||
|
||||
#include "libavutil/imgutils.h"
|
||||
#include "libavutil/log.h"
|
||||
#include "libavutil/opt.h"
|
||||
#include "libavutil/pixdesc.h"
|
||||
#include "avcodec.h"
|
||||
#include "bytestream.h"
|
||||
#include "internal.h"
|
||||
#include "tiff.h"
|
||||
#include "rle.h"
|
||||
#include "lzw.h"
|
||||
#include "put_bits.h"
|
||||
#include "rle.h"
|
||||
#include "tiff.h"
|
||||
|
||||
#define TIFF_MAX_ENTRY 32
|
||||
|
||||
@ -68,17 +68,16 @@ typedef struct TiffEncoderContext {
|
||||
uint8_t *yuv_line;
|
||||
unsigned int yuv_line_size;
|
||||
int rps; ///< row per strip
|
||||
uint8_t entries[TIFF_MAX_ENTRY*12]; ///< entires in header
|
||||
int num_entries; ///< number of entires
|
||||
uint8_t entries[TIFF_MAX_ENTRY * 12]; ///< entries in header
|
||||
int num_entries; ///< number of entries
|
||||
uint8_t **buf; ///< actual position in buffer
|
||||
uint8_t *buf_start; ///< pointer to first byte in buffer
|
||||
int buf_size; ///< buffer size
|
||||
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
|
||||
} TiffEncoderContext;
|
||||
|
||||
|
||||
/**
|
||||
* Check free space in buffer.
|
||||
*
|
||||
@ -86,7 +85,7 @@ typedef struct TiffEncoderContext {
|
||||
* @param need Needed bytes
|
||||
* @return 0 - ok, 1 - no free space
|
||||
*/
|
||||
static inline int check_size(TiffEncoderContext * s, uint64_t need)
|
||||
static inline int check_size(TiffEncoderContext *s, uint64_t need)
|
||||
{
|
||||
if (s->buf_size < *s->buf - s->buf_start + need) {
|
||||
*s->buf = s->buf_start + s->buf_size + 1;
|
||||
@ -105,12 +104,12 @@ static inline int check_size(TiffEncoderContext * s, uint64_t need)
|
||||
* @param type type of values
|
||||
* @param flip = 0 - normal copy, >0 - flip
|
||||
*/
|
||||
static void tnput(uint8_t ** p, int n, const uint8_t * val, enum TiffTypes type,
|
||||
static void tnput(uint8_t **p, int n, const uint8_t *val, enum TiffTypes type,
|
||||
int flip)
|
||||
{
|
||||
int i;
|
||||
#if HAVE_BIGENDIAN
|
||||
flip ^= ((int[]) {0, 0, 0, 1, 3, 3})[type];
|
||||
flip ^= ((int[]) { 0, 0, 0, 1, 3, 3 })[type];
|
||||
#endif
|
||||
for (i = 0; i < n * type_sizes2[type]; i++)
|
||||
*(*p)++ = val[i ^ flip];
|
||||
@ -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 ptr_val pointer to values
|
||||
*/
|
||||
static void add_entry(TiffEncoderContext * s,
|
||||
enum TiffTags tag, enum TiffTypes type, int count,
|
||||
const void *ptr_val)
|
||||
static void add_entry(TiffEncoderContext *s, enum TiffTags tag,
|
||||
enum TiffTypes type, int count, const void *ptr_val)
|
||||
{
|
||||
uint8_t *entries_ptr = s->entries + 12 * s->num_entries;
|
||||
|
||||
@ -148,10 +146,11 @@ static void add_entry(TiffEncoderContext * s,
|
||||
s->num_entries++;
|
||||
}
|
||||
|
||||
static void add_entry1(TiffEncoderContext * s,
|
||||
enum TiffTags tag, enum TiffTypes type, int val){
|
||||
static void add_entry1(TiffEncoderContext *s,
|
||||
enum TiffTags tag, enum TiffTypes type, int 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);
|
||||
}
|
||||
|
||||
@ -165,10 +164,9 @@ static void add_entry1(TiffEncoderContext * s,
|
||||
* @param compr compression method
|
||||
* @return number of output bytes. If an output error is encountered, -1 is returned
|
||||
*/
|
||||
static int encode_strip(TiffEncoderContext * s, const int8_t * src,
|
||||
uint8_t * dst, int n, int compr)
|
||||
static int encode_strip(TiffEncoderContext *s, const int8_t *src,
|
||||
uint8_t *dst, int n, int compr)
|
||||
{
|
||||
|
||||
switch (compr) {
|
||||
#if CONFIG_ZLIB
|
||||
case TIFF_DEFLATE:
|
||||
@ -188,7 +186,8 @@ static int encode_strip(TiffEncoderContext * s, const int8_t * src,
|
||||
memcpy(dst, src, n);
|
||||
return n;
|
||||
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:
|
||||
return ff_lzw_encode(s->lzws, src, n);
|
||||
default:
|
||||
@ -196,15 +195,15 @@ static int encode_strip(TiffEncoderContext * s, const int8_t * src,
|
||||
}
|
||||
}
|
||||
|
||||
static void pack_yuv(TiffEncoderContext * s, uint8_t * dst, int lnum)
|
||||
static void pack_yuv(TiffEncoderContext *s, uint8_t *dst, int lnum)
|
||||
{
|
||||
AVFrame *p = &s->picture;
|
||||
int i, j, k;
|
||||
int w = (s->width - 1) / s->subsampling[0] + 1;
|
||||
uint8_t *pu = &p->data[1][lnum / s->subsampling[1] * p->linesize[1]];
|
||||
uint8_t *pv = &p->data[2][lnum / s->subsampling[1] * p->linesize[2]];
|
||||
if(s->width % s->subsampling[0] || s->height % s->subsampling[1]){
|
||||
for (i = 0; i < w; i++){
|
||||
if (s->width % s->subsampling[0] || s->height % s->subsampling[1]) {
|
||||
for (i = 0; i < w; i++) {
|
||||
for (j = 0; j < s->subsampling[1]; j++)
|
||||
for (k = 0; k < s->subsampling[0]; k++)
|
||||
*dst++ = p->data[0][FFMIN(lnum + j, s->height-1) * p->linesize[0] +
|
||||
@ -213,7 +212,7 @@ static void pack_yuv(TiffEncoderContext * s, uint8_t * dst, int lnum)
|
||||
*dst++ = *pv++;
|
||||
}
|
||||
}else{
|
||||
for (i = 0; i < w; i++){
|
||||
for (i = 0; i < w; i++) {
|
||||
for (j = 0; j < s->subsampling[1]; j++)
|
||||
for (k = 0; k < s->subsampling[0]; k++)
|
||||
*dst++ = p->data[0][(lnum + j) * p->linesize[0] +
|
||||
@ -228,7 +227,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
|
||||
{
|
||||
TiffEncoderContext *s = avctx->priv_data;
|
||||
|
||||
avctx->coded_frame= &s->picture;
|
||||
avctx->coded_frame = &s->picture;
|
||||
avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
|
||||
avctx->coded_frame->key_frame = 1;
|
||||
s->avctx = avctx;
|
||||
@ -236,7 +235,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
|
||||
static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
|
||||
const AVFrame *pict, int *got_packet)
|
||||
{
|
||||
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
|
||||
@ -292,8 +291,8 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
|
||||
case AV_PIX_FMT_YUV444P:
|
||||
case AV_PIX_FMT_YUV410P:
|
||||
case AV_PIX_FMT_YUV411P:
|
||||
av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &shift_h, &shift_v);
|
||||
s->photometric_interpretation = 6;
|
||||
avcodec_get_chroma_sub_sample(avctx->pix_fmt, &shift_h, &shift_v);
|
||||
s->subsampling[0] = 1 << shift_h;
|
||||
s->subsampling[1] = 1 << shift_v;
|
||||
is_yuv = 1;
|
||||
@ -307,16 +306,21 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
|
||||
for (i = 0; i < s->bpp_tab_size; i++)
|
||||
bpp_tab[i] = desc->comp[i].depth_minus1 + 1;
|
||||
|
||||
if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE || s->compr == TIFF_LZW)
|
||||
//best choose for DEFLATE
|
||||
if (s->compr == TIFF_DEFLATE ||
|
||||
s->compr == TIFF_ADOBE_DEFLATE ||
|
||||
s->compr == TIFF_LZW)
|
||||
// best choice for DEFLATE
|
||||
s->rps = s->height;
|
||||
else
|
||||
s->rps = FFMAX(8192 / (((s->width * s->bpp) >> 3) + 1), 1); // suggest size of strip
|
||||
s->rps = ((s->rps - 1) / s->subsampling[1] + 1) * s->subsampling[1]; // round rps up
|
||||
// suggest size of strip
|
||||
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;
|
||||
|
||||
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)
|
||||
return ret;
|
||||
ptr = pkt->data;
|
||||
@ -334,7 +338,7 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
|
||||
offset = ptr;
|
||||
bytestream_put_le32(&ptr, 0);
|
||||
|
||||
av_fast_padded_mallocz(&s->strip_sizes, &s->strip_sizes_size, sizeof(s->strip_sizes[0]) * strips);
|
||||
av_fast_padded_mallocz(&s->strip_sizes , &s->strip_sizes_size , sizeof(s->strip_sizes [0]) * strips);
|
||||
av_fast_padded_mallocz(&s->strip_offsets, &s->strip_offsets_size, sizeof(s->strip_offsets[0]) * strips);
|
||||
|
||||
if (!s->strip_sizes || !s->strip_offsets) {
|
||||
@ -342,11 +346,11 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
|
||||
goto fail;
|
||||
}
|
||||
|
||||
bytes_per_row = (((s->width - 1)/s->subsampling[0] + 1) * s->bpp
|
||||
* s->subsampling[0] * s->subsampling[1] + 7) >> 3;
|
||||
if (is_yuv){
|
||||
bytes_per_row = (((s->width - 1) / s->subsampling[0] + 1) * s->bpp *
|
||||
s->subsampling[0] * s->subsampling[1] + 7) >> 3;
|
||||
if (is_yuv) {
|
||||
av_fast_padded_malloc(&s->yuv_line, &s->yuv_line_size, bytes_per_row);
|
||||
if (s->yuv_line == NULL){
|
||||
if (s->yuv_line == NULL) {
|
||||
av_log(s->avctx, AV_LOG_ERROR, "Not enough memory\n");
|
||||
ret = AVERROR(ENOMEM);
|
||||
goto fail;
|
||||
@ -368,12 +372,11 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
|
||||
s->strip_offsets[0] = ptr - pkt->data;
|
||||
zn = 0;
|
||||
for (j = 0; j < s->rps; j++) {
|
||||
if (is_yuv){
|
||||
if (is_yuv) {
|
||||
pack_yuv(s, s->yuv_line, j);
|
||||
memcpy(zbuf + zn, s->yuv_line, bytes_per_row);
|
||||
j += s->subsampling[1] - 1;
|
||||
}
|
||||
else
|
||||
} else
|
||||
memcpy(zbuf + j * bytes_per_row,
|
||||
p->data[0] + j * p->linesize[0], bytes_per_row);
|
||||
zn += bytes_per_row;
|
||||
@ -398,18 +401,18 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
|
||||
}
|
||||
for (i = 0; i < s->height; i++) {
|
||||
if (s->strip_sizes[i / s->rps] == 0) {
|
||||
if(s->compr == TIFF_LZW){
|
||||
ff_lzw_encode_init(s->lzws, ptr, s->buf_size - (*s->buf - s->buf_start),
|
||||
if (s->compr == TIFF_LZW) {
|
||||
ff_lzw_encode_init(s->lzws, ptr,
|
||||
s->buf_size - (*s->buf - s->buf_start),
|
||||
12, FF_LZW_TIFF, put_bits);
|
||||
}
|
||||
s->strip_offsets[i / s->rps] = ptr - pkt->data;
|
||||
}
|
||||
if (is_yuv){
|
||||
if (is_yuv) {
|
||||
pack_yuv(s, s->yuv_line, i);
|
||||
ret = encode_strip(s, s->yuv_line, ptr, bytes_per_row, s->compr);
|
||||
i += s->subsampling[1] - 1;
|
||||
}
|
||||
else
|
||||
} else
|
||||
ret = encode_strip(s, p->data[0] + i * p->linesize[0],
|
||||
ptr, bytes_per_row, s->compr);
|
||||
if (ret < 0) {
|
||||
@ -418,39 +421,40 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
|
||||
}
|
||||
s->strip_sizes[i / s->rps] += 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);
|
||||
s->strip_sizes[(i / s->rps )] += ret ;
|
||||
s->strip_sizes[(i / s->rps)] += ret;
|
||||
ptr += ret;
|
||||
}
|
||||
}
|
||||
if(s->compr == TIFF_LZW)
|
||||
if (s->compr == TIFF_LZW)
|
||||
av_free(s->lzws);
|
||||
}
|
||||
|
||||
s->num_entries = 0;
|
||||
|
||||
add_entry1(s,TIFF_SUBFILE, TIFF_LONG, 0);
|
||||
add_entry1(s,TIFF_WIDTH, TIFF_LONG, s->width);
|
||||
add_entry1(s,TIFF_HEIGHT, TIFF_LONG, s->height);
|
||||
add_entry1(s, TIFF_SUBFILE, TIFF_LONG, 0);
|
||||
add_entry1(s, TIFF_WIDTH, TIFF_LONG, s->width);
|
||||
add_entry1(s, TIFF_HEIGHT, TIFF_LONG, s->height);
|
||||
|
||||
if (s->bpp_tab_size)
|
||||
add_entry(s, TIFF_BPP, TIFF_SHORT, s->bpp_tab_size, bpp_tab);
|
||||
|
||||
add_entry1(s,TIFF_COMPR, TIFF_SHORT, s->compr);
|
||||
add_entry1(s,TIFF_INVERT, TIFF_SHORT, s->photometric_interpretation);
|
||||
add_entry1(s, TIFF_COMPR, TIFF_SHORT, s->compr);
|
||||
add_entry1(s, TIFF_INVERT, TIFF_SHORT, s->photometric_interpretation);
|
||||
add_entry(s, TIFF_STRIP_OFFS, TIFF_LONG, strips, s->strip_offsets);
|
||||
|
||||
if (s->bpp_tab_size)
|
||||
add_entry1(s,TIFF_SAMPLES_PER_PIXEL, TIFF_SHORT, s->bpp_tab_size);
|
||||
add_entry1(s, TIFF_SAMPLES_PER_PIXEL, TIFF_SHORT, s->bpp_tab_size);
|
||||
|
||||
add_entry1(s,TIFF_ROWSPERSTRIP, TIFF_LONG, s->rps);
|
||||
add_entry1(s, TIFF_ROWSPERSTRIP, TIFF_LONG, s->rps);
|
||||
add_entry(s, TIFF_STRIP_SIZE, TIFF_LONG, strips, s->strip_sizes);
|
||||
add_entry(s, TIFF_XRES, TIFF_RATIONAL, 1, res);
|
||||
add_entry(s, TIFF_YRES, TIFF_RATIONAL, 1, res);
|
||||
add_entry1(s,TIFF_RES_UNIT, TIFF_SHORT, 2);
|
||||
add_entry1(s, TIFF_RES_UNIT, TIFF_SHORT, 2);
|
||||
|
||||
if(!(avctx->flags & CODEC_FLAG_BITEXACT))
|
||||
if (!(avctx->flags & CODEC_FLAG_BITEXACT))
|
||||
add_entry(s, TIFF_SOFTWARE_NAME, TIFF_STRING,
|
||||
strlen(LIBAVCODEC_IDENT) + 1, LIBAVCODEC_IDENT);
|
||||
|
||||
@ -459,22 +463,23 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
|
||||
for (i = 0; i < 256; i++) {
|
||||
uint32_t rgb = *(uint32_t *) (p->data[1] + i * 4);
|
||||
pal[i] = ((rgb >> 16) & 0xff) * 257;
|
||||
pal[i + 256] = ((rgb >> 8 ) & 0xff) * 257;
|
||||
pal[i + 512] = ( rgb & 0xff) * 257;
|
||||
pal[i + 256] = ((rgb >> 8) & 0xff) * 257;
|
||||
pal[i + 512] = (rgb & 0xff) * 257;
|
||||
}
|
||||
add_entry(s, TIFF_PAL, TIFF_SHORT, 256 * 3, pal);
|
||||
}
|
||||
if (alpha)
|
||||
add_entry1(s,TIFF_EXTRASAMPLES, TIFF_SHORT, 2);
|
||||
if (is_yuv){
|
||||
if (is_yuv) {
|
||||
/** according to CCIR Recommendation 601.1 */
|
||||
uint32_t refbw[12] = {15, 1, 235, 1, 128, 1, 240, 1, 128, 1, 240, 1};
|
||||
uint32_t refbw[12] = { 15, 1, 235, 1, 128, 1, 240, 1, 128, 1, 240, 1 };
|
||||
add_entry(s, TIFF_YCBCR_SUBSAMPLING, TIFF_SHORT, 2, s->subsampling);
|
||||
if (avctx->chroma_sample_location == AVCHROMA_LOC_TOPLEFT)
|
||||
add_entry1(s, TIFF_YCBCR_POSITIONING, TIFF_SHORT, 2);
|
||||
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)) {
|
||||
ret = AVERROR(EINVAL);
|
||||
@ -507,12 +512,12 @@ static av_cold int encode_close(AVCodecContext *avctx)
|
||||
#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
|
||||
static const AVOption options[] = {
|
||||
{"dpi", "set the image resolution (in dpi)", OFFSET(dpi), AV_OPT_TYPE_INT, {.i64 = 72}, 1, 0x10000, AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_ENCODING_PARAM},
|
||||
{ "compression_algo", NULL, OFFSET(compr), AV_OPT_TYPE_INT, {.i64 = TIFF_PACKBITS}, TIFF_RAW, TIFF_DEFLATE, VE, "compression_algo" },
|
||||
{ "packbits", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = TIFF_PACKBITS}, 0, 0, VE, "compression_algo" },
|
||||
{ "raw", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = TIFF_RAW}, 0, 0, VE, "compression_algo" },
|
||||
{ "lzw", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = TIFF_LZW}, 0, 0, VE, "compression_algo" },
|
||||
{ "compression_algo", NULL, OFFSET(compr), AV_OPT_TYPE_INT, { .i64 = TIFF_PACKBITS }, TIFF_RAW, TIFF_DEFLATE, VE, "compression_algo" },
|
||||
{ "packbits", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = TIFF_PACKBITS }, 0, 0, VE, "compression_algo" },
|
||||
{ "raw", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = TIFF_RAW }, 0, 0, VE, "compression_algo" },
|
||||
{ "lzw", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = TIFF_LZW }, 0, 0, VE, "compression_algo" },
|
||||
#if CONFIG_ZLIB
|
||||
{ "deflate", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = TIFF_DEFLATE}, 0, 0, VE, "compression_algo" },
|
||||
{ "deflate", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = TIFF_DEFLATE }, 0, 0, VE, "compression_algo" },
|
||||
#endif
|
||||
{ NULL },
|
||||
};
|
||||
@ -526,6 +531,7 @@ static const AVClass tiffenc_class = {
|
||||
|
||||
AVCodec ff_tiff_encoder = {
|
||||
.name = "tiff",
|
||||
.long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
|
||||
.type = AVMEDIA_TYPE_VIDEO,
|
||||
.id = AV_CODEC_ID_TIFF,
|
||||
.priv_data_size = sizeof(TiffEncoderContext),
|
||||
@ -541,6 +547,5 @@ AVCodec ff_tiff_encoder = {
|
||||
AV_PIX_FMT_RGBA, AV_PIX_FMT_RGBA64LE,
|
||||
AV_PIX_FMT_NONE
|
||||
},
|
||||
.long_name = NULL_IF_CONFIG_SMALL("TIFF image"),
|
||||
.priv_class = &tiffenc_class,
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user