smf: reorder code, no functional changes

[vlc] / modules / arm_neon / chroma_neon.h

diff --git a/modules/arm_neon/chroma_neon.h b/modules/arm_neon/chroma_neon.h
index 3e867e3d499934d6d44e0866df3841b5470ae4b8..e516179e317800293a0fbc1eef1477da26a8c933 100644 (file)
--- a/modules/arm_neon/chroma_neon.h
+++ b/modules/arm_neon/chroma_neon.h
@@ -3,19 +3,19 @@
  *****************************************************************************
  * Copyright (C) 2011 Rémi Denis-Courmont
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /* Planes must start on a 16-bytes boundary. Pitches must be multiples of 16
@@ -26,53 +26,76 @@
  * inferred from the color subsampling ratio. */
 struct yuv_planes
 {
-       void *y, *u, *v;
-       size_t pitch;
+    void *y, *u, *v;
+    size_t pitch;
+};
+
+/* Planar chroma buffers.
+ * Pitch is in bytes. */
+struct uv_planes
+{
+    void *u, *v;
+    size_t pitch;
 };
 
 /* Packed picture buffer. Pitch is in bytes (_not_ pixels). */
 struct yuv_pack
 {
-       void *yuv;
-       size_t pitch;
+    void *yuv;
+    size_t pitch;
 };
 
 /* I420 to YUYV conversion. */
 void i420_yuyv_neon (struct yuv_pack *const out,
                      const struct yuv_planes *const in,
-                     int width, int height);
+                     int width, int height) asm("i420_yuyv_neon");
 
 /* I420 to UYVY conversion. */
 void i420_uyvy_neon (struct yuv_pack *const out,
                      const struct yuv_planes *const in,
-                     int width, int height);
+                     int width, int height) asm("i420_uyvy_neon");
 
 /* I422 to YUYV conversion. */
 void i422_yuyv_neon (struct yuv_pack *const out,
                      const struct yuv_planes *const in,
-                     int width, int height);
+                     int width, int height) asm("i422_yuyv_neon");
 
 /* I422 to UYVY conversion. */
 void i422_uyvy_neon (struct yuv_pack *const out,
                      const struct yuv_planes *const in,
-                     int width, int height);
+                     int width, int height) asm("i422_uyvy_neon");
 
 /* YUYV to I422 conversion. */
 void yuyv_i422_neon (struct yuv_planes *const out,
-                     const struct yuv_pack *const in, int width, int height);
+                     const struct yuv_pack *const in,
+                     int width, int height) asm("yuyv_i422_neon");
 
 /* UYVY to I422 conversion. */
 void uyvy_i422_neon (struct yuv_planes *const out,
-                     const struct yuv_pack *const in, int width, int height);
+                     const struct yuv_pack *const in,
+                     int width, int height) asm("uyvy_i422_neon");
+
+/* Semiplanar to planar conversion. */
+void deinterleave_chroma_neon (struct uv_planes *const out,
+                               const struct yuv_pack *const in,
+                               int width, int height) asm("deinterleave_chroma_neon");
 
 /* I420 to RGBA conversion. */
 void i420_rgb_neon (struct yuv_pack *const out,
-                    const struct yuv_planes *const in, int width, int height);
+                    const struct yuv_planes *const in,
+                    int width, int height) asm("i420_rgb_neon");
+
+/* I420 to RV16 conversion. */
+void i420_rv16_neon (struct yuv_pack *const out,
+                     const struct yuv_planes *const in,
+                     int width, int height) asm("i420_rv16_neon");
 
 /* NV21 to RGBA conversion. */
 void nv21_rgb_neon (struct yuv_pack *const out,
-                    const struct yuv_planes *const in, int width, int height);
+                    const struct yuv_planes *const in,
+                    int width, int height) asm("nv21_rgb_neon");
 
 /* NV12 to RGBA conversion. */
 void nv12_rgb_neon (struct yuv_pack *const out,
-                    const struct yuv_planes *const in, int width, int height);
+                    const struct yuv_planes *const in,
+                    int width, int height) asm("nv12_rgb_neon");