From bb065be3497b221e69058b6327f1a5fefd4cdf26 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.com>
Date: Fri, 5 Jun 2020 12:22:08 +0200
Subject: [PATCH] audio: sort AUDIO_FORMATS_ALL

Test also ensures that the formats list returned by
gst_audio_formats_raw() is properly sorted when running with feature
1.18.
---
 gstreamer-audio/Cargo.toml          |   3 +
 gstreamer-audio/src/audio_format.rs | 110 ++++++++++++++++++++--------
 gstreamer-audio/src/lib.rs          |   3 +
 3 files changed, 84 insertions(+), 32 deletions(-)

diff --git a/gstreamer-audio/Cargo.toml b/gstreamer-audio/Cargo.toml
index bcd8f1736..e67e2caca 100644
--- a/gstreamer-audio/Cargo.toml
+++ b/gstreamer-audio/Cargo.toml
@@ -29,6 +29,9 @@ once_cell = "1.0"
 [build-dependencies]
 rustdoc-stripper = { version = "0.1", optional = true }
 
+[dev-dependencies]
+itertools = "0.9"
+
 [features]
 default = []
 v1_10 = ["gstreamer/v1_10", "gstreamer-base/v1_10", "gstreamer-audio-sys/v1_10"]
diff --git a/gstreamer-audio/src/audio_format.rs b/gstreamer-audio/src/audio_format.rs
index cd4ba5d58..2d3ffa457 100644
--- a/gstreamer-audio/src/audio_format.rs
+++ b/gstreamer-audio/src/audio_format.rs
@@ -29,38 +29,76 @@ pub static AUDIO_FORMATS_ALL: Lazy<Box<[::AudioFormat]>> = Lazy::new(|| unsafe {
 
 #[cfg(not(feature = "v1_18"))]
 pub static AUDIO_FORMATS_ALL: Lazy<Box<[::AudioFormat]>> = Lazy::new(|| {
-    Box::new([
-        ::AudioFormat::S8,
-        ::AudioFormat::U8,
-        ::AudioFormat::S16le,
-        ::AudioFormat::S16be,
-        ::AudioFormat::U16le,
-        ::AudioFormat::U16be,
-        ::AudioFormat::S2432le,
-        ::AudioFormat::S2432be,
-        ::AudioFormat::U2432le,
-        ::AudioFormat::U2432be,
-        ::AudioFormat::S32le,
-        ::AudioFormat::S32be,
-        ::AudioFormat::U32le,
-        ::AudioFormat::U32be,
-        ::AudioFormat::S24le,
-        ::AudioFormat::S24be,
-        ::AudioFormat::U24le,
-        ::AudioFormat::U24be,
-        ::AudioFormat::S20le,
-        ::AudioFormat::S20be,
-        ::AudioFormat::U20le,
-        ::AudioFormat::U20be,
-        ::AudioFormat::S18le,
-        ::AudioFormat::S18be,
-        ::AudioFormat::U18le,
-        ::AudioFormat::U18be,
-        ::AudioFormat::F32le,
-        ::AudioFormat::F32be,
-        ::AudioFormat::F64le,
-        ::AudioFormat::F64be,
-    ])
+    #[cfg(target_endian = "little")]
+    {
+        Box::new([
+            ::AudioFormat::F64le,
+            ::AudioFormat::F64be,
+            ::AudioFormat::F32le,
+            ::AudioFormat::F32be,
+            ::AudioFormat::S32le,
+            ::AudioFormat::S32be,
+            ::AudioFormat::U32le,
+            ::AudioFormat::U32be,
+            ::AudioFormat::S2432le,
+            ::AudioFormat::S2432be,
+            ::AudioFormat::U2432le,
+            ::AudioFormat::U2432be,
+            ::AudioFormat::S24le,
+            ::AudioFormat::S24be,
+            ::AudioFormat::U24le,
+            ::AudioFormat::U24be,
+            ::AudioFormat::S20le,
+            ::AudioFormat::S20be,
+            ::AudioFormat::U20le,
+            ::AudioFormat::U20be,
+            ::AudioFormat::S18le,
+            ::AudioFormat::S18be,
+            ::AudioFormat::U18le,
+            ::AudioFormat::U18be,
+            ::AudioFormat::S16le,
+            ::AudioFormat::S16be,
+            ::AudioFormat::U16le,
+            ::AudioFormat::U16be,
+            ::AudioFormat::S8,
+            ::AudioFormat::U8,
+        ])
+    }
+    #[cfg(target_endian = "big")]
+    {
+        Box::new([
+            ::AudioFormat::F64be,
+            ::AudioFormat::F64le,
+            ::AudioFormat::F32be,
+            ::AudioFormat::F32le,
+            ::AudioFormat::S32be,
+            ::AudioFormat::S32le,
+            ::AudioFormat::U32be,
+            ::AudioFormat::U32le,
+            ::AudioFormat::S2432be,
+            ::AudioFormat::S2432le,
+            ::AudioFormat::U2432be,
+            ::AudioFormat::U2432le,
+            ::AudioFormat::S24be,
+            ::AudioFormat::S24le,
+            ::AudioFormat::U24be,
+            ::AudioFormat::U24le,
+            ::AudioFormat::S20be,
+            ::AudioFormat::S20le,
+            ::AudioFormat::U20be,
+            ::AudioFormat::U20le,
+            ::AudioFormat::S18be,
+            ::AudioFormat::S18le,
+            ::AudioFormat::U18be,
+            ::AudioFormat::U18le,
+            ::AudioFormat::S16be,
+            ::AudioFormat::S16le,
+            ::AudioFormat::U16be,
+            ::AudioFormat::U16le,
+            ::AudioFormat::S8,
+            ::AudioFormat::U8,
+        ])
+    }
 });
 
 impl ::AudioFormat {
@@ -295,6 +333,7 @@ where
 #[cfg(test)]
 mod tests {
     use gst;
+    use itertools::Itertools;
 
     #[test]
     fn test_display() {
@@ -363,5 +402,12 @@ mod tests {
                 > ::AudioFormatInfo::from_format(::AudioFormat::U8)
         );
         assert!(::AudioFormat::S20be > ::AudioFormat::S18be);
+
+        let sorted: Vec<::AudioFormat> = ::AudioFormat::iter_raw().sorted().rev().collect();
+        // FIXME: use is_sorted_by() once API is in stable
+        assert_eq!(
+            sorted,
+            ::AudioFormat::iter_raw().collect::<Vec<::AudioFormat>>()
+        );
     }
 }
diff --git a/gstreamer-audio/src/lib.rs b/gstreamer-audio/src/lib.rs
index 52dcc571d..80be9063d 100644
--- a/gstreamer-audio/src/lib.rs
+++ b/gstreamer-audio/src/lib.rs
@@ -22,6 +22,9 @@ extern crate gstreamer_base as gst_base;
 extern crate gstreamer_base_sys as gst_base_sys;
 extern crate gstreamer_sys as gst_sys;
 
+#[cfg(test)]
+extern crate itertools;
+
 macro_rules! assert_initialized_main_thread {
     () => {
         if unsafe { ::gst_sys::gst_is_initialized() } != ::glib_sys::GTRUE {