diff options
| author | Jan Schmidt <jan@centricular.com> | 2016-08-12 22:16:33 +1000 |
|---|---|---|
| committer | Jan Schmidt <jan@centricular.com> | 2016-08-16 00:43:39 +1000 |
| commit | 16fb11cf33d7fa8883e38bfe01401ad9d7d08808 (patch) | |
| tree | f1821f2cc996a76f6630151f41892da70e128271 | |
| parent | 23fc5e31b0ccbe436af3b9bc41a2e60b30f8e874 (diff) | |
winks: Fix swapped RGBx/RGB caps mapping, and endianness.
The RGBx and RGB format mappings were reversed.
What Windows calls RGB are laid out as BGR in our parlance, so
switch that too
| -rw-r--r-- | sys/winks/ksvideohelpers.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/winks/ksvideohelpers.c b/sys/winks/ksvideohelpers.c index 9d7046178..20da75bfe 100644 --- a/sys/winks/ksvideohelpers.c +++ b/sys/winks/ksvideohelpers.c @@ -142,14 +142,14 @@ ks_video_format_to_structure (GUID subtype_guid, GUID format_guid) media_type = "video/x-raw"; format = "RGB16"; } else if (IsEqualGUID (&subtype_guid, &MEDIASUBTYPE_RGB24)) { + format = "BGR"; media_type = "video/x-raw"; - format = "RGBx"; } else if (IsEqualGUID (&subtype_guid, &MEDIASUBTYPE_RGB32)) { media_type = "video/x-raw"; - format = "RGB"; + format = "BGRx"; } else if (IsEqualGUID (&subtype_guid, &MEDIASUBTYPE_ARGB32)) { media_type = "video/x-raw"; - format = "ARGB"; + format = "BGRA"; } else if (IsEqualGUID (&subtype_guid, &MEDIASUBTYPE_ARGB1555)) { GST_WARNING ("Unsupported video format ARGB15555"); } else if (IsEqualGUID (&subtype_guid, &MEDIASUBTYPE_ARGB4444)) { |