[FFmpeg-cvslog] lavd/x11grab: check 32-bits color masks.

[Nicolas George]

ffmpeg | branch: master | Nicolas George <george at nsup.org> | Tue Jul 15 16:04:49 2014 +0200| [16c6795465fd7663792fe535256c760560714863] | committer: Nicolas George

lavd/x11grab: check 32-bits color masks.

The X11 servers by VNC, at 32-bits depths, has the following masks:
R:0x000007ff G:0x003ff800 B:0xffc00000
This is not compatible with AV_PIX_FMT_0RGB32, and the result
is success with completely wrong colors.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=16c6795465fd7663792fe535256c760560714863
---

 libavdevice/x11grab.c |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index 3a4aaeb..7271e6c 100644
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -308,7 +308,16 @@ x11grab_read_header(AVFormatContext *s1)
         }
         break;
     case 32:
-        input_pixfmt = AV_PIX_FMT_0RGB32;
+        if (        image->red_mask   == 0xff0000 &&
+                    image->green_mask == 0x00ff00 &&
+                    image->blue_mask  == 0x0000ff ) {
+            input_pixfmt = AV_PIX_FMT_0RGB32;
+        } else {
+            av_log(s1, AV_LOG_ERROR,"rgb ordering at image depth %i not supported ... aborting\n", image->bits_per_pixel);
+            av_log(s1, AV_LOG_ERROR, "color masks: r 0x%.6lx g 0x%.6lx b 0x%.6lx\n", image->red_mask, image->green_mask, image->blue_mask);
+            ret = AVERROR_PATCHWELCOME;
+            goto out;
+        }
         break;
     default:
         av_log(s1, AV_LOG_ERROR, "image depth %i not supported ... aborting\n", image->bits_per_pixel);