Remove unnecessary code.

Change-Id: I338244aea99fb6f0faca94aad1e0214d13444880
Signed-off-by: Sangkyu Park <sk1122.park@samsung.com>

diff --git a/gst/rtsp-server/gstwfdmessage.c b/gst/rtsp-server/gstwfdmessage.c
index 1c08c6e..071d390 100755 (executable)
--- a/gst/rtsp-server/gstwfdmessage.c
+++ b/gst/rtsp-server/gstwfdmessage.c
@@ -317,23 +317,6 @@ gst_wfd_message_uninit (GstWFDMessage * msg)
     FREE_STRING(msg->preferred_display_mode);
   }
 
-  if (msg->uibc_capability) {
-    if (msg->uibc_capability->hidc_cap_list.next) {
-      detailed_cap *list = msg->uibc_capability->hidc_cap_list.next;
-      detailed_cap *temp = NULL;
-      while (list) {
-        temp = list->next;
-        FREE_STRING(list);
-        list = temp;
-      }
-    }
-    FREE_STRING(msg->uibc_capability);
-  }
-
-  if (msg->uibc_setting) {
-    FREE_STRING(msg->uibc_setting);
-  }
-
   if (msg->standby_resume_capability) {
     FREE_STRING(msg->standby_resume_capability);
   }
@@ -413,23 +396,6 @@ _read_string_space_ended (gchar * dest, guint size, gchar * src)
 }
 
 static void
-_read_string_char_ended (gchar * dest, guint size, gchar del, gchar * src)
-{
-  guint idx = 0;
-
-  while (*src != del && *src != '\0') {
-    if (idx < size - 1)
-      dest[idx++] = *src;
-    src++;
-  }
-
-  if (size > 0)
-    dest[idx] = '\0';
-
-  return;
-}
-
-static void
 _read_string_attr_and_value (gchar * attr, gchar * value, guint tsize,
     guint vsize, gchar del, gchar * src)
 {
@@ -474,7 +440,6 @@ gst_wfd_parse_attribute (gchar * buffer, GstWFDMessage * msg)
 #define WFD_SKIP_EQUAL(q) if (*q && *q == '=') q++
 #define WFD_SKIP_COMMA(q) if (*q && g_ascii_ispunct (*q)) q++
 #define WFD_READ_STRING(field) _read_string_space_ended (temp, sizeof (temp), v); v+=strlen(temp); REPLACE_STRING (field, temp)
-#define WFD_READ_CHAR_END_STRING(field, del) _read_string_char_ended (temp, sizeof (temp), del, v); v+=strlen(temp); REPLACE_STRING (field, temp)
 #define WFD_READ_UINT32(field) _read_string_space_ended (temp, sizeof (temp), v); v+=strlen(temp); field = strtoul (temp, NULL, 16)
 #define WFD_READ_UINT32_DIGIT(field) _read_string_space_ended (temp, sizeof (temp), v); v+=strlen(temp); field = strtoul (temp, NULL, 10)
 
@@ -754,160 +719,6 @@ gst_wfd_parse_attribute (gchar * buffer, GstWFDMessage * msg)
         WFD_SKIP_SPACE (v);
       }
     }
