diff options
| author | Paul B Mahol <onemda@gmail.com> | 2012-07-06 01:49:22 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2012-07-06 19:32:44 +0000 |
| commit | 82c4abbfe1dc9fd83149c2c77d25fd43aedf8d82 (patch) | |
| tree | 35b725289a817919cabce2eff7b7c9056d596d95 /libavcodec | |
| parent | e100a259be12c0e0fc46a7a9e1f939fe63a27ff4 (diff) | |
tiffenc: use av_pix_fmt_descriptors to set bpp_tab[]
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/tiffenc.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index 6334339c1b..6adfe82373 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -228,7 +228,7 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt, uint32_t *strip_offsets = NULL; int bytes_per_row; uint32_t res[2] = { s->dpi, 1 }; // image resolution (72/1) - uint16_t bpp_tab[] = { 8, 8, 8, 8 }; + uint16_t bpp_tab[4]; int ret = -1; int is_yuv = 0; uint8_t *yuv_line = NULL; @@ -250,18 +250,10 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt, case PIX_FMT_RGBA64LE: s->bpp = 64; s->photometric_interpretation = 2; - bpp_tab[0] = 16; - bpp_tab[1] = 16; - bpp_tab[2] = 16; - bpp_tab[3] = 16; break; case PIX_FMT_RGB48LE: s->bpp = 48; s->photometric_interpretation = 2; - bpp_tab[0] = 16; - bpp_tab[1] = 16; - bpp_tab[2] = 16; - bpp_tab[3] = 16; break; case PIX_FMT_RGBA: avctx->bits_per_coded_sample = @@ -288,7 +280,6 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt, avctx->bits_per_coded_sample = s->bpp = 1; s->photometric_interpretation = avctx->pix_fmt == PIX_FMT_MONOBLACK; - bpp_tab[0] = 1; break; case PIX_FMT_YUV420P: case PIX_FMT_YUV422P: @@ -310,6 +301,9 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt, } s->bpp_tab_size = av_pix_fmt_descriptors[avctx->pix_fmt].nb_components; + for (i = 0; i < s->bpp_tab_size; i++) + bpp_tab[i] = av_pix_fmt_descriptors[avctx->pix_fmt].comp[i].depth_minus1 + 1; + if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE || s->compr == TIFF_LZW) //best choose for DEFLATE s->rps = s->height; |