From 69787d6f0cd9b8bb9fc26977c3f96d919b90e9bf Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 29 May 2012 17:45:33 +0200 Subject: [PATCH] video: move enum difinition c++ doesn't seem to like the typedef --- gst-libs/gst/video/video.h | 55 +++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/gst-libs/gst/video/video.h b/gst-libs/gst/video/video.h index cbc734d14b..6133521524 100644 --- a/gst-libs/gst/video/video.h +++ b/gst-libs/gst/video/video.h @@ -127,7 +127,33 @@ typedef enum { typedef struct _GstVideoFormatInfo GstVideoFormatInfo; typedef struct _GstVideoColorimetry GstVideoColorimetry; -typedef enum _GstVideoChromaSite GstVideoChromaSite; + +/** + * GstVideoChromaSite: + * @GST_VIDEO_CHROMA_SITE_UNKNOWN: unknown cositing + * @GST_VIDEO_CHROMA_SITE_NONE: no cositing + * @GST_VIDEO_CHROMA_SITE_H_COSITED: chroma is horizontally cosited + * @GST_VIDEO_CHROMA_SITE_V_COSITED: chroma is vertically cosited + * @GST_VIDEO_CHROMA_SITE_ALT_LINE: choma samples are sited on alternate lines + * @GST_VIDEO_CHROMA_SITE_COSITED: chroma samples cosited with luma samples + * @GST_VIDEO_CHROMA_SITE_JPEG: jpeg style cositing, also for mpeg1 and mjpeg + * @GST_VIDEO_CHROMA_SITE_MPEG2: mpeg2 style cositing + * @GST_VIDEO_CHROMA_SITE_DV: DV style cositing + * + * Various Chroma sitings. + */ +typedef enum { + GST_VIDEO_CHROMA_SITE_UNKNOWN = 0, + GST_VIDEO_CHROMA_SITE_NONE = (1 << 0), + GST_VIDEO_CHROMA_SITE_H_COSITED = (1 << 1), + GST_VIDEO_CHROMA_SITE_V_COSITED = (1 << 2), + GST_VIDEO_CHROMA_SITE_ALT_LINE = (1 << 3), + /* some common chroma cositing */ + GST_VIDEO_CHROMA_SITE_COSITED = (GST_VIDEO_CHROMA_SITE_H_COSITED | GST_VIDEO_CHROMA_SITE_V_COSITED), + GST_VIDEO_CHROMA_SITE_JPEG = (GST_VIDEO_CHROMA_SITE_NONE), + GST_VIDEO_CHROMA_SITE_MPEG2 = (GST_VIDEO_CHROMA_SITE_H_COSITED), + GST_VIDEO_CHROMA_SITE_DV = (GST_VIDEO_CHROMA_SITE_COSITED | GST_VIDEO_CHROMA_SITE_ALT_LINE), +} GstVideoChromaSite; /** * GstVideoFormatFlags: @@ -373,33 +399,6 @@ typedef enum { GST_VIDEO_FLAG_VARIABLE_FPS = (1 << 0) } GstVideoFlags; -/** - * GstVideoChroma: - * @GST_VIDEO_CHROMA_SITE_UNKNOWN: unknown cositing - * @GST_VIDEO_CHROMA_SITE_NONE: no cositing - * @GST_VIDEO_CHROMA_SITE_H_COSITED: chroma is horizontally cosited - * @GST_VIDEO_CHROMA_SITE_V_COSITED: chroma is vertically cosited - * @GST_VIDEO_CHROMA_SITE_ALT_LINE: choma samples are sited on alternate lines - * @GST_VIDEO_CHROMA_SITE_COSITED: chroma samples cosited with luma samples - * @GST_VIDEO_CHROMA_SITE_JPEG: jpeg style cositing, also for mpeg1 and mjpeg - * @GST_VIDEO_CHROMA_SITE_MPEG2: mpeg2 style cositing - * @GST_VIDEO_CHROMA_SITE_DV: DV style cositing - * - * Various Chroma sitings. - */ -enum _GstVideoChromaSite { - GST_VIDEO_CHROMA_SITE_UNKNOWN = 0, - GST_VIDEO_CHROMA_SITE_NONE = (1 << 0), - GST_VIDEO_CHROMA_SITE_H_COSITED = (1 << 1), - GST_VIDEO_CHROMA_SITE_V_COSITED = (1 << 2), - GST_VIDEO_CHROMA_SITE_ALT_LINE = (1 << 3), - /* some common chroma cositing */ - GST_VIDEO_CHROMA_SITE_COSITED = (GST_VIDEO_CHROMA_SITE_H_COSITED | GST_VIDEO_CHROMA_SITE_V_COSITED), - GST_VIDEO_CHROMA_SITE_JPEG = (GST_VIDEO_CHROMA_SITE_NONE), - GST_VIDEO_CHROMA_SITE_MPEG2 = (GST_VIDEO_CHROMA_SITE_H_COSITED), - GST_VIDEO_CHROMA_SITE_DV = (GST_VIDEO_CHROMA_SITE_COSITED | GST_VIDEO_CHROMA_SITE_ALT_LINE), -}; - /** * GstVideoColorRange: * @GST_VIDEO_COLOR_RANGE_UNKNOWN: unknown range