summaryrefslogtreecommitdiff
path: root/sys/v4l2/v4l2_calls.h
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2009-08-04 09:32:07 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2009-08-04 09:32:07 +0200
commit23dbb15ff56bb04717613c0797dcc5436a148677 (patch)
tree6127cd8f7ca145b38676d2304500bcc0d464b81f /sys/v4l2/v4l2_calls.h
parent99e2ac121d7252aa858a8e0b2db0872d06ca226c (diff)
v4l2: Remove some OMAP specific hacks
They require special build flags and are not useful in general.
Diffstat (limited to 'sys/v4l2/v4l2_calls.h')
-rw-r--r--sys/v4l2/v4l2_calls.h30
1 files changed, 1 insertions, 29 deletions
diff --git a/sys/v4l2/v4l2_calls.h b/sys/v4l2/v4l2_calls.h
index 1f24c1f45..e862ac9f5 100644
--- a/sys/v4l2/v4l2_calls.h
+++ b/sys/v4l2/v4l2_calls.h
@@ -140,24 +140,7 @@ gboolean gst_v4l2_set_attribute (GstV4l2Object *v4l2object,
gboolean gst_v4l2_get_capabilities (GstV4l2Object * v4l2object);
-/* note: in case this is a build with TTIF logging, we can optimize slightly
- * and avoid the gst_caps_to_string() in case logging isn't enabled by using
- * the TTIF_TRACE_ARG_PROCESSOR feature of ttif_trace_fprintf():
- */
-#ifdef GST_LOG_OVER_TTIF
-# define LOG_CAPS(obj, caps) G_STMT_START { \
- if (caps) { \
- static TTIF_TRACE_ARG_PROCESSOR proc = { \
- .convert = (char (*)(void *))gst_caps_to_string, \
- .free = (void (*)(char *))g_free \
- }; \
- GST_DEBUG_OBJECT (obj, "%s: %qs", #caps, &proc, (caps)); \
- } else { \
- GST_DEBUG_OBJECT (obj, "null"); \
- } \
- } G_STMT_END
-#else
-# define LOG_CAPS(obj, caps) G_STMT_START { \
+#define LOG_CAPS(obj, caps) G_STMT_START { \
if (caps) { \
gchar *capstr = gst_caps_to_string (caps); \
GST_DEBUG_OBJECT (obj, "%s: %s", #caps, capstr); \
@@ -166,16 +149,5 @@ gboolean gst_v4l2_get_capabilities (GstV4l2Object * v4l2object);
GST_DEBUG_OBJECT (obj, "null"); \
} \
} G_STMT_END
-#endif
-
-/* note: the omapzoom kernel v4l2 display driver deviates from the v4l2 API
- * spec in a few areas. For example, we must always have one buffer with
- * the driver before STREAMON until after STREAMOFF. And some interfaces,
- * such as rotation (and mirroring?) are different.
- *
- * this is only a temporary hack, as we should switch to the new driver soon
- */
-#define OMAPZOOM
-
#endif /* __V4L2_CALLS_H__ */