[vlc-commits] [Git][videolan/vlc][master] xcb/x11: fix byte order for 24/32 depths

[Rémi Denis-Courmont (@Courmisch)]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
2ad7165b by Jeffrey Knockel at 2024-01-06T08:01:45+00:00
xcb/x11: fix byte order for 24/32 depths

Previously the client used the wrong byte order for these depths when
the server is little-endian.

- - - - -


1 changed file:

- modules/video_output/xcb/pictures.c


Changes:

=====================================
modules/video_output/xcb/pictures.c
=====================================
@@ -110,28 +110,32 @@ bool vlc_xcb_VisualToFormat(const xcb_setup_t *setup, uint_fast8_t depth,
                     vt->green_mask == 0x0000ff00 &&
                     vt->blue_mask  == 0x000000ff)
                 {
-                    f->i_chroma = VLC_CODEC_XRGB;
+                    f->i_chroma = setup->image_byte_order == XCB_IMAGE_ORDER_MSB_FIRST ?
+                                  VLC_CODEC_XRGB : VLC_CODEC_BGRX;
                 }
                 else
                 if (vt->red_mask   == 0x000000ff &&
                     vt->green_mask == 0x0000ff00 &&
                     vt->blue_mask  == 0x00ff0000)
                 {
-                    f->i_chroma = VLC_CODEC_XBGR;
+                    f->i_chroma = setup->image_byte_order == XCB_IMAGE_ORDER_MSB_FIRST ?
+                                  VLC_CODEC_XBGR : VLC_CODEC_RGBX;
                 }
                 else
                 if (vt->red_mask   == 0xff000000 &&
                     vt->green_mask == 0x00ff0000 &&
                     vt->blue_mask  == 0x0000ff00)
                 {
-                    f->i_chroma = VLC_CODEC_RGBX;
+                    f->i_chroma = setup->image_byte_order == XCB_IMAGE_ORDER_MSB_FIRST ?
+                                  VLC_CODEC_RGBX : VLC_CODEC_XBGR;
                 }
                 else
                 if (vt->red_mask   == 0x0000ff00 &&
                     vt->green_mask == 0x00ff0000 &&
                     vt->blue_mask  == 0xff000000)
                 {
-                    f->i_chroma = VLC_CODEC_BGRX;
+                    f->i_chroma = setup->image_byte_order == XCB_IMAGE_ORDER_MSB_FIRST ?
+                                  VLC_CODEC_BGRX : VLC_CODEC_XRGB;
                 }
                 else
                     return false;
@@ -142,14 +146,16 @@ bool vlc_xcb_VisualToFormat(const xcb_setup_t *setup, uint_fast8_t depth,
                     vt->green_mask == 0x00ff00 &&
                     vt->blue_mask  == 0x0000ff)
                 {
-                    f->i_chroma = VLC_CODEC_RGB24;
+                    f->i_chroma = setup->image_byte_order == XCB_IMAGE_ORDER_MSB_FIRST ?
+                                  VLC_CODEC_RGB24 : VLC_CODEC_BGR24;
                 }
                 else
                 if (vt->red_mask   == 0x0000ff &&
                     vt->green_mask == 0x00ff00 &&
                     vt->blue_mask  == 0xff0000)
                 {
-                    f->i_chroma = VLC_CODEC_BGR24;
+                    f->i_chroma = setup->image_byte_order == XCB_IMAGE_ORDER_MSB_FIRST ?
+                                  VLC_CODEC_BGR24 : VLC_CODEC_RGB24;
                 }
                 else
                     return false;



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/2ad7165b8865e84d7fa7fbc98b0ab087e9ebc3f0

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/2ad7165b8865e84d7fa7fbc98b0ab087e9ebc3f0
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance