Modified converting functions to get and set params 73/45973/1
authorVyacheslav Valkovoy <v.valkovoy@samsung.com>
Wed, 12 Aug 2015 15:07:04 +0000 (18:07 +0300)
committerVyacheslav Valkovoy <v.valkovoy@samsung.com>
Wed, 12 Aug 2015 15:07:04 +0000 (18:07 +0300)
Change-Id: I4f769e0331cc9ba15a73b283d0791c4459e06534
Signed-off-by: Vyacheslav Valkovoy <v.valkovoy@samsung.com>
include/media_streamer_gst.h
include/media_streamer_priv.h
src/media_streamer_gst.c
src/media_streamer_node.c
test/media_streamer_test.c

index 76eae5a8b1bdd7051ac55467e2738c20299232f6..5a1297c99db0649999564566aa63c71ec98032b3 100755 (executable)
@@ -94,7 +94,7 @@ gboolean __ms_get_rtp_elements(media_streamer_node_s *ms_node,
  * @since_tizen 3.0
  */
 gboolean __ms_element_set_property(GstElement *src_element,
-                                   const gchar *key, const gchar *param_value);
+                                   const char *key, const gchar *param_value);
 
 /**
  * @brief Unlink all pads into GstElement.
index 07a3ec6d3ef507646383de50827b581b936ff2ff..305ba8774f9456c97e87323c8a813d3715e176ac 100755 (executable)
@@ -39,6 +39,9 @@ typedef struct {
        void *user_data;
 } media_streamer_callback_s;
 
+#define PROPERTY_COUNT 24
+extern char *param_table[PROPERTY_COUNT][2];
+
 /**
  * @brief Media Streamer sink callbacks structure.
  *
@@ -123,6 +126,14 @@ int __ms_create(media_streamer_s *ms_streamer);
  */
 int __ms_state_change(media_streamer_s *ms_streamer, media_streamer_state_e state);
 
+/**
+ * @brief Returns initial parameter name among defined parameter values.
+ *
+ * @since_tizen 3.0
+ */
+void __ms_node_check_param_name(GstElement *element, gboolean name_is_known,
+                                const char *param_name, char **init_param_name);
+
 #ifdef __cplusplus
 }
 
index edbbb7b6c2380c071813ac5c6bc47f04e3f76dfc..3cc944ec9f537b7e9a89ef6ece8080552efae66d 100755 (executable)
@@ -106,15 +106,13 @@ static GObject *__ms_get_property_owner(GstElement *element, const gchar *key, G
                ms_retvm_if(param == NULL || obj == NULL, NULL, "Error: Bin object does not have property [%s].", key);
        } else {
                obj = G_OBJECT(element);
-               param = g_object_class_find_property
-                       (G_OBJECT_GET_CLASS(obj), key);
+               param = g_object_class_find_property(G_OBJECT_GET_CLASS(obj), key);
        }
 
        g_value_init(value, param->value_type);
 
