Ticket #897: patchsunrast4bpp.diff

libavcodec/sunrast.c

@@ -51 +51 @@
     AVFrame *picture = data;
     AVFrame * const p = &s->picture;
     unsigned int w, h, depth, type, maptype, maplength, stride, x, y, len, alen;
-    uint8_t *ptr;
+    uint8_t *ptr, *ptr2;
     const uint8_t *bufstart = buf;
 
     if (avpkt->size < 32)
@@ -90 +90 @@
 
     switch (depth) {
         case 1:
-            avctx->pix_fmt = PIX_FMT_MONOWHITE;
+            avctx->pix_fmt = maplength ? PIX_FMT_PAL8 : PIX_FMT_MONOWHITE;
+            break;
+        case 4:
+            avctx->pix_fmt = maplength ? PIX_FMT_PAL8 : PIX_FMT_NONE;
             break;
         case 8:
             avctx->pix_fmt = maplength ? PIX_FMT_PAL8 : PIX_FMT_GRAY8;
@@ -118 +121 @@
     if (buf_end - buf < maplength)
         return AVERROR_INVALIDDATA;
 
-    if (depth != 8 && maplength) {
+    if (depth > 8 && maplength) {
         av_log(avctx, AV_LOG_WARNING, "useless colormap found or file is corrupted, trying to recover\n");
 
     } else if (maplength) {
@@ -140 +143 @@
 
     buf += maplength;
 
+    if (maplength && depth < 8) {
+        ptr = ptr2 = av_malloc((w + 15) * h);
+        stride = (w + 15 >> 3) * depth;
+    } else {
     ptr    = p->data[0];
     stride = p->linesize[0];
+    }
 
     /* scanlines are aligned on 16 bit boundaries */
     len  = (depth * w + 7) >> 3;
@@ -182 +190 @@
             buf += alen;
         }
     }
+    if (avctx->pix_fmt == PIX_FMT_PAL8 && depth < 8) {
+        uint8_t *ptr_free = ptr2;
+        ptr = p->data[0];
+        for (y=0; y<h; y++) {
+            x = (w + 7 >> 3) * depth;
+            do {
+                if (depth == 1) {
+                    ptr[8*x+7] = ptr2[x]      & 1;
+                    ptr[8*x+6] = ptr2[x] >> 1 & 1;
+                    ptr[8*x+5] = ptr2[x] >> 2 & 1;
+                    ptr[8*x+4] = ptr2[x] >> 3 & 1;
+                    ptr[8*x+3] = ptr2[x] >> 4 & 1;
+                    ptr[8*x+2] = ptr2[x] >> 5 & 1;
+                    ptr[8*x+1] = ptr2[x] >> 6 & 1;
+                    ptr[8*x]   = ptr2[x] >> 7;
+                } else {
+                    ptr[2*x+1] = ptr2[x] & 0xF;
+                    ptr[2*x]   = ptr2[x] >> 4;
+                }
+            } while (x--);
+            ptr  += p->linesize[0];
+            ptr2 += (w + 15 >> 3) * depth;
+        }
+        av_freep(&ptr_free);
+    }
 
     *picture = s->picture;
     *data_size = sizeof(AVFrame);
@@ -206 +239 @@
     .init           = sunrast_init,
     .close          = sunrast_end,
     .decode         = sunrast_decode_frame,
-    .capabilities   = CODEC_CAP_DR1,
+//    .capabilities   = CODEC_CAP_DR1,
     .long_name = NULL_IF_CONFIG_SMALL("Sun Rasterfile image"),
 };