videoscale: Reorder template caps by the amount of information contained in the color...

diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c
index 283fa277ebe084e44bc9e2c90a6a49c16d4ade13..91b15eaed65b582898f11b3b21d08f659dca05e9 100644 (file)
--- a/gst/videoscale/gstvideoscale.c
+++ b/gst/videoscale/gstvideoscale.c
@@ -78,63 +78,63 @@ enum
 #define GST_VIDEO_SIZE_RANGE "(int) [ 1, 32767]"
 
 static GstStaticCaps gst_video_scale_format_caps[] = {
-  GST_STATIC_CAPS (GST_VIDEO_CAPS_RGBx),
-  GST_STATIC_CAPS (GST_VIDEO_CAPS_xRGB),
-  GST_STATIC_CAPS (GST_VIDEO_CAPS_BGRx),
-  GST_STATIC_CAPS (GST_VIDEO_CAPS_xBGR),
   GST_STATIC_CAPS (GST_VIDEO_CAPS_RGBA),
   GST_STATIC_CAPS (GST_VIDEO_CAPS_ARGB),
   GST_STATIC_CAPS (GST_VIDEO_CAPS_BGRA),
   GST_STATIC_CAPS (GST_VIDEO_CAPS_ABGR),
+  GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("AYUV")),
+  GST_STATIC_CAPS (GST_VIDEO_CAPS_RGBx),
+  GST_STATIC_CAPS (GST_VIDEO_CAPS_xRGB),
+  GST_STATIC_CAPS (GST_VIDEO_CAPS_BGRx),
+  GST_STATIC_CAPS (GST_VIDEO_CAPS_xBGR),
+  GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("v308")),
   GST_STATIC_CAPS (GST_VIDEO_CAPS_RGB),
   GST_STATIC_CAPS (GST_VIDEO_CAPS_BGR),
-  GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("v308")),
-  GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("AYUV")),
   GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("YUY2")),
   GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("YVYU")),
   GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("UYVY")),
-  GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("Y800")),
   GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("I420")),
   GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("YV12")),
   GST_STATIC_CAPS (GST_VIDEO_CAPS_RGB_16),
   GST_STATIC_CAPS (GST_VIDEO_CAPS_RGB_15),
-  GST_STATIC_CAPS ("video/x-raw-gray, "
-      "bpp = 8, "
-      "depth = 8, "
-      "width = " GST_VIDEO_SIZE_RANGE ", "
-      "height = " GST_VIDEO_SIZE_RANGE ", " "framerate = " GST_VIDEO_FPS_RANGE),
   GST_STATIC_CAPS ("video/x-raw-gray, "
       "bpp = 16, "
       "depth = 16, "
       "endianness = BYTE_ORDER, "
       "width = " GST_VIDEO_SIZE_RANGE ", "
-      "height = " GST_VIDEO_SIZE_RANGE ", " "framerate = " GST_VIDEO_FPS_RANGE)
+      "height = " GST_VIDEO_SIZE_RANGE ", " "framerate = " GST_VIDEO_FPS_RANGE),
+  GST_STATIC_CAPS ("video/x-raw-gray, "
+      "bpp = 8, "
+      "depth = 8, "
+      "width = " GST_VIDEO_SIZE_RANGE ", "
+      "height = " GST_VIDEO_SIZE_RANGE ", " "framerate = " GST_VIDEO_FPS_RANGE),
+  GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("Y800"))
 };
 
 enum
 {
-  GST_VIDEO_SCALE_RGBx = 0,
-  GST_VIDEO_SCALE_xRGB,
-  GST_VIDEO_SCALE_BGRx,
-  GST_VIDEO_SCALE_xBGR,
-  GST_VIDEO_SCALE_RGBA,
+  GST_VIDEO_SCALE_RGBA = 0,
   GST_VIDEO_SCALE_ARGB,
   GST_VIDEO_SCALE_BGRA,
   GST_VIDEO_SCALE_ABGR,
+  GST_VIDEO_SCALE_AYUV,
+  GST_VIDEO_SCALE_RGBx,
+  GST_VIDEO_SCALE_xRGB,
+  GST_VIDEO_SCALE_BGRx,
+  GST_VIDEO_SCALE_xBGR,
+  GST_VIDEO_SCALE_v308,
   GST_VIDEO_SCALE_RGB,
   GST_VIDEO_SCALE_BGR,
-  GST_VIDEO_SCALE_v308,
-  GST_VIDEO_SCALE_AYUV,
   GST_VIDEO_SCALE_YUY2,
   GST_VIDEO_SCALE_YVYU,
   GST_VIDEO_SCALE_UYVY,
-  GST_VIDEO_SCALE_Y,
   GST_VIDEO_SCALE_I420,
   GST_VIDEO_SCALE_YV12,
   GST_VIDEO_SCALE_RGB565,
   GST_VIDEO_SCALE_RGB555,
+  GST_VIDEO_SCALE_GRAY16,
   GST_VIDEO_SCALE_GRAY8,
-  GST_VIDEO_SCALE_GRAY16
+  GST_VIDEO_SCALE_Y
 };
 
 #define GST_TYPE_VIDEO_SCALE_METHOD (gst_video_scale_method_get_type())