-       if (param->flags & G_PARAM_WRITABLE) {
-               g_object_get_property(G_OBJECT(obj), key, value);
-       } else {
+       if (!param->flags & G_PARAM_WRITABLE) {
+
                /* Skip properties which user can not change. */
                ms_error("Error: node param [%s] is not writable!", key);
                return NULL;
@@ -124,104 +122,126 @@ static GObject *__ms_get_property_owner(GstElement *element, const gchar *key, G
        return obj;
 }
 
-gboolean __ms_element_set_property(GstElement *element, const gchar *key, const gchar *param_value)
+gboolean __ms_element_set_property(GstElement *element, const char *key, const gchar *param_value)
 {
        gchar *element_name = gst_element_get_name(element);
        GValue value = G_VALUE_INIT;
-       GObject *obj = __ms_get_property_owner(element, key, &value);
-
-       if (obj == NULL) {
-               ms_debug("Element [%s] does not have property [%s].", element_name, key);
-               MS_SAFE_GFREE(element_name);
-               return FALSE;
-       }
-
-       switch (G_VALUE_TYPE(&value)) {
-               case G_TYPE_STRING:
-                       g_value_set_string(&value, param_value);
-                       ms_info("Set string value: [%s]", g_value_get_string(&value));
-                       break;
 
-               case G_TYPE_BOOLEAN: {
-                               gboolean bool_val = !g_strcmp0(param_value, "true") ? TRUE : FALSE;
-                               g_value_set_boolean(&value, bool_val);
-                               ms_info("Set boolean value: [%d]", g_value_get_boolean(&value));
-                               break;
-                       }
+       char *init_name = NULL;
+       int pint = 0;
+       gboolean bool_val = false;
 
-               case G_TYPE_ULONG: {
-                               unsigned long pulong = atol(param_value);
-                               g_value_set_ulong(&value, pulong);
-                               ms_info("Set ulong value: [%lu]", g_value_get_ulong(&value));
-                               break;
-                       }
+       __ms_node_check_param_name(element, TRUE, key, &init_name);
 
-               case G_TYPE_LONG: {
-                               long plong = atol(param_value);
-                               g_value_set_long(&value, plong);
-                               ms_info("Set long value: [%ld]", g_value_get_long(&value));
-                               break;
-                       }
-
-               case G_TYPE_UINT: {
-                               unsigned int puint = atoi(param_value);
-                               g_value_set_uint(&value, puint);
-                               ms_info("Set uint value: [%u]", g_value_get_uint(&value));
-                               break;
-                       }
-
-               case G_TYPE_INT: {
-                               int pint = atoi(param_value);
-                               g_value_set_int(&value, pint);
-                               ms_info("Set int value: [%d]", g_value_get_int(&value));
-                               break;
-                       }
-
-               case G_TYPE_UINT64: {
-                               unsigned long long puint64 = strtoull(param_value, NULL, 10);
-                               g_value_set_uint64(&value, puint64);
-                               ms_info("Set long value: [%llu]", g_value_get_uint64(&value));
-                               break;
-                       }
+       if (init_name)
+       {
+               GObject *obj = __ms_get_property_owner(element, init_name, &value);
 
-               case G_TYPE_INT64: {
-                               long long pint64 = strtoll(param_value, NULL, 10);
-                               g_value_set_int64(&value, pint64);
-                               ms_info("Set long value: [%ll]", g_value_get_int64(&value));
-                               break;
-                       }
-               case G_TYPE_FLOAT: {
-                               float pfloat = strtof(param_value, NULL);
-                               g_value_set_float(&value, pfloat);
-                               ms_info("Set long value: [%15.7g]", g_value_get_float(&value));
-                               break;
-                       }
-               case G_TYPE_DOUBLE: {
-                               double pdouble = strtod(param_value, NULL);
-                               g_value_set_double(&value, pdouble);
-                               ms_info("Set long value: [%15.7g]", g_value_get_float(&value));
-                               break;
-                       }
-               default:
-                       if (G_VALUE_TYPE(&value) == GST_TYPE_CAPS) {
-                               GstCaps *caps = gst_caps_from_string(param_value);
+               if (obj == NULL) {
+                       ms_debug("Element [%s] does not have property [%s].", element_name, init_name);
+                       MS_SAFE_GFREE(element_name);
+                       return FALSE;
+               }
 
-                               if (!caps) {
-                                       ms_error("Can not create caps from param value.");
-                                       return FALSE;
-                               } else {
-                                       ms_info("Create Caps from params and set to the object.");
-                                       g_object_set(obj, key, caps, NULL);
-                                       gst_caps_unref(caps);
-                               }
-                               return TRUE;
-                       } else {
-                               ms_info("Got unknown type with param->value_type [%d]", G_VALUE_TYPE(&value));
-                               return FALSE;
-                       }
-                       break;
+               if (!g_strcmp0(init_name, MEDIA_STREAMER_PARAM_CAMERA_ID)) {
+                       pint = atoi(param_value);
+                       g_value_set_int(&value, pint);
+                       g_object_set(obj, init_name, pint, NULL);
+                       ms_info("Set int value: [%d]", g_value_get_int(&value));
+               } else if (!g_strcmp0(init_name, MEDIA_STREAMER_PARAM_CAPTURE_WIDTH)) {
+                       pint = atoi(param_value);
+                       g_value_set_int(&value, pint);
+                       g_object_set(obj, init_name, pint, NULL);
+                       ms_info("Set int value: [%d]", g_value_get_int(&value));
+               } else if (!g_strcmp0(init_name, MEDIA_STREAMER_PARAM_CAPTURE_HEIGHT)) {
+                       pint = atoi(param_value);
+                       g_value_set_int(&value, pint);
+                       g_object_set(obj, init_name, pint, NULL);
+                       ms_info("Set int value: [%d]", g_value_get_int(&value));
+               } else if (!g_strcmp0(init_name, MEDIA_STREAMER_PARAM_IS_LIVE_STREAM)) {
+                       bool_val = !g_strcmp0(param_value, "true") ? TRUE : FALSE;
+                       g_value_set_boolean(&value, bool_val);
+                       g_object_set(obj, init_name, bool_val, NULL);
+                       ms_info("Set boolean value: [%d]", g_value_get_boolean(&value));
+               } else if (!g_strcmp0(init_name, MEDIA_STREAMER_PARAM_URI)) {
+                       g_value_set_string(&value, param_value);
+                       g_object_set(obj, init_name, param_value, NULL);
+                       ms_info("Set string value: [%s]", g_value_get_string(&value));
+               } else if (!g_strcmp0(init_name, MEDIA_STREAMER_PARAM_USER_AGENT)) {
+                       g_value_set_string(&value, param_value);
+                       g_object_set(obj, init_name, param_value, NULL);
+                       ms_info("Set string value: [%s]", g_value_get_string(&value));
+               } else if (!g_strcmp0(init_name, MEDIA_STREAMER_PARAM_STREAM_TYPE)) {
+                       pint = atoi(param_value);
+                       g_object_set(obj, init_name, pint, NULL);
+                       ms_info("Set int value: [%d] ", pint);
+               } else if (!g_strcmp0(init_name, MEDIA_STREAMER_PARAM_PORT)) {
+                       pint = atoi(param_value);
+                       g_value_set_int(&value, pint);
+                       g_object_set(obj, init_name, pint, NULL);
+                       ms_info("Set int value: [%d]", g_value_get_int(&value));
+               } else if (!g_strcmp0(init_name, MEDIA_STREAMER_PARAM_VIDEO_IN_PORT)) {
+                       pint = atoi(param_value);
+                       g_value_set_int(&value, pint);
+                       g_object_set(obj, init_name, pint, NULL);
+                       ms_info("Set int value: [%d]", g_value_get_int(&value));
+               } else if (!g_strcmp0(init_name, MEDIA_STREAMER_PARAM_AUDIO_IN_PORT)) {
+                       pint = atoi(param_value);
+                       g_value_set_int(&value, pint);
+                       g_object_set(obj, init_name, pint, NULL);
+                       ms_info("Set int value: [%d]", g_value_get_int(&value));
+               } else if (!g_strcmp0(init_name, MEDIA_STREAMER_PARAM_VIDEO_OUT_PORT)) {
+                       pint = atoi(param_value);
+                       g_value_set_int(&value, pint);
+                       g_object_set(obj, init_name, pint, NULL);
+                       ms_info("Set int value: [%d]", g_value_get_int(&value));
+               } else if (!g_strcmp0(init_name, MEDIA_STREAMER_PARAM_AUDIO_OUT_PORT)) {
+                       pint = atoi(param_value);
+                       g_value_set_int(&value, pint);
+                       g_object_set(obj, init_name, pint, NULL);
+                       ms_info("Set int value: [%d]", g_value_get_int(&value));
+               } else if (!g_strcmp0(init_name, MEDIA_STREAMER_PARAM_IP_ADDRESS)) {
+                       g_value_set_string(&value, param_value);
+                       g_object_set(obj, init_name, param_value, NULL);
+                       ms_info("Set string value: [%s]", g_value_get_string(&value));
+               } else if (!g_strcmp0(init_name, MEDIA_STREAMER_PARAM_AUDIO_DEVICE)) {
+                       g_value_set_string(&value, param_value);
+                       g_object_set(obj, init_name, param_value, NULL);
+                       ms_info("Set string value: [%s]", g_value_get_string(&value));
+               } else if (!g_strcmp0(init_name, MEDIA_STREAMER_PARAM_CLOCK_SYNCHRONIZED)) {
+                       bool_val = !g_strcmp0(param_value, "true") ? TRUE : FALSE;
+                       g_value_set_boolean(&value, bool_val);
+                       g_object_set(obj, init_name, bool_val, NULL);
+                       ms_info("Set boolean value: [%d]", g_value_get_boolean(&value));
+               } else if (!g_strcmp0(init_name, MEDIA_STREAMER_PARAM_ROTATE)) {
+                       pint = atoi(param_value);
+                       g_object_set(obj, init_name, pint, NULL);
+                       ms_info("Set int value: [%d] ", pint);
+               } else if (!g_strcmp0(init_name, MEDIA_STREAMER_PARAM_FLIP)) {
+                       pint = atoi(param_value);
+                       g_object_set(obj, init_name, pint, NULL);
+                       ms_info("Set int value: [%d] ", pint);
+               } else if (!g_strcmp0(init_name, MEDIA_STREAMER_PARAM_DISPLAY_GEOMETRY_METHOD)) {
+                       pint = atoi(param_value);
+                       g_object_set(obj, init_name, pint, NULL);
+                       ms_info("Set int value: [%d] ", pint);
+               } else if (!g_strcmp0(init_name, MEDIA_STREAMER_PARAM_VISIBLE)) {
+                       bool_val = !g_strcmp0(param_value, "true") ? TRUE : FALSE;
+                       g_value_set_boolean(&value, bool_val);
+                       g_object_set(obj, init_name, bool_val, NULL);
+                       ms_info("Set boolean value: [%d]", g_value_get_boolean(&value));
+               } else if (!g_strcmp0(init_name, MEDIA_STREAMER_PARAM_HOST)) {
+                       g_value_set_string(&value, param_value);
+                       g_object_set(obj, init_name, param_value, NULL);
+                       ms_info("Set string value: [%s]", g_value_get_string(&value));
+               } else {
+                       ms_info("Got unknown type with param->value_type [%d]", G_VALUE_TYPE(&value));
+                       return FALSE;
+               }
+       } else {
+               ms_info("Can not set parameter [%s] in the node [%s]\n", key, gst_element_get_name(element));
        }
-       g_object_set_property(obj, key, &value);
+
        MS_SAFE_GFREE(element_name);
 
        return TRUE;
@@ -862,6 +882,34 @@ int __ms_add_node_into_bin(media_streamer_s *ms_streamer, media_streamer_node_s
        return ret;
 }
 
+static gboolean
+__ms_parse_gst_error(media_streamer_s *ms_streamer, GstMessage *message, GError *error)
+{
+       ms_retvm_if(!ms_streamer, FALSE, "Error: invalid Media Streamer handle.");
+       ms_retvm_if(!error, FALSE, "Error: invalid error handle.");
+       ms_retvm_if(!message, FALSE, "Error: invalid bus message handle.");
+
+       media_streamer_error_e ret_error = MEDIA_STREAMER_ERROR_NONE;
+       if (error->domain == GST_CORE_ERROR) {
+               ret_error = MEDIA_STREAMER_ERROR_INVALID_OPERATION;
+       } else if (error->domain == GST_LIBRARY_ERROR) {
+               ret_error = MEDIA_STREAMER_ERROR_INVALID_OPERATION;
+       } else if (error->domain == GST_RESOURCE_ERROR) {
+               ret_error = MEDIA_STREAMER_ERROR_RESOURCE_CONFLICT;
+       } else if (error->domain == GST_STREAM_ERROR) {
+               ret_error = MEDIA_STREAMER_ERROR_CONNECTION_FAILED;
+       } else {
+               ret_error = MEDIA_STREAMER_ERROR_INVALID_OPERATION;
+       }
+
+       /* post error to application */
+       if(ms_streamer->error_cb.callback) {
+               media_streamer_error_cb error_cb = (media_streamer_error_cb)ms_streamer->error_cb.callback;
+               error_cb((media_streamer_h)ms_streamer, ret_error, ms_streamer->error_cb.user_data);
+       }
+
+       return TRUE;
+}
 
 static gboolean __ms_bus_cb(GstBus *bus, GstMessage *message, gpointer userdata)
 {
@@ -878,7 +926,13 @@ static gboolean __ms_bus_cb(GstBus *bus, GstMessage *message, gpointer userdata)
                                        gchar *debug = NULL;
                                        gst_message_parse_error(message, &err, &debug);
 
-                                       ms_error("[Source: %s] Error: %s", GST_OBJECT_NAME(GST_OBJECT_CAST(GST_ELEMENT(GST_MESSAGE_SRC(message)))), err->message);
+                                       /* Transform gst error code to media streamer error code.
+                                        * then post it to application if needed */
+                                       __ms_parse_gst_error(ms_streamer, message, err);
+
+                                       ms_error("[Source: %s] Error: %s",
+                                                GST_OBJECT_NAME(GST_OBJECT_CAST(GST_ELEMENT(GST_MESSAGE_SRC(message)))),
+                                                err->message);
 
                                        g_error_free(err);
                                        MS_SAFE_FREE(debug);
index 2cff14026bfc3ffe49dd035976c172bcbf697b5b..187969eae5f5246210bfde09143b9fff6fe71db8 100755 (executable)
 #include <media_streamer_util.h>
 #include <media_streamer_gst.h>
 
+char *param_table[PROPERTY_COUNT][2] = {
+       {MEDIA_STREAMER_PARAM_CAMERA_ID, "camera-id"},
+       {MEDIA_STREAMER_PARAM_CAMERA_ID, "camera"},
+       {MEDIA_STREAMER_PARAM_CAMERA_ID, "device-name"},
+       {MEDIA_STREAMER_PARAM_CAPTURE_WIDTH, "capture-width"},
+       {MEDIA_STREAMER_PARAM_CAPTURE_HEIGHT, "capture-height"},
+       {MEDIA_STREAMER_PARAM_IS_LIVE_STREAM, "is-live"},
+       {MEDIA_STREAMER_PARAM_IS_LIVE_STREAM, "living"},
+       {MEDIA_STREAMER_PARAM_URI, "uri"},
+       {MEDIA_STREAMER_PARAM_URI, "location"},
+       {MEDIA_STREAMER_PARAM_USER_AGENT, "user-agent"},
+       {MEDIA_STREAMER_PARAM_STREAM_TYPE, "stream-type"},
+       {MEDIA_STREAMER_PARAM_PORT, "port"},
+       {MEDIA_STREAMER_PARAM_VIDEO_IN_PORT, "video_in_port"},
+       {MEDIA_STREAMER_PARAM_AUDIO_IN_PORT, "audio_in_port"},
+       {MEDIA_STREAMER_PARAM_VIDEO_OUT_PORT, "video_out_port"},
+       {MEDIA_STREAMER_PARAM_AUDIO_OUT_PORT, "audio_out_port"},
+       {MEDIA_STREAMER_PARAM_IP_ADDRESS, "address"},
+       {MEDIA_STREAMER_PARAM_AUDIO_DEVICE, "audio_device"},
+       {MEDIA_STREAMER_PARAM_CLOCK_SYNCHRONIZED, "sync"},
+       {MEDIA_STREAMER_PARAM_ROTATE, "rotate"},
+       {MEDIA_STREAMER_PARAM_FLIP, "flip"},
+       {MEDIA_STREAMER_PARAM_DISPLAY_GEOMETRY_METHOD, "display-geometry-method"},
+       {MEDIA_STREAMER_PARAM_VISIBLE, "visible"},
+       {MEDIA_STREAMER_PARAM_HOST, "host"}
+};
+
 static int __ms_node_set_property(media_streamer_node_s *ms_node,
                                   const gchar *param_key,
                                   const gchar *param_value)
@@ -525,92 +552,124 @@ int __ms_node_read_params_from_bundle(media_streamer_node_s *node,
        return ret;
 }
 
-static void __ms_node_get_param_value(GParamSpec *param, GValue value,char **string_value)
+static void __ms_node_get_param_value(GParamSpec *param, GValue value, char **string_value)
 {
-       char *value_in_string = NULL;
-
-       ms_info("%-20s: %s\n", g_param_spec_get_name(param), g_param_spec_get_blurb(param));
-
-       switch (G_VALUE_TYPE(&value)) {
-       case G_TYPE_STRING:
+       char *string_val = NULL;
+       GParamSpecInt *pint = NULL;
+
+       if (!g_strcmp0(param->name, MEDIA_STREAMER_PARAM_CAMERA_ID)) {
+               pint = G_PARAM_SPEC_INT(param);
+               string_val = g_strdup_printf("%d", g_value_get_int(&value));
+               ms_info("Got int value: [%s], range: %d - %d", string_val,
+                               pint->minimum, pint->maximum);
+       } else if (!g_strcmp0(param->name, MEDIA_STREAMER_PARAM_CAPTURE_WIDTH)) {
+               pint = G_PARAM_SPEC_INT(param);
+               string_val = g_strdup_printf("%d", g_value_get_int(&value));
+               ms_info("Got int value: [%s], range: %d - %d", string_val,
+                               pint->minimum, pint->maximum);
+       } else if (!g_strcmp0(param->name, MEDIA_STREAMER_PARAM_CAPTURE_HEIGHT)) {
+               pint = G_PARAM_SPEC_INT(param);
+               string_val = g_strdup_printf("%d", g_value_get_int(&value));
+               ms_info("Got int value: [%s], range: %d - %d", string_val,
+                               pint->minimum, pint->maximum);
+       } else if (!g_strcmp0(param->name, MEDIA_STREAMER_PARAM_IS_LIVE_STREAM)) {
+               string_val = g_strdup_printf("%s", g_value_get_boolean(&value) ? "true" : "false");
+               ms_info("Got boolean value: [%s]", string_val);
+       } else if (!g_strcmp0(param->name, MEDIA_STREAMER_PARAM_URI)) {
+               string_val = g_strdup_printf("%s", g_value_get_string(&value));
+               ms_info("Got string value: [%s]", g_value_get_string(&value));
+       } else if (!g_strcmp0(param->name, MEDIA_STREAMER_PARAM_USER_AGENT)) {
+               string_val = g_strdup_printf("%s", g_value_get_string(&value));
+               ms_info("Got string value: [%s]", g_value_get_string(&value));
+       } else if (!g_strcmp0(param->name, MEDIA_STREAMER_PARAM_STREAM_TYPE)) {
+               string_val = g_strdup_printf("%d", g_value_get_enum(&value));
+               ms_info("Got int value: [%s] ", string_val);
+       } else if (!g_strcmp0(param->name, MEDIA_STREAMER_PARAM_PORT)) {
+               pint = G_PARAM_SPEC_INT(param);
+               string_val = g_strdup_printf("%d", g_value_get_int(&value));
+               ms_info("Got int value: [%s], range: %d - %d", string_val,
+                pint->minimum, pint->maximum);
+       } else if (!g_strcmp0(param->name, MEDIA_STREAMER_PARAM_VIDEO_IN_PORT)) {
+               pint = G_PARAM_SPEC_INT(param);
+               string_val = g_strdup_printf("%d", g_value_get_int(&value));
+               ms_info("Got int value: [%s], range: %d - %d", string_val,
+                               pint->minimum, pint->maximum);
+       } else if (!g_strcmp0(param->name, MEDIA_STREAMER_PARAM_AUDIO_IN_PORT)) {
+               pint = G_PARAM_SPEC_INT(param);
+               string_val = g_strdup_printf("%d", g_value_get_int(&value));
+               ms_info("Got int value: [%s], range: %d - %d", string_val,
+                               pint->minimum, pint->maximum);
+       } else if (!g_strcmp0(param->name, MEDIA_STREAMER_PARAM_VIDEO_OUT_PORT)) {
+               pint = G_PARAM_SPEC_INT(param);
+               string_val = g_strdup_printf("%d", g_value_get_int(&value));
+               ms_info("Got int value: [%s], range: %d - %d", string_val,
+                               pint->minimum, pint->maximum);
+       } else if (!g_strcmp0(param->name, MEDIA_STREAMER_PARAM_AUDIO_OUT_PORT)) {
+               pint = G_PARAM_SPEC_INT(param);
+               string_val = g_strdup_printf("%d", g_value_get_int(&value));
+               ms_info("Got int value: [%s], range: %d - %d", string_val,
+                               pint->minimum, pint->maximum);
+       } else if (!g_strcmp0(param->name, MEDIA_STREAMER_PARAM_IP_ADDRESS)) {
+               string_val = g_strdup_printf("%s", g_value_get_string(&value));
+               ms_info("Got string value: [%s]", g_value_get_string(&value));
+       } else if (!g_strcmp0(param->name, MEDIA_STREAMER_PARAM_AUDIO_DEVICE)) {
+               string_val = g_strdup_printf("%s", g_value_get_string(&value));
+               ms_info("Got string value: [%s]", g_value_get_string(&value));
+       } else if (!g_strcmp0(param->name, MEDIA_STREAMER_PARAM_CLOCK_SYNCHRONIZED)) {
+               string_val = g_strdup_printf("%s", g_value_get_boolean(&value) ? "true" : "false");
+               ms_info("Got boolean value: [%s]", string_val);
+       } else if (!g_strcmp0(param->name, MEDIA_STREAMER_PARAM_ROTATE)) {
+               string_val = g_strdup_printf("%d", g_value_get_enum(&value));
+               ms_info("Got enum value: [%s] ", string_val);
+       } else if (!g_strcmp0(param->name, MEDIA_STREAMER_PARAM_FLIP)) {
+               string_val = g_strdup_printf("%d", g_value_get_enum(&value));
+               ms_info("Got enum value: [%s] ", string_val);
+       } else if (!g_strcmp0(param->name, MEDIA_STREAMER_PARAM_DISPLAY_GEOMETRY_METHOD)) {
+               string_val = g_strdup_printf("%d", g_value_get_enum(&value));
+               ms_info("Got enum value: [%s] ", string_val);
+       } else if (!g_strcmp0(param->name, MEDIA_STREAMER_PARAM_VISIBLE)) {
+               string_val = g_strdup_printf("%s", g_value_get_boolean(&value) ? "true" : "false");
+               ms_info("Got boolean value: [%s]", string_val);
+       } else if (!g_strcmp0(param->name, MEDIA_STREAMER_PARAM_HOST)) {
+               string_val = g_strdup_printf("%s", g_value_get_string(&value));
                ms_info("Got string value: [%s]", g_value_get_string(&value));
-               break;
-
-       case G_TYPE_BOOLEAN:
-               value_in_string = g_strdup_printf("%s", g_value_get_boolean(&value) ? "true" : "false");
-               ms_info("Got boolean value: [%s]", value_in_string);
-               break;
-
-       case G_TYPE_ULONG: {
-               GParamSpecULong *pulong = G_PARAM_SPEC_ULONG(param);
-               value_in_string = g_strdup_printf("%lu", g_value_get_ulong(&value));
-               ms_info("Got ulong value: [%s], range: %lu - %lu (default %s)",
-                               value_in_string, pulong->minimum, pulong->maximum);
-               break;
-       }
-
-       case G_TYPE_LONG: {
-               GParamSpecLong *plong = G_PARAM_SPEC_LONG(param);
-               value_in_string = g_strdup_printf("%ld", g_value_get_long(&value));
-               ms_info("Got long value: [%s], range: %ld - %ld (default %s)",
-                               value_in_string, plong->minimum, plong->maximum);
-               break;
-       }
-
-       case G_TYPE_UINT: {
-               GParamSpecUInt *puint = G_PARAM_SPEC_UINT(param);
-               value_in_string = g_strdup_printf("%u", g_value_get_uint(&value));
-               ms_info("Got uint value: [%s], range: %u - %u",
-                               value_in_string, puint->minimum, puint->maximum);
-               break;
-       }
-
-       case G_TYPE_INT: {
-               GParamSpecInt *pint = G_PARAM_SPEC_INT(param);
-               value_in_string = g_strdup_printf("%d", g_value_get_int(&value));
-               ms_info("Got int value: [%s], range: %d - %d",
-                               value_in_string, pint->minimum, pint->maximum);
-               break;
-       }
-
-       case G_TYPE_UINT64: {
-               GParamSpecUInt64 *puint64 = G_PARAM_SPEC_UINT64(param);
-               value_in_string = g_strdup_printf("%" G_GUINT64_FORMAT, g_value_get_uint64(&value));
-               ms_info("Got uint64 value: [%s], range: %" G_GUINT64_FORMAT "- %" G_GUINT64_FORMAT,
-                               value_in_string, puint64->minimum, puint64->maximum);
-               break;
        }
 
-       case G_TYPE_INT64: {
-               GParamSpecInt64 *pint64 = G_PARAM_SPEC_INT64(param);
-               value_in_string = g_strdup_printf("%" G_GINT64_FORMAT, g_value_get_int64(&value));
-               ms_info("Got uint64 value: [%s], range: %" G_GINT64_FORMAT "- %" G_GINT64_FORMAT,
-                               value_in_string, pint64->minimum, pint64->maximum);
-               break;
-       }
+       *string_value = string_val;
+}
 
-       case G_TYPE_FLOAT: {
-               GParamSpecFloat *pfloat = G_PARAM_SPEC_FLOAT(param);
-               value_in_string = g_strdup_printf("%15.7g", g_value_get_float(&value));
-               ms_info("Got float value: [%s], range:%15.7g -%15.7g",
-                               value_in_string, pfloat->minimum, pfloat->maximum);
-               break;
-       }
+void __ms_node_check_param_name(GstElement *element, gboolean name_is_known,
+                                const char *param_name, char **init_param_name)
+{
+       char *set_param_name = NULL;
+       char *orig_param_name = NULL;
+       int it_param=0;
 
-       case G_TYPE_DOUBLE: {
-               GParamSpecDouble *pdouble = G_PARAM_SPEC_DOUBLE(param);
-               value_in_string = g_strdup_printf("%15.7g", g_value_get_double(&value));
-               ms_info("Got double value: [%s], range:%15.7g -%15.7g",
-                               value_in_string, pdouble->minimum, pdouble->maximum);
-               break;
-       }
+       GParamSpec *param;
 
-       default:
-               ms_info("Got unknown type with param->value_type [%d]", param->value_type);
-               break;
+       for(it_param = 0; it_param < PROPERTY_COUNT; it_param++)
+       {
+               set_param_name = param_table[it_param][0];
+               orig_param_name = param_table[it_param][1];
+
+               if (name_is_known) {
+                       if(!g_strcmp0(param_name, set_param_name)) {
+                               param = g_object_class_find_property(G_OBJECT_GET_CLASS(element), orig_param_name);
+                               if (param) {
+                                       *init_param_name = orig_param_name;
+                                       break;
+                               }
+                       }
+               } else {
+                       if(!g_strcmp0(param_name, orig_param_name)) {
+                               param = g_object_class_find_property(G_OBJECT_GET_CLASS(element), orig_param_name);
+                               if (param) {
+                                       *init_param_name = set_param_name;
+                                       break;
+                               }
+                       }
+               }
        }
-
-       *string_value = value_in_string;
 }
 
 int __ms_node_write_params_into_bundle(media_streamer_node_s *node,
@@ -619,9 +678,10 @@ int __ms_node_write_params_into_bundle(media_streamer_node_s *node,
        GParamSpec **property_specs;
        guint num_properties, i;
        char *string_val = NULL;
+       char *param_init_name = NULL;
 
        property_specs = g_object_class_list_properties(G_OBJECT_GET_CLASS(node->gst_element),
-                                                        &num_properties);
+                                                    &num_properties);
 
        if (num_properties <= 0) {
                return MEDIA_STREAMER_ERROR_INVALID_OPERATION;
@@ -633,44 +693,62 @@ int __ms_node_write_params_into_bundle(media_streamer_node_s *node,
                GValue value = { 0, };
                GParamSpec *param = property_specs[i];
 
-               g_value_init(&value, param->value_type);
-               if (param->flags & G_PARAM_READWRITE) {
-                       g_object_get_property(G_OBJECT(node->gst_element), param->name, &value);
-               } else {
-                       /* Skip properties which user can not change. */
-                       continue;
-               }
+               __ms_node_check_param_name(node->gst_element, FALSE, param->name, &param_init_name);
 
-               __ms_node_get_param_value(param, value, &string_val);
+               if (param_init_name) {
+                       g_value_init(&value, param->value_type);
+
+                       if (param->flags & G_PARAM_READWRITE) {
+                               g_object_get_property(G_OBJECT(node->gst_element), param->name, &value);
+                       } else {
 
-               bundle_add_str(param_list, g_param_spec_get_name(param), string_val);
+                               /* Skip properties which user can not change. */
+                               continue;
+                       }
+
+                       ms_info("%-20s: %s\n", param_init_name, g_param_spec_get_blurb(param));
+                       __ms_node_get_param_value(param, value, &string_val);
+
+                       bundle_add_str(param_list, param_init_name, string_val);
+                       param_init_name = NULL;
+               }
        }
 
        return MEDIA_STREAMER_ERROR_NONE;
 }
 
-int __ms_node_write_param_into_value(media_streamer_node_s *node,
-                                     const char *param_name, char **param_value)
+int __ms_node_write_param_into_value(media_streamer_node_s *node, const char *param_name,
+                                     char **param_value)
 {
-       GParamSpec *property_specs;
        char *string_val = NULL;
+       char *param_init_name = NULL;
 
-       property_specs = g_object_class_find_property(G_OBJECT_GET_CLASS(node->gst_element),
-                                                      param_name);
+       GValue value = { 0, };
+       GParamSpec *param;
 
-       ms_info("Getting parameter of the Node [%s]", node->name);
+       __ms_node_check_param_name(node->gst_element, TRUE, param_name, &param_init_name);
 
-       GValue value = { 0, };
-       GParamSpec *param = property_specs;
+       if (param_init_name)
+       {
+               param = g_object_class_find_property(G_OBJECT_GET_CLASS(node->gst_element), param_init_name);
+
+               ms_info("Getting parameter of the Node [%s]", node->name);
+
+               g_value_init(&value, param->value_type);
+
+               if (param->flags & G_PARAM_READWRITE) {
+                       g_object_get_property(G_OBJECT(node->gst_element), param_init_name, &value);
+               }
 
-       g_value_init(&value, param->value_type);
-       if (param->flags & G_PARAM_READWRITE) {
-               g_object_get_property(G_OBJECT(node->gst_element), param->name, &value);
+               ms_info("%-20s: %s\n", param_name, g_param_spec_get_blurb(param));
+               __ms_node_get_param_value(param, value, &string_val);
        }
 
-       __ms_node_get_param_value(param, value, &string_val);
+       if (!string_val) {
+               return MEDIA_STREAMER_ERROR_INVALID_OPERATION;
+       }
 
        *param_value = string_val;
 
        return MEDIA_STREAMER_ERROR_NONE;
-}
+}
\ No newline at end of file
index b3183721a79a70b405b7648f65d3265f1adf1159..c57784d69c4a8062c041ee3b8aac278194692d58 100755 (executable)
@@ -92,6 +92,12 @@ media_format_h afmt_raw = NULL;
 |    LOCAL FUNCTION PROTOTYPES:                       |
 ---------------------------------------------------------------------------*/
 
+static void streamer_error_cb(media_streamer_h streamer,
+                              media_streamer_error_e error,
+                              void *user_data)
+{
+       g_print("Media Streamer posted error [%d] \n", error);
+}
 static gboolean _create(media_streamer_h *streamer)
 {
        g_print("== create \n");
@@ -109,6 +115,8 @@ static gboolean _create(media_streamer_h *streamer)
                return FALSE;
        }
 
+       media_streamer_set_error_cb(*streamer, streamer_error_cb, NULL);
+
        return TRUE;
 }
 
@@ -424,7 +432,6 @@ static gboolean _create_rtp_client(media_streamer_node_h rtp_bin)
        /*====================Linking Video Client=========================== */
        media_streamer_node_link(video_depay, "src", video_dec, "sink");
        media_streamer_node_link(video_dec, "src", video_sink, "sink");
-       /*      media_streamer_node_link(rtp_bin, "video_out", video_depay,"sink"); */
 
        g_print("== success client video part \n");
 #endif