From: Sebastian Dröge <sebastian@centricular.com>
Date: Tue, 3 Dec 2013 13:53:24 +0000 (+0100)
Subject: openni2src: Check color format
X-Git-Tag: 1.19.3~507^2~12910
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=26bf14c9fd5eaefefcd1d4ffa7d65b793e1aabdd;p=platform%2Fupstream%2Fgstreamer.git

openni2src: Check color format
---

diff --git a/ext/openni2/gstopenni2src.cpp b/ext/openni2/gstopenni2src.cpp
index 1ae5058..b436e42 100644
--- a/ext/openni2/gstopenni2src.cpp
+++ b/ext/openni2/gstopenni2src.cpp
@@ -327,15 +327,15 @@ gst_openni2_src_get_caps (GstBaseSrc * src, GstCaps * filter)
         : gst_caps_ref (ni2src->gst_caps);
   }
   // If we are here, we need to compose the caps and return them.
-  if (ni2src->colorpixfmt != openni::PIXEL_FORMAT_RGB888)
-    return gst_caps_new_empty ();       /* Uh oh,  not RGB :? Not supported. */
 
   if (ni2src->depth.isValid () && ni2src->color.isValid () &&
-      ni2src->sourcetype == SOURCETYPE_BOTH) {
+      ni2src->sourcetype == SOURCETYPE_BOTH
+      && ni2src->colorpixfmt == openni::PIXEL_FORMAT_RGB888) {
     format = GST_VIDEO_FORMAT_RGBA;
   } else if (ni2src->depth.isValid () && ni2src->sourcetype == SOURCETYPE_DEPTH) {
     format = GST_VIDEO_FORMAT_GRAY16_LE;
-  } else if (ni2src->color.isValid () && ni2src->sourcetype == SOURCETYPE_COLOR) {
+  } else if (ni2src->color.isValid () && ni2src->sourcetype == SOURCETYPE_COLOR
+      && ni2src->colorpixfmt == openni::PIXEL_FORMAT_RGB888) {
     format = GST_VIDEO_FORMAT_RGB;
   } else {
     return gst_caps_new_empty ();
@@ -452,7 +452,8 @@ gst_openni2src_decide_allocation (GstBaseSrc * bsrc, GstQuery * query)
 
   if (gst_query_find_allocation_meta (query, GST_VIDEO_META_API_TYPE, NULL)) {
     GST_DEBUG_OBJECT (pool, "activate Video Meta");
-    gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META);
+    gst_buffer_pool_config_add_option (config,
+        GST_BUFFER_POOL_OPTION_VIDEO_META);
   }
 
   gst_buffer_pool_set_config (pool, config);