-  } else if (!g_strcmp0 (attr, GST_STRING_WFD_UIBC_CAPABILITY)) {
-    msg->uibc_capability = g_new0 (GstWFDUibcCapability, 1);
-    if (strstr (v, "input_category_list")) {
-      gchar *tstring = NULL;
-      msg->uibc_capability->uibcsupported = TRUE;
-      WFD_SKIP_SPACE (v);
-      WFD_READ_CHAR_END_STRING (tstring, '=');
-      if (!g_strcmp0 (tstring, "input_category_list")) {
-        gchar temp[8192];
-        guint rem_len, read_len = 0;
-        WFD_READ_CHAR_END_STRING (tstring, ';');
-        rem_len = strlen (tstring);
-        do {
-          WFD_SKIP_SPACE (v);
-          _read_string_char_ended (temp, 8192, ',', tstring + read_len);
-          read_len += (strlen (temp) + 1);
-          if (strstr (temp, "GENERIC"))
-            msg->uibc_capability->input_category_list.input_cat |=
-                GST_WFD_UIBC_INPUT_CAT_GENERIC;
-          else if (strstr (temp, "HIDC"))
-            msg->uibc_capability->input_category_list.input_cat |=
-                GST_WFD_UIBC_INPUT_CAT_HIDC;
-          else
-            msg->uibc_capability->input_category_list.input_cat |=
-                GST_WFD_UIBC_INPUT_CAT_UNKNOWN;
-        } while (read_len < rem_len);
-
-        if ((v = strstr (v, "generic_cap_list"))) {
-        WFD_READ_CHAR_END_STRING (tstring, '=');
-        if (!g_strcmp0 (tstring, "generic_cap_list")) {
-          gchar temp[8192];
-          guint rem_len, read_len = 0;
-          WFD_SKIP_SPACE (v);
-          WFD_READ_CHAR_END_STRING (tstring, ';');
-          rem_len = strlen (tstring);
-          do {
-            _read_string_char_ended (temp, 8192, ',', tstring + read_len);
-            read_len += (strlen (temp) + 1);
-            if (strstr (temp, "Keyboard"))
-              msg->uibc_capability->generic_cap_list.inp_type |=
-                  GST_WFD_UIBC_INPUT_TYPE_KEYBOARD;
-            else if (strstr (temp, "Mouse"))
-              msg->uibc_capability->generic_cap_list.inp_type |=
-                  GST_WFD_UIBC_INPUT_TYPE_MOUSE;
-            else if (strstr (temp, "SingleTouch"))
-              msg->uibc_capability->generic_cap_list.inp_type |=
-                  GST_WFD_UIBC_INPUT_TYPE_SINGLETOUCH;
-            else if (strstr (temp, "MultiTouch"))
-              msg->uibc_capability->generic_cap_list.inp_type |=
-                  GST_WFD_UIBC_INPUT_TYPE_MULTITOUCH;
-            else if (strstr (temp, "Joystick"))
-              msg->uibc_capability->generic_cap_list.inp_type |=
-                  GST_WFD_UIBC_INPUT_TYPE_JOYSTICK;
-            else if (strstr (temp, "Camera"))
-              msg->uibc_capability->generic_cap_list.inp_type |=
-                  GST_WFD_UIBC_INPUT_TYPE_CAMERA;
-            else if (strstr (temp, "Gesture"))
-              msg->uibc_capability->generic_cap_list.inp_type |=
-                  GST_WFD_UIBC_INPUT_TYPE_GESTURE;
-            else if (strstr (temp, "RemoteControl"))
-              msg->uibc_capability->generic_cap_list.inp_type |=
-                  GST_WFD_UIBC_INPUT_TYPE_REMOTECONTROL;
-            else
-              msg->uibc_capability->generic_cap_list.inp_type |=
-                  GST_WFD_UIBC_INPUT_TYPE_UNKNOWN;
-          } while (read_len < rem_len);
-        }
-        }
-
-        if ((v && (v = strstr (v, "hidc_cap_list")))) {
-        WFD_SKIP_SPACE (v);
-        WFD_READ_CHAR_END_STRING (tstring, '=');
-        if (!g_strcmp0 (tstring, "hidc_cap_list")) {
-          gchar temp[8192];
-          gchar inp_type[8192];
-          gchar inp_path[8192];
-          guint rem_len, read_len = 0;
-          detailed_cap *temp_cap;
-          WFD_READ_CHAR_END_STRING (tstring, ';');
-          rem_len = strlen (tstring);
-          msg->uibc_capability->hidc_cap_list.next = g_new0 (detailed_cap, 1);
-          temp_cap = msg->uibc_capability->hidc_cap_list.next;
-          do {
-            msg->uibc_capability->hidc_cap_list.cap_count++;
-            _read_string_char_ended (temp, 8192, ',', tstring + read_len);
-            read_len += (strlen (temp) + 1);
-            _read_string_attr_and_value (inp_type, inp_path, sizeof (inp_type),
-                sizeof (inp_path), '/', temp);
-            if (strstr (inp_type, "Keyboard"))
-              temp_cap->p.inp_type = GST_WFD_UIBC_INPUT_TYPE_KEYBOARD;
-            else if (strstr (inp_type, "Mouse"))
-              temp_cap->p.inp_type = GST_WFD_UIBC_INPUT_TYPE_MOUSE;
-            else if (strstr (inp_type, "SingleTouch"))
-              temp_cap->p.inp_type = GST_WFD_UIBC_INPUT_TYPE_SINGLETOUCH;
-            else if (strstr (inp_type, "MultiTouch"))
-              temp_cap->p.inp_type = GST_WFD_UIBC_INPUT_TYPE_MULTITOUCH;
-            else if (strstr (inp_type, "Joystick"))
-              temp_cap->p.inp_type = GST_WFD_UIBC_INPUT_TYPE_JOYSTICK;
-            else if (strstr (inp_type, "Camera"))
-              temp_cap->p.inp_type = GST_WFD_UIBC_INPUT_TYPE_CAMERA;
-            else if (strstr (inp_type, "Gesture"))
-              temp_cap->p.inp_type = GST_WFD_UIBC_INPUT_TYPE_GESTURE;
-            else if (strstr (inp_type, "RemoteControl"))
-              temp_cap->p.inp_type = GST_WFD_UIBC_INPUT_TYPE_REMOTECONTROL;
-            else
-              temp_cap->p.inp_type = GST_WFD_UIBC_INPUT_TYPE_UNKNOWN;
-
-            if (strstr (inp_path, "Infrared"))
-              temp_cap->p.inp_path = GST_WFD_UIBC_INPUT_PATH_INFRARED;
-            else if (strstr (inp_path, "USB"))
-              temp_cap->p.inp_path = GST_WFD_UIBC_INPUT_PATH_USB;
-            else if (strstr (inp_path, "BT"))
-              temp_cap->p.inp_path = GST_WFD_UIBC_INPUT_PATH_BT;
-            else if (strstr (inp_path, "Zigbee"))
-              temp_cap->p.inp_path = GST_WFD_UIBC_INPUT_PATH_ZIGBEE;
-            else if (strstr (inp_path, "Wi-Fi"))
-              temp_cap->p.inp_path = GST_WFD_UIBC_INPUT_PATH_WIFI;
-            else if (strstr (inp_path, "No-SP"))
-              temp_cap->p.inp_path = GST_WFD_UIBC_INPUT_PATH_NOSP;
-            else
-              temp_cap->p.inp_path = GST_WFD_UIBC_INPUT_PATH_UNKNOWN;
-            if (read_len < rem_len) {
-              temp_cap->next = g_new0 (detailed_cap, 1);
-              temp_cap = temp_cap->next;
-            }
-          } while (read_len < rem_len);
-        }
-
-          v = strstr (v, "port");
-          if (v) {
-            WFD_READ_CHAR_END_STRING (tstring, '=');
-            if (!g_strcmp0 (tstring, "port")) {
-              WFD_SKIP_EQUAL (v);
-              WFD_READ_CHAR_END_STRING (tstring, ';');
-              if (!strstr (tstring, "none")) {
-                msg->uibc_capability->tcp_port = strtoul (tstring, NULL, 10);
-              }
-            }
-          }
-        }
-
-      }
-    } else if (strstr (v, "none")) {
-      msg->uibc_capability->uibcsupported = FALSE;
-    }
-  } else if (!g_strcmp0 (attr, GST_STRING_WFD_UIBC_SETTING)) {
-    msg->uibc_setting = g_new0 (GstWFDUibcSetting, 1);
-    if (strlen (v)) {
-      WFD_SKIP_SPACE (v);
-      if (!g_strcmp0 (v, "enable"))
-        msg->uibc_setting->uibc_setting = TRUE;
-      else
-        msg->uibc_setting->uibc_setting = FALSE;
-    }
   } else if (!g_strcmp0 (attr, GST_STRING_WFD_STANDBY_RESUME_CAPABILITY)) {
     msg->standby_resume_capability = g_new0 (GstWFDStandbyResumeCapability, 1);
     if (strlen (v)) {
@@ -1261,153 +1072,6 @@ gst_wfd_message_as_text (const GstWFDMessage * msg)
     g_string_append_printf (lines, "\r\n");
   }
 
-  if (msg->uibc_capability) {
-    g_string_append_printf (lines, GST_STRING_WFD_UIBC_CAPABILITY);
-    g_string_append_printf (lines, ":");
-    if (msg->uibc_capability->uibcsupported) {
-      g_string_append_printf (lines, " input_category_list=");
-      if (msg->uibc_capability->input_category_list.input_cat) {
-        guint32 tempcap = 0;
-        if (msg->uibc_capability->
-            input_category_list.input_cat & GST_WFD_UIBC_INPUT_CAT_GENERIC) {
-          tempcap |= GST_WFD_UIBC_INPUT_CAT_GENERIC;
-          g_string_append_printf (lines, "GENERIC");
-          if (msg->uibc_capability->input_category_list.input_cat != tempcap)
-            g_string_append_printf (lines, ", ");
-        }
-        if (msg->uibc_capability->
-            input_category_list.input_cat & GST_WFD_UIBC_INPUT_CAT_HIDC) {
-          tempcap |= GST_WFD_UIBC_INPUT_CAT_HIDC;
-          g_string_append_printf (lines, "HIDC");
-          if (msg->uibc_capability->input_category_list.input_cat != tempcap)
-            g_string_append_printf (lines, ", ");
-        }
-      } else
-        g_string_append_printf (lines, "none");
-      g_string_append_printf (lines, ";");
-      g_string_append_printf (lines, " generic_cap_list=");
-      if (msg->uibc_capability->generic_cap_list.inp_type) {
-        guint32 tempcap = 0;
-        if (msg->uibc_capability->
-            generic_cap_list.inp_type & GST_WFD_UIBC_INPUT_TYPE_KEYBOARD) {
-          tempcap |= GST_WFD_UIBC_INPUT_TYPE_KEYBOARD;
-          g_string_append_printf (lines, "Keyboard");
-          if (msg->uibc_capability->generic_cap_list.inp_type != tempcap)
-            g_string_append_printf (lines, ", ");
-        }
-        if (msg->uibc_capability->
-            generic_cap_list.inp_type & GST_WFD_UIBC_INPUT_TYPE_MOUSE) {
-          tempcap |= GST_WFD_UIBC_INPUT_TYPE_MOUSE;
-          g_string_append_printf (lines, "Mouse");
-          if (msg->uibc_capability->generic_cap_list.inp_type != tempcap)
-            g_string_append_printf (lines, ", ");
-        }
-        if (msg->uibc_capability->
-            generic_cap_list.inp_type & GST_WFD_UIBC_INPUT_TYPE_SINGLETOUCH) {
-          tempcap |= GST_WFD_UIBC_INPUT_TYPE_SINGLETOUCH;
-          g_string_append_printf (lines, "SingleTouch");
-          if (msg->uibc_capability->generic_cap_list.inp_type != tempcap)
-            g_string_append_printf (lines, ", ");
-        }
-        if (msg->uibc_capability->
-            generic_cap_list.inp_type & GST_WFD_UIBC_INPUT_TYPE_MULTITOUCH) {
-          tempcap |= GST_WFD_UIBC_INPUT_TYPE_MULTITOUCH;
-          g_string_append_printf (lines, "MultiTouch");
-          if (msg->uibc_capability->generic_cap_list.inp_type != tempcap)
-            g_string_append_printf (lines, ", ");
-        }
-        if (msg->uibc_capability->
-            generic_cap_list.inp_type & GST_WFD_UIBC_INPUT_TYPE_JOYSTICK) {
-          tempcap |= GST_WFD_UIBC_INPUT_TYPE_JOYSTICK;
-          g_string_append_printf (lines, "Joystick");
-          if (msg->uibc_capability->generic_cap_list.inp_type != tempcap)
-            g_string_append_printf (lines, ", ");
-        }
-        if (msg->uibc_capability->
-            generic_cap_list.inp_type & GST_WFD_UIBC_INPUT_TYPE_CAMERA) {
-          tempcap |= GST_WFD_UIBC_INPUT_TYPE_CAMERA;
-          g_string_append_printf (lines, "Camera");
-          if (msg->uibc_capability->generic_cap_list.inp_type != tempcap)
-            g_string_append_printf (lines, ", ");
-        }
-        if (msg->uibc_capability->
-            generic_cap_list.inp_type & GST_WFD_UIBC_INPUT_TYPE_GESTURE) {
-          tempcap |= GST_WFD_UIBC_INPUT_TYPE_GESTURE;
-          g_string_append_printf (lines, "Gesture");
-          if (msg->uibc_capability->generic_cap_list.inp_type != tempcap)
-            g_string_append_printf (lines, ", ");
-        }
-        if (msg->uibc_capability->
-            generic_cap_list.inp_type & GST_WFD_UIBC_INPUT_TYPE_REMOTECONTROL) {
-          tempcap |= GST_WFD_UIBC_INPUT_TYPE_REMOTECONTROL;
-          g_string_append_printf (lines, "RemoteControl");
-          if (msg->uibc_capability->generic_cap_list.inp_type != tempcap)
-            g_string_append_printf (lines, ", ");
-        }
-      } else
-        g_string_append_printf (lines, "none");
-      g_string_append_printf (lines, ";");
-      g_string_append_printf (lines, " hidc_cap_list=");
-      if (msg->uibc_capability->hidc_cap_list.cap_count) {
-        detailed_cap *temp_cap = msg->uibc_capability->hidc_cap_list.next;
-        while (temp_cap) {
-          if (temp_cap->p.inp_type == GST_WFD_UIBC_INPUT_TYPE_KEYBOARD)
-            g_string_append_printf (lines, "Keyboard");
-          else if (temp_cap->p.inp_type == GST_WFD_UIBC_INPUT_TYPE_MOUSE)
-            g_string_append_printf (lines, "Mouse");
-          else if (temp_cap->p.inp_type == GST_WFD_UIBC_INPUT_TYPE_SINGLETOUCH)
-            g_string_append_printf (lines, "SingleTouch");
-          else if (temp_cap->p.inp_type == GST_WFD_UIBC_INPUT_TYPE_MULTITOUCH)
-            g_string_append_printf (lines, "MultiTouch");
-          else if (temp_cap->p.inp_type == GST_WFD_UIBC_INPUT_TYPE_JOYSTICK)
-            g_string_append_printf (lines, "Joystick");
-          else if (temp_cap->p.inp_type == GST_WFD_UIBC_INPUT_TYPE_CAMERA)
-            g_string_append_printf (lines, "Camera");
-          else if (temp_cap->p.inp_type == GST_WFD_UIBC_INPUT_TYPE_GESTURE)
-            g_string_append_printf (lines, "Gesture");
-          else if (temp_cap->p.inp_type ==
-              GST_WFD_UIBC_INPUT_TYPE_REMOTECONTROL)
-            g_string_append_printf (lines, "RemoteControl");
-          g_string_append_printf (lines, "/");
-          if (temp_cap->p.inp_path == GST_WFD_UIBC_INPUT_PATH_INFRARED)
-            g_string_append_printf (lines, "Infrared");
-          else if (temp_cap->p.inp_path == GST_WFD_UIBC_INPUT_PATH_USB)
-            g_string_append_printf (lines, "USB");
-          else if (temp_cap->p.inp_path == GST_WFD_UIBC_INPUT_PATH_BT)
-            g_string_append_printf (lines, "BT");
-          else if (temp_cap->p.inp_path == GST_WFD_UIBC_INPUT_PATH_ZIGBEE)
-            g_string_append_printf (lines, "Zigbee");
-          else if (temp_cap->p.inp_path == GST_WFD_UIBC_INPUT_PATH_WIFI)
-            g_string_append_printf (lines, "Wi-Fi");
-          else if (temp_cap->p.inp_path == GST_WFD_UIBC_INPUT_PATH_NOSP)
-            g_string_append_printf (lines, "No-SP");
-          temp_cap = temp_cap->next;
-          if (temp_cap)
-            g_string_append_printf (lines, ", ");
-        }
-      } else
-        g_string_append_printf (lines, "none");
-      g_string_append_printf (lines, ";");
-      if (msg->uibc_capability->tcp_port)
-        g_string_append_printf (lines, "port=%u",
-            msg->uibc_capability->tcp_port);
-      else
-        g_string_append_printf (lines, "port=none");
-    } else
-      g_string_append_printf (lines, " none");
-    g_string_append_printf (lines, "\r\n");
-  }
-
-  if (msg->uibc_setting) {
-    g_string_append_printf (lines, GST_STRING_WFD_UIBC_SETTING);
-    g_string_append_printf (lines, ":");
-    if (msg->uibc_setting->uibc_setting)
-      g_string_append_printf (lines, " enable");
-    else
-      g_string_append_printf (lines, " disable");
-    g_string_append_printf (lines, "\r\n");
-  }
-
   if (msg->standby_resume_capability) {
     g_string_append_printf (lines, GST_STRING_WFD_STANDBY_RESUME_CAPABILITY);
     g_string_append_printf (lines, ":");
@@ -1506,14 +1170,6 @@ gst_wfd_message_param_names_as_text (const GstWFDMessage * msg)
     g_string_append_printf (lines, GST_STRING_WFD_PREFERRED_DISPLAY_MODE);
     g_string_append_printf (lines, "\r\n");
   }
-  if (msg->uibc_capability) {
-    g_string_append_printf (lines, GST_STRING_WFD_UIBC_CAPABILITY);
-    g_string_append_printf (lines, "\r\n");
-  }
-  if (msg->uibc_setting) {
-    g_string_append_printf (lines, GST_STRING_WFD_UIBC_SETTING);
-    g_string_append_printf (lines, "\r\n");
-  }
   if (msg->standby_resume_capability) {
     g_string_append_printf (lines, GST_STRING_WFD_STANDBY_RESUME_CAPABILITY);
     g_string_append_printf (lines, "\r\n");
@@ -1705,108 +1361,6 @@ gst_wfd_message_dump (const GstWFDMessage * msg)
     g_print ("\r\n");
   }
 
-  if (msg->uibc_capability) {
-    g_print ("wfd_uibc_capability \r\n");
-    g_print ("input category list:");
-    if (msg->uibc_capability->
-        input_category_list.input_cat & GST_WFD_UIBC_INPUT_CAT_GENERIC)
-      g_print ("GENERIC");
-    if (msg->uibc_capability->
-        input_category_list.input_cat & GST_WFD_UIBC_INPUT_CAT_HIDC)
-      g_print ("HIDC");
-    if (!msg->uibc_capability->input_category_list.input_cat)
-      g_print ("none");
-    if (msg->uibc_capability->
-        input_category_list.input_cat & GST_WFD_UIBC_INPUT_CAT_GENERIC) {
-      g_print ("generic cap list: ");
-      if (msg->uibc_capability->
-          generic_cap_list.inp_type & GST_WFD_UIBC_INPUT_TYPE_KEYBOARD)
-        g_print ("keyboard ");
-      if (msg->uibc_capability->
-          generic_cap_list.inp_type & GST_WFD_UIBC_INPUT_TYPE_MOUSE)
-        g_print ("mouse ");
-      if (msg->uibc_capability->
-          generic_cap_list.inp_type & GST_WFD_UIBC_INPUT_TYPE_SINGLETOUCH)
-        g_print ("single-touch ");
-      if (msg->uibc_capability->
-          generic_cap_list.inp_type & GST_WFD_UIBC_INPUT_TYPE_MULTITOUCH)
-        g_print ("multi-touch ");
-      if (msg->uibc_capability->
-          generic_cap_list.inp_type & GST_WFD_UIBC_INPUT_TYPE_JOYSTICK)
-        g_print ("joystick ");
-      if (msg->uibc_capability->
-          generic_cap_list.inp_type & GST_WFD_UIBC_INPUT_TYPE_CAMERA)
-        g_print ("camera ");
-      if (msg->uibc_capability->
-          generic_cap_list.inp_type & GST_WFD_UIBC_INPUT_TYPE_GESTURE)
-        g_print ("gesture ");
-      if (msg->uibc_capability->
-          generic_cap_list.inp_type & GST_WFD_UIBC_INPUT_TYPE_REMOTECONTROL)
-        g_print ("remote control ");
-      if (!msg->uibc_capability->generic_cap_list.inp_type)
-        g_print ("none ");
-    }
-    if (msg->uibc_capability->
-        input_category_list.input_cat & GST_WFD_UIBC_INPUT_CAT_HIDC) {
-      g_print ("hidc cap list:");
-      if (msg->uibc_capability->hidc_cap_list.cap_count) {
-        detailed_cap *temp_cap = msg->uibc_capability->hidc_cap_list.next;
-        while (temp_cap) {
-          if (temp_cap->p.inp_type & GST_WFD_UIBC_INPUT_TYPE_KEYBOARD) {
-            g_print ("keyboard ");
-          } else if (temp_cap->p.inp_type & GST_WFD_UIBC_INPUT_TYPE_MOUSE) {
-            g_print ("mouse ");
-          } else if (temp_cap->p.inp_type & GST_WFD_UIBC_INPUT_TYPE_SINGLETOUCH) {
-            g_print ("single-touch ");
-          } else if (temp_cap->p.inp_type & GST_WFD_UIBC_INPUT_TYPE_MULTITOUCH) {
-            g_print ("multi-touch ");
-          } else if (temp_cap->p.inp_type & GST_WFD_UIBC_INPUT_TYPE_JOYSTICK) {
-            g_print ("joystick ");
-          } else if (temp_cap->p.inp_type & GST_WFD_UIBC_INPUT_TYPE_CAMERA) {
-            g_print ("camera ");
-          } else if (temp_cap->p.inp_type & GST_WFD_UIBC_INPUT_TYPE_GESTURE) {
-            g_print ("gesture ");
-          } else if (temp_cap->
-              p.inp_type & GST_WFD_UIBC_INPUT_TYPE_REMOTECONTROL) {
-            g_print ("remote control ");
-          } else if (!temp_cap->p.inp_type) {
-            g_print ("none ");
-          }
-          if (temp_cap->p.inp_path & GST_WFD_UIBC_INPUT_PATH_INFRARED) {
-            g_print ("infrared");
-          } else if (temp_cap->p.inp_path & GST_WFD_UIBC_INPUT_PATH_USB) {
-            g_print ("usb");
-          } else if (temp_cap->p.inp_path & GST_WFD_UIBC_INPUT_PATH_BT) {
-            g_print ("bluetooth");
-          } else if (temp_cap->p.inp_path & GST_WFD_UIBC_INPUT_PATH_WIFI) {
-            g_print ("Wi-Fi");
-          } else if (temp_cap->p.inp_path & GST_WFD_UIBC_INPUT_PATH_ZIGBEE) {
-            g_print ("Zigbee");
-          } else if (temp_cap->p.inp_path & GST_WFD_UIBC_INPUT_PATH_NOSP) {
-            g_print ("No-SP");
-          } else if (!temp_cap->p.inp_path) {
-            g_print ("none");
-          }
-          temp_cap = temp_cap->next;
-        }
-      }
-    }
-    if (msg->uibc_capability->tcp_port)
-      g_print ("tcp port:%u", msg->uibc_capability->tcp_port);
-    if (!msg->uibc_capability->tcp_port)
-      g_print ("tcp port: none");
-    g_print ("\r\n");
-  }
-
-  if (msg->uibc_setting) {
-    g_print ("wfd_uibc_setting: ");
-    if (msg->uibc_setting->uibc_setting) {
-      g_print ("true");
-    } else
-      g_print ("false");
-    g_print ("\r\n");
-  }
-
   if (msg->standby_resume_capability) {
     g_print (GST_STRING_WFD_STANDBY_RESUME_CAPABILITY);
     g_print ("\r\n");

diff --git a/gst/rtsp-server/gstwfdmessage.h b/gst/rtsp-server/gstwfdmessage.h
index a811198..3261289 100755 (executable)
--- a/gst/rtsp-server/gstwfdmessage.h
+++ b/gst/rtsp-server/gstwfdmessage.h
@@ -61,8 +61,6 @@ G_BEGIN_DECLS
 #define GST_STRING_WFD_I2C                        "wfd_I2C"
 #define GST_STRING_WFD_AV_FORMAT_CHANGE_TIMING    "wfd_av_format_change_timing"
 #define GST_STRING_WFD_PREFERRED_DISPLAY_MODE     "wfd_preferred_display_mode"
-#define GST_STRING_WFD_UIBC_CAPABILITY            "wfd_uibc_capability"
-#define GST_STRING_WFD_UIBC_SETTING               "wfd_uibc_setting"
 #define GST_STRING_WFD_STANDBY_RESUME_CAPABILITY  "wfd_standby_resume_capability"
 #define GST_STRING_WFD_STANDBY                    "wfd_standby"
 #define GST_STRING_WFD_CONNECTOR_TYPE             "wfd_connector_type"
@@ -248,34 +246,6 @@ typedef enum {
 } GstWFDSinkType;
 
 typedef enum {
-  GST_WFD_UIBC_INPUT_CAT_UNKNOWN   = 0,
-  GST_WFD_UIBC_INPUT_CAT_GENERIC   = (1 << 0),
-  GST_WFD_UIBC_INPUT_CAT_HIDC      = (1 << 1),
-} GstWFDUibcinput_cat;
-
-typedef enum {
-  GST_WFD_UIBC_INPUT_TYPE_UNKNOWN        = 0,
-  GST_WFD_UIBC_INPUT_TYPE_KEYBOARD       = (1 << 0),
-  GST_WFD_UIBC_INPUT_TYPE_MOUSE          = (1 << 1),
-  GST_WFD_UIBC_INPUT_TYPE_SINGLETOUCH    = (1 << 2),
-  GST_WFD_UIBC_INPUT_TYPE_MULTITOUCH     = (1 << 3),
-  GST_WFD_UIBC_INPUT_TYPE_JOYSTICK       = (1 << 4),
-  GST_WFD_UIBC_INPUT_TYPE_CAMERA         = (1 << 5),
-  GST_WFD_UIBC_INPUT_TYPE_GESTURE        = (1 << 6),
-  GST_WFD_UIBC_INPUT_TYPE_REMOTECONTROL  = (1 << 7)
-} GstWFDUibcinp_type;
-
-typedef enum {
-  GST_WFD_UIBC_INPUT_PATH_UNKNOWN   = 0,
-  GST_WFD_UIBC_INPUT_PATH_INFRARED  = (1 << 0),
-  GST_WFD_UIBC_INPUT_PATH_USB       = (1 << 1),
-  GST_WFD_UIBC_INPUT_PATH_BT        = (1 << 2),
-  GST_WFD_UIBC_INPUT_PATH_ZIGBEE    = (1 << 3),
-  GST_WFD_UIBC_INPUT_PATH_WIFI      = (1 << 4),
-  GST_WFD_UIBC_INPUT_PATH_NOSP      = (1 << 5)
-} GstWFDUibcinp_path;
-
-typedef enum {
   GST_WFD_CONNECTOR_VGA           = 0,
   GST_WFD_CONNECTOR_S,
   GST_WFD_CONNECTOR_COMPOSITE,
@@ -436,43 +406,6 @@ typedef struct {
 } GstWFDPreferredDisplayMode;
 
 typedef struct {
-  guint32 input_cat;
-} GstWFDInputCategoryList;
-
-typedef struct {
-  guint32 inp_type;
-} GstWFDGenericCategoryList;
-
-typedef struct _detailed_cap detailed_cap;
-
-typedef struct {
-  GstWFDUibcinp_type inp_type;
-  GstWFDUibcinp_path inp_path;
-} GstWFDHIDCTypePathPair;
-
-struct _detailed_cap {
-  GstWFDHIDCTypePathPair p;
-  detailed_cap *next;
-};
-
-typedef struct {
-  guint cap_count;
-  detailed_cap *next;
-} GstWFDHIDCCategoryList;
-
-typedef struct {
-  gboolean uibcsupported;
-  GstWFDInputCategoryList input_category_list;
-  GstWFDGenericCategoryList generic_cap_list;
-  GstWFDHIDCCategoryList hidc_cap_list;
-  guint32 tcp_port;
-} GstWFDUibcCapability;
-
-typedef struct {
-  gboolean uibc_setting;
-} GstWFDUibcSetting;
-
-typedef struct {
   gboolean standby_resume_cap;
 } GstWFDStandbyResumeCapability;
 
@@ -522,8 +455,6 @@ typedef struct {
   GstWFDI2C *I2C;
   GstWFDAVFormatChangeTiming *av_format_change_timing;
   GstWFDPreferredDisplayMode *preferred_display_mode;
-  GstWFDUibcCapability *uibc_capability;
-  GstWFDUibcSetting *uibc_setting;
   GstWFDStandbyResumeCapability *standby_resume_capability;
   GstWFDStandby *standby;
   GstWFDConnectorType *connector_type;