From 6179b6495e18743164c6552c1c47ddeb01f9953b Mon Sep 17 00:00:00 2001
From: gb <gb@5584edef-b1fe-4b99-b61b-dd2bab72e969>
Date: Sun, 21 Mar 2010 08:22:46 +0000
Subject: [PATCH] Move GstVaapiSurfaceRenderFlags to gstvaapisurface.h since
 this will also be useful for e.g. a gstvaapitexture.h.

---
 docs/reference/libs/libs-sections.txt |  1 +
 gst-libs/gst/vaapi/gstvaapisurface.h  | 28 ++++++++++++++++++++++++++++
 gst-libs/gst/vaapi/gstvaapiwindow.h   | 12 ------------
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/docs/reference/libs/libs-sections.txt b/docs/reference/libs/libs-sections.txt
index ff1aef0..890b4a9 100644
--- a/docs/reference/libs/libs-sections.txt
+++ b/docs/reference/libs/libs-sections.txt
@@ -213,6 +213,7 @@ GST_VAAPI_IMAGE_GET_CLASS
 <SECTION>
 <FILE>gstvaapisurface</FILE>
 GstVaapiChromaType
+GstVaapiSurfaceRenderFlags
 <TITLE>GstVaapiSurface</TITLE>
 GstVaapiSurface
 GstVaapiSurfaceClass
diff --git a/gst-libs/gst/vaapi/gstvaapisurface.h b/gst-libs/gst/vaapi/gstvaapisurface.h
index 3f81aa7..f1a14b5 100644
--- a/gst-libs/gst/vaapi/gstvaapisurface.h
+++ b/gst-libs/gst/vaapi/gstvaapisurface.h
@@ -27,6 +27,7 @@
 G_BEGIN_DECLS
 
 typedef enum _GstVaapiChromaType                GstVaapiChromaType;
+typedef enum _GstVaapiSurfaceRenderFlags        GstVaapiSurfaceRenderFlags;
 
 /**
  * GstVaapiChromaType:
@@ -42,6 +43,33 @@ enum _GstVaapiChromaType {
     GST_VAAPI_CHROMA_TYPE_YUV444
 };
 
+/**
+ * GstVaapiSurfaceRenderFlags
+ * @GST_VAAPI_PICTURE_STRUCTURE_TOP_FIELD:
+ *   selects the top field of the surface
+ * @GST_VAAPI_PICTURE_STRUCTURE_BOTTOM_FIELD:
+ *   selects the bottom field of the surface
+ * @GST_VAAPI_PICTURE_STRUCTURE_FRAME:
+ *   selects the entire surface
+ * @GST_VAAPI_COLOR_STANDARD_ITUR_BT_601:
+ *   uses ITU-R BT.601 standard for color space conversion
+ * @GST_VAAPI_COLOR_STANDARD_ITUR_BT_709:
+ *   uses ITU-R BT.709 standard for color space conversion
+ *
+ * The set of all render flags for gst_vaapi_window_put_surface().
+ */
+enum _GstVaapiSurfaceRenderFlags {
+    GST_VAAPI_PICTURE_STRUCTURE_TOP_FIELD       = 1 << 0,
+    GST_VAAPI_PICTURE_STRUCTURE_BOTTOM_FIELD    = 1 << 1,
+    GST_VAAPI_PICTURE_STRUCTURE_FRAME           =
+    (
+        GST_VAAPI_PICTURE_STRUCTURE_TOP_FIELD |
+        GST_VAAPI_PICTURE_STRUCTURE_BOTTOM_FIELD
+    ),
+    GST_VAAPI_COLOR_STANDARD_ITUR_BT_601        = 1 << 2,
+    GST_VAAPI_COLOR_STANDARD_ITUR_BT_709        = 1 << 3,
+};
+
 #define GST_VAAPI_TYPE_SURFACE \
     (gst_vaapi_surface_get_type())
 
diff --git a/gst-libs/gst/vaapi/gstvaapiwindow.h b/gst-libs/gst/vaapi/gstvaapiwindow.h
index 6138170..82011af 100644
--- a/gst-libs/gst/vaapi/gstvaapiwindow.h
+++ b/gst-libs/gst/vaapi/gstvaapiwindow.h
@@ -27,18 +27,6 @@
 
 G_BEGIN_DECLS
 
-enum {
-    GST_VAAPI_PICTURE_STRUCTURE_TOP_FIELD       = 1 << 0,
-    GST_VAAPI_PICTURE_STRUCTURE_BOTTOM_FIELD    = 1 << 1,
-    GST_VAAPI_PICTURE_STRUCTURE_FRAME           =
-    (
-        GST_VAAPI_PICTURE_STRUCTURE_TOP_FIELD |
-        GST_VAAPI_PICTURE_STRUCTURE_BOTTOM_FIELD
-    ),
-    GST_VAAPI_COLOR_STANDARD_ITUR_BT_601        = 1 << 2,
-    GST_VAAPI_COLOR_STANDARD_ITUR_BT_709        = 1 << 3,
-};
-
 #define GST_VAAPI_TYPE_WINDOW \
     (gst_vaapi_window_get_type())
 
-- 
2.7.4