From c7367addb52bc77c81c749b8ee06e1aa54b38947 Mon Sep 17 00:00:00 2001
From: Brad Hards <bradh@frogmouth.net>
Date: Wed, 12 Feb 2025 11:54:02 +1100
Subject: [PATCH] qtdemux: support uncompressed mono with component interleave

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8464>
---
 .../gst-plugins-good/gst/isomp4/qtdemux.c       | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
index 75d60cc49f..9e3eac3ef2 100644
--- a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
+++ b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
@@ -12201,10 +12201,9 @@ qtdemux_get_format_from_uncv (GstQTDemux * qtdemux,
 
 
   switch (uncC->interleave_type) {
-    case 1:                    // Pixel Interleaved
-      // Default Format
-      break;
     case 0:                    // Component Interleaving (Planar)
+    case 1:                    // Pixel Interleaved
+      break;
     case 2:                    // Mixed Interleaved
     case 3:                    // Row Interleaved
     case 4:                    // Tile Interleaved
@@ -12213,7 +12212,6 @@ qtdemux_get_format_from_uncv (GstQTDemux * qtdemux,
       goto unsupported_feature;
   }
 
-
   /* Padding */
   // TODO: Handle various padding configurations
   if (align_size) {
@@ -12240,18 +12238,19 @@ qtdemux_get_format_from_uncv (GstQTDemux * qtdemux,
   switch (num_components) {
     case 1:
       if (cmpd->types[0] == COMPONENT_MONOCHROME) {
+        // Single channel, we can handle this in any interleave
         format = GST_VIDEO_FORMAT_GRAY8;
       }
       break;
     case 3:
       if (cmpd->types[0] == COMPONENT_RED &&
           cmpd->types[1] == COMPONENT_GREEN &&
-          cmpd->types[2] == COMPONENT_BLUE) {
+          cmpd->types[2] == COMPONENT_BLUE && uncC->interleave_type == 1) {
         format = GST_VIDEO_FORMAT_RGB;
       }
       if (cmpd->types[0] == COMPONENT_BLUE &&
           cmpd->types[1] == COMPONENT_GREEN &&
-          cmpd->types[2] == COMPONENT_RED) {
+          cmpd->types[2] == COMPONENT_RED && uncC->interleave_type == 1) {
         format = GST_VIDEO_FORMAT_BGR;
       }
       break;
@@ -12259,13 +12258,13 @@ qtdemux_get_format_from_uncv (GstQTDemux * qtdemux,
       if (cmpd->types[0] == COMPONENT_RED &&
           cmpd->types[1] == COMPONENT_GREEN &&
           cmpd->types[2] == COMPONENT_BLUE &&
-          cmpd->types[3] == COMPONENT_ALPHA) {
+          cmpd->types[3] == COMPONENT_ALPHA && uncC->interleave_type == 1) {
         format = GST_VIDEO_FORMAT_RGBA;
       }
       if (cmpd->types[0] == COMPONENT_RED &&
           cmpd->types[1] == COMPONENT_GREEN &&
           cmpd->types[2] == COMPONENT_BLUE &&
-          cmpd->types[3] == COMPONENT_PADDING) {
+          cmpd->types[3] == COMPONENT_PADDING && uncC->interleave_type == 1) {
         format = GST_VIDEO_FORMAT_RGBx;
       }
       break;
@@ -12278,7 +12277,7 @@ qtdemux_get_format_from_uncv (GstQTDemux * qtdemux,
     goto unsupported_feature;   // TODO - account for higher bit depths
   } else if (uncC->sampling_type != 0) {
     goto unsupported_feature;   // TODO - account for subsampling
-  } else if (uncC->interleave_type != 1) {
+  } else if (uncC->interleave_type != 0 && uncC->interleave_type != 1) {
     goto unsupported_feature;   // TODO - account for various interleave types
   }
   stream->stride = entry->width * num_components;       // TODO - account for non-zero row alignment