From fd91abfc9a58b8fb51ec19bf10b9955c0d69cb07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Tue, 31 Dec 2024 10:31:32 +0200
Subject: [PATCH] audio: Add top-surround-left and right channel positions

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8171>
---
 girs/GstAudio-1.0.gir                         |  6 +++++
 .../gst-libs/gst/audio/audio-channels.h       | 24 ++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/girs/GstAudio-1.0.gir b/girs/GstAudio-1.0.gir
index 3d5ff834ea..857777731e 100644
--- a/girs/GstAudio-1.0.gir
+++ b/girs/GstAudio-1.0.gir
@@ -2989,6 +2989,12 @@ channel.</doc>
       <member name="surround_right" value="27" c:identifier="GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT" glib:nick="surround-right" glib:name="GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT">
         <doc xml:space="preserve" filename="../subprojects/gst-plugins-base/gst-libs/gst/audio/audio-channels.h">Surround right (between rear right and side right)</doc>
       </member>
+      <member name="top_surround_left" value="28" c:identifier="GST_AUDIO_CHANNEL_POSITION_TOP_SURROUND_LEFT" version="1.26" glib:nick="top-surround-left" glib:name="GST_AUDIO_CHANNEL_POSITION_TOP_SURROUND_LEFT">
+        <doc xml:space="preserve" filename="../subprojects/gst-plugins-base/gst-libs/gst/audio/audio-channels.h">Top surround left (between rear left and side left).</doc>
+      </member>
+      <member name="top_surround_right" value="29" c:identifier="GST_AUDIO_CHANNEL_POSITION_TOP_SURROUND_RIGHT" version="1.26" glib:nick="top-surround-right" glib:name="GST_AUDIO_CHANNEL_POSITION_TOP_SURROUND_RIGHT">
+        <doc xml:space="preserve" filename="../subprojects/gst-plugins-base/gst-libs/gst/audio/audio-channels.h">Top surround right (between rear right and side right).</doc>
+      </member>
     </enumeration>
     <record name="AudioClippingMeta" c:type="GstAudioClippingMeta" version="1.8">
       <doc xml:space="preserve" filename="../subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudiometa.h">Extra buffer metadata describing how much audio has to be clipped from
diff --git a/subprojects/gst-plugins-base/gst-libs/gst/audio/audio-channels.h b/subprojects/gst-plugins-base/gst-libs/gst/audio/audio-channels.h
index c0b63d472d..08c62da8a7 100644
--- a/subprojects/gst-plugins-base/gst-libs/gst/audio/audio-channels.h
+++ b/subprojects/gst-plugins-base/gst-libs/gst/audio/audio-channels.h
@@ -60,6 +60,10 @@ G_BEGIN_DECLS
  * @GST_AUDIO_CHANNEL_POSITION_WIDE_RIGHT: Wide right (between front right and side right)
  * @GST_AUDIO_CHANNEL_POSITION_SURROUND_LEFT: Surround left (between rear left and side left)
  * @GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT: Surround right (between rear right and side right)
+ * @GST_AUDIO_CHANNEL_POSITION_TOP_SURROUND_LEFT: Top surround left (between rear left and side left)
+ *     (Since: 1.26)
+ * @GST_AUDIO_CHANNEL_POSITION_TOP_SURROUND_RIGHT: Top surround right (between rear right and side right)
+ *     (Since: 1.26)
  * @GST_AUDIO_CHANNEL_POSITION_NONE: used for position-less channels, e.g.
  *     from a sound card that records 1024 channels; mutually exclusive with
  *     any other channel position
@@ -126,7 +130,25 @@ typedef enum {
   GST_AUDIO_CHANNEL_POSITION_WIDE_LEFT,
   GST_AUDIO_CHANNEL_POSITION_WIDE_RIGHT,
   GST_AUDIO_CHANNEL_POSITION_SURROUND_LEFT,
-  GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT
+  GST_AUDIO_CHANNEL_POSITION_SURROUND_RIGHT,
+
+  /**
+   * GST_AUDIO_CHANNEL_POSITION_TOP_SURROUND_LEFT:
+   *
+   * Top surround left (between rear left and side left).
+   *
+   * Since: 1.26
+   */
+  GST_AUDIO_CHANNEL_POSITION_TOP_SURROUND_LEFT,
+
+  /**
+   * GST_AUDIO_CHANNEL_POSITION_TOP_SURROUND_RIGHT:
+   *
+   * Top surround right (between rear right and side right).
+   *
+   * Since: 1.26
+   */
+  GST_AUDIO_CHANNEL_POSITION_TOP_SURROUND_RIGHT
 } GstAudioChannelPosition;
 
 #define GST_AUDIO_CHANNEL_POSITION_MASK(pos) (G_GUINT64_CONSTANT(1)<< GST_AUDIO_CHANNEL_POSITION_ ## pos)