[FFmpeg-devel] [PATCH]Fix mono pam encoding

[Carl Eugen Hoyos]

Hi!

Attached fixes encoding of mono* to pam.
The decoder is less trivial, it currently works correctly for mono pnm, fails 
for monob pam.

Please comment, Carl Eugen
-------------- next part --------------
diff --git a/libavcodec/pamenc.c b/libavcodec/pamenc.c
index 28fe7e1..1cea9e6 100644
--- a/libavcodec/pamenc.c
+++ b/libavcodec/pamenc.c
@@ -50,7 +50,7 @@ static int pam_encode_frame(AVCodecContext *avctx, unsigned char *outbuf,
     h = avctx->height;
     w = avctx->width;
     switch (avctx->pix_fmt) {
-    case PIX_FMT_MONOWHITE:
+    case PIX_FMT_MONOBLACK:
         n          = (w + 7) >> 3;
         depth      = 1;
         maxval     = 1;
@@ -97,6 +97,13 @@ static int pam_encode_frame(AVCodecContext *avctx, unsigned char *outbuf,
             }
             ptr += linesize;
         }
+    } else if (avctx->pix_fmt == PIX_FMT_MONOBLACK){
+        int j;
+        for (i = 0; i < h; i++) {
+            for (j = 0; j < w; j++)
+                *s->bytestream++ = ptr[j >> 3] >> (7 - j % 8) & 1;
+            ptr += linesize;
+        }
     } else {
         for (i = 0; i < h; i++) {
             memcpy(s->bytestream, ptr, n);
@@ -115,6 +122,6 @@ AVCodec ff_pam_encoder = {
     .priv_data_size = sizeof(PNMContext),
     .init           = ff_pnm_init,
     .encode         = pam_encode_frame,
-    .pix_fmts  = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, PIX_FMT_NONE},
+    .pix_fmts  = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOBLACK, PIX_FMT_NONE},
     .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"),
 };