Add new error types

WEBRTC_ERROR_STREAM_FAILED and WEBRTC_ERROR_RESOURCE_FAILED
are added.

These will be delivered by error callback.

[Version] 0.1.24
[Issue Type] API

Change-Id: I1f493aa4f14708e4bf55890d50140caab3554263
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/include/webrtc.h b/include/webrtc.h
index 4f5bbc772e4ce203ec58c9d8df6618cb0e790700..1c2450b1fc92ff410946474beabcdfada91988c4 100644 (file)
--- a/include/webrtc.h
+++ b/include/webrtc.h
@@ -49,14 +49,16 @@ typedef void *webrtc_h;
  */
 typedef enum
 {
-       WEBRTC_ERROR_NONE = TIZEN_ERROR_NONE,                                 /**< Successful */
+       WEBRTC_ERROR_NONE = TIZEN_ERROR_NONE,                                /**< Successful */
        WEBRTC_ERROR_NOT_SUPPORTED = TIZEN_ERROR_NOT_SUPPORTED,              /**< Not supported */
-       WEBRTC_ERROR_PERMISSION_DENIED = TIZEN_ERROR_PERMISSION_DENIED,       /**< Permission denied */
-       WEBRTC_ERROR_INVALID_PARAMETER = TIZEN_ERROR_INVALID_PARAMETER,       /**< Invalid parameter */
+       WEBRTC_ERROR_PERMISSION_DENIED = TIZEN_ERROR_PERMISSION_DENIED,      /**< Permission denied */
+       WEBRTC_ERROR_INVALID_PARAMETER = TIZEN_ERROR_INVALID_PARAMETER,      /**< Invalid parameter */
        WEBRTC_ERROR_INVALID_OPERATION = TIZEN_ERROR_INVALID_OPERATION,      /**< Invalid operation */
-       WEBRTC_ERROR_INVALID_STATE = TIZEN_ERROR_MEDIA_WEBRTC | 0x01,           /**< Invalid state */
-       WEBRTC_ERROR_CONNECTION_FAILED = TIZEN_ERROR_MEDIA_WEBRTC | 0x02,       /**< Connection failed */
-       WEBRTC_ERROR_RESOURCE_CONFLICT = TIZEN_ERROR_MEDIA_WEBRTC | 0x03,       /**< Resource conflict */
+       WEBRTC_ERROR_INVALID_STATE = TIZEN_ERROR_MEDIA_WEBRTC | 0x01,        /**< Invalid state */
+       WEBRTC_ERROR_CONNECTION_FAILED = TIZEN_ERROR_MEDIA_WEBRTC | 0x02,    /**< Connection failed */
+       WEBRTC_ERROR_STREAM_FAILED = TIZEN_ERROR_MEDIA_WEBRTC | 0x03,        /**< Stream failed */
+       WEBRTC_ERROR_RESOURCE_FAILED = TIZEN_ERROR_MEDIA_WEBRTC | 0x04,      /**< Resource failed */
+       WEBRTC_ERROR_RESOURCE_CONFLICT = TIZEN_ERROR_MEDIA_WEBRTC | 0x05,    /**< Resource conflict */
 } webrtc_error_e;
 
 /**

diff --git a/packaging/capi-media-webrtc.spec b/packaging/capi-media-webrtc.spec
index 8cefad04e4f78009171baf01c0c208d56e648968..018c71ab32170f9511ff56edfde4aadbcea13c62 100644 (file)
--- a/packaging/capi-media-webrtc.spec
+++ b/packaging/capi-media-webrtc.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-webrtc
 Summary:    A WebRTC library in Tizen Native API
-Version:    0.1.23
+Version:    0.1.24
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/webrtc_private.c b/src/webrtc_private.c
index 53680de588ee9bf7a1277908fb631387f32737e5..0ff7c96201dbcaac36f6c4bbb7da9196eb76c747 100644 (file)
--- a/src/webrtc_private.c
+++ b/src/webrtc_private.c
@@ -221,14 +221,14 @@ static gboolean __bus_watch_cb(GstBus *bus, GstMessage *message, gpointer user_d
        case GST_MESSAGE_ERROR:
                gst_message_parse_error(message, &err, NULL);
 
-               LOG_ERROR("Error from [%s]: %s", GST_OBJECT_NAME(GST_OBJECT_CAST(GST_ELEMENT(GST_MESSAGE_SRC(message)))), err->message);
-
+               LOG_ERROR("Error[from %s]: message[%s], code[%d]",
+                       GST_OBJECT_NAME(GST_OBJECT_CAST(GST_ELEMENT(GST_MESSAGE_SRC(message)))), err->message, err->code);
                if (webrtc->error_cb.callback) {
                        webrtc_error_e error = WEBRTC_ERROR_INVALID_OPERATION;
                        if (err->domain == GST_RESOURCE_ERROR)
-                               error = WEBRTC_ERROR_RESOURCE_CONFLICT;
+                               error = WEBRTC_ERROR_RESOURCE_FAILED;
                        else if (err->domain == GST_STREAM_ERROR)
-                               error = WEBRTC_ERROR_CONNECTION_FAILED;
+                               error = WEBRTC_ERROR_STREAM_FAILED;
 
                        LOG_DEBUG(">>> invoke error_cb[%p], user_data[%p]",
                                webrtc->error_cb.callback, webrtc->error_cb.user_data);