tiffenc: Simplify pixel format setup using AVPixFmtDescriptor.

diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c
index 96a6f0b1f364f0c52f28207eb85b9252d6a1eac5..4e64201a89f4c50e48b895a0b64b9b8563ac5188 100644 (file)
--- a/libavcodec/tiffenc.c
+++ b/libavcodec/tiffenc.c
@@ -27,6 +27,7 @@
 
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
+#include "libavutil/pixdesc.h"
 
 #include "avcodec.h"
 #include "config.h"
@@ -219,6 +220,7 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
     int is_yuv = 0;
     uint8_t *yuv_line = NULL;
     int shift_h, shift_v;
+    const AVPixFmtDescriptor* pfd;
 
     s->avctx = avctx;
 
@@ -232,41 +234,35 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
     s->subsampling[0] = 1;
     s->subsampling[1] = 1;
 
-    s->bpp_tab_size = 0;
     switch (avctx->pix_fmt) {
     case PIX_FMT_RGB48LE:
-        s->bpp = 48;
-        s->photometric_interpretation = 2;
-        s->bpp_tab_size = 3;
-        for (i = 0; i < s->bpp_tab_size; i++) {
-            bpp_tab[i] = 16;
-        }
-        break;
     case PIX_FMT_GRAY16LE:
-        s->bpp = 16;
-        s->photometric_interpretation = 1;
-        s->bpp_tab_size = 1;
-        bpp_tab[0] = 16;
-        break;
     case PIX_FMT_RGB24:
-        s->bpp = 24;
-        s->photometric_interpretation = 2;
-        break;
     case PIX_FMT_GRAY8:
-        s->bpp = 8;
-        s->photometric_interpretation = 1;
-        break;
     case PIX_FMT_PAL8:
-        s->bpp = 8;
-        s->photometric_interpretation = 3;
+        pfd = &av_pix_fmt_descriptors[avctx->pix_fmt];
+        s->bpp = av_get_bits_per_pixel(pfd);
+        if (pfd->flags & PIX_FMT_PAL) {
+            s->photometric_interpretation = 3;
+        } else if (pfd->flags & PIX_FMT_RGB) {
+            s->photometric_interpretation = 2;
+        } else {
+            s->photometric_interpretation = 1;
+        }
+        s->bpp_tab_size = pfd->nb_components;
+        for (i = 0; i < s->bpp_tab_size; i++) {
+            bpp_tab[i] = s->bpp / s->bpp_tab_size;
+        }
         break;
     case PIX_FMT_MONOBLACK:
         s->bpp = 1;
         s->photometric_interpretation = 1;
+        s->bpp_tab_size = 0;
         break;
     case PIX_FMT_MONOWHITE:
         s->bpp = 1;
         s->photometric_interpretation = 0;
+        s->bpp_tab_size = 0;
         break;
     case PIX_FMT_YUV420P:
     case PIX_FMT_YUV422P:
@@ -287,8 +283,6 @@ static int encode_frame(AVCodecContext * avctx, AVPacket *pkt,
                "This colors format is not supported\n");
         return -1;
     }
-    if (!s->bpp_tab_size)
-        s->bpp_tab_size = (s->bpp >> 3);
 
     if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE || s->compr == TIFF_LZW)
         //best choose for DEFLATE