avcodec/rawdec: Switch to monowhite if there is no palette & bpp=1
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 31 Jan 2016 03:10:02 +0000 (04:10 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 31 Jan 2016 03:36:53 +0000 (04:36 +0100)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/rawdec.c
tests/ref/vsynth/vsynth1-bpp1
tests/ref/vsynth/vsynth2-bpp1
tests/ref/vsynth/vsynth3-bpp1
tests/ref/vsynth/vsynth_lena-bpp1

index 3536943..93cbedf 100644 (file)
@@ -112,6 +112,9 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx)
         avctx->pix_fmt   == AV_PIX_FMT_YUYV422)
         context->is_yuv2 = 1;
 
+    if (avctx->pix_fmt == AV_PIX_FMT_PAL8 && avctx->bits_per_coded_sample == 1)
+        avctx->pix_fmt = AV_PIX_FMT_NONE;
+
     return 0;
 }
 
@@ -152,7 +155,7 @@ MKSCALE16(scale16le, AV_RL16, AV_WL16)
 static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
                       AVPacket *avpkt)
 {
-    const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
+    const AVPixFmtDescriptor *desc;
     RawVideoContext *context       = avctx->priv_data;
     const uint8_t *buf             = avpkt->data;
     int buf_size                   = avpkt->size;
@@ -173,6 +176,20 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
         av_log(avctx, AV_LOG_ERROR, "Packet too small (%d) height (%d)\n", avpkt->size, avctx->height);
         return AVERROR_INVALIDDATA;
     }
+    if (avctx->pix_fmt == AV_PIX_FMT_NONE &&
+        avctx->bits_per_coded_sample == 1 &&
+        avctx->frame_number == 0 &&
+        context->palette &&
+        AV_RB64(context->palette->data) == 0xFFFFFFFF00000000
+    ) {
+        const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL);
+        if (!pal) {
+            avctx->pix_fmt = AV_PIX_FMT_MONOWHITE;
+        } else
+            avctx->pix_fmt = AV_PIX_FMT_PAL8;
+    }
+
+    desc = av_pix_fmt_desc_get(avctx->pix_fmt);
 
     if ((avctx->bits_per_coded_sample == 8 || avctx->bits_per_coded_sample == 4
             || avctx->bits_per_coded_sample == 2 || avctx->bits_per_coded_sample == 1) &&
index 378f990..32dab11 100644 (file)
@@ -1,4 +1,4 @@
 3e5e0f4afb3a0350440e86b1ea56cec9 *tests/data/fate/vsynth1-bpp1.avi
 640452 tests/data/fate/vsynth1-bpp1.avi
-853694f3c1aa3ef3807ab1fccbeefe7b *tests/data/fate/vsynth1-bpp1.out.rawvideo
-stddev:   84.44 PSNR:  9.60 MAXDIFF:  221 bytes:  7603200/  7603200
+ccef5f5d5b0392f1d01c200499dac657 *tests/data/fate/vsynth1-bpp1.out.rawvideo
+stddev:   97.30 PSNR:  8.37 MAXDIFF:  237 bytes:  7603200/  7603200
index ae8fd27..d010bbd 100644 (file)
@@ -1,4 +1,4 @@
 771437c9038b44f4e2d4ff764c1c3821 *tests/data/fate/vsynth2-bpp1.avi
 640452 tests/data/fate/vsynth2-bpp1.avi
-94261fc8aa20130cbd4361e15b742ef7 *tests/data/fate/vsynth2-bpp1.out.rawvideo
-stddev:   70.29 PSNR: 11.19 MAXDIFF:  221 bytes:  7603200/  7603200
+ba70b5aebc786e625af6bd7f7ec82717 *tests/data/fate/vsynth2-bpp1.out.rawvideo
+stddev:   81.63 PSNR:  9.89 MAXDIFF:  237 bytes:  7603200/  7603200
index 6f71248..f84808a 100644 (file)
@@ -1,4 +1,4 @@
 a5e6d1eff2f6fc3bba31e3bb8753b905 *tests/data/fate/vsynth3-bpp1.avi
 15352 tests/data/fate/vsynth3-bpp1.avi
-79076b5fc43ee2a2284c0cde991d21f3 *tests/data/fate/vsynth3-bpp1.out.rawvideo
-stddev:   84.88 PSNR:  9.55 MAXDIFF:  232 bytes:    86700/    86700
+75e8ee0c0b0ada4515455d9f29377a16 *tests/data/fate/vsynth3-bpp1.out.rawvideo
+stddev:   97.70 PSNR:  8.33 MAXDIFF:  248 bytes:    86700/    86700
index 3e250a8..d4570c7 100644 (file)
@@ -1,4 +1,4 @@
 d53d08c755ffde5fca744f0f941bfcb1 *tests/data/fate/vsynth_lena-bpp1.avi
 640452 tests/data/fate/vsynth_lena-bpp1.avi
-dce624117fcd2b16f38e0a0a62b13fa7 *tests/data/fate/vsynth_lena-bpp1.out.rawvideo
-stddev:   83.18 PSNR:  9.73 MAXDIFF:  217 bytes:  7603200/  7603200
+9a66df9009670b0a593d889975246c00 *tests/data/fate/vsynth_lena-bpp1.out.rawvideo
+stddev:   96.36 PSNR:  8.45 MAXDIFF:  233 bytes:  7603200/  7603200