Updated to version 0.2.17 from tizendev

Change-Id: Ieaa715e5f8656a251285ee8b8719f97106d4510a

diff --git a/configure.ac b/configure.ac
index fd25b89..96063df 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -2,13 +2,15 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([libmm-wfd],[0.0.1])
+AC_INIT([libmm-wfd],[0.2.0])
 AC_CONFIG_SRCDIR([src/mm_wfd_priv.c])
 AC_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE([1.11 -Wall -Wno-extra-portability foreign])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 
 # Checks for programs.
+AM_PROG_AR
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_LIBTOOL
 
 AC_FUNC_MMAP
@@ -51,19 +53,15 @@ PKG_CHECK_MODULES(GLIB, glib-2.0)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
-PKG_CHECK_MODULES(GST, gstreamer-0.10 >= 0.10)
+PKG_CHECK_MODULES(GST, gstreamer-1.0 >= 1.2.0)
 AC_SUBST(GST_CFLAGS)
 AC_SUBST(GST_LIBS)
 
-PKG_CHECK_MODULES(GST_PLUGIN_BASE, gstreamer-plugins-base-0.10 >= 0.10)
+PKG_CHECK_MODULES(GST_PLUGIN_BASE, gstreamer-plugins-base-1.0 >= 1.2.0)
 AC_SUBST(GST_PLUGIN_BASE_CFLAGS)
 AC_SUBST(GST_PLUGIN_BASE_LIBS)
 
-PKG_CHECK_MODULES(GST_INTERFACE, gstreamer-interfaces-0.10 >= 0.10)
-AC_SUBST(GST_INTERFACE_CFLAGS)
-AC_SUBST(GST_LIBS)
-
-PKG_CHECK_MODULES(GST_APP, gstreamer-app-0.10 >= 0.10)
+PKG_CHECK_MODULES(GST_APP, gstreamer-app-1.0 >= 1.2.0)
 AC_SUBST(GST_APP_CFLAGS)
 AC_SUBST(GST_APP_LIBS)
 
@@ -128,7 +126,7 @@ AM_CONDITIONAL([IS_SDK], [test "x$IS_SDK" = "xyes"])
 AC_CONFIG_FILES([Makefile
                 src/Makefile
                 test/Makefile
-                 server/Makefile
+                server/Makefile
                 proxy/Makefile
                 mm-wfd.pc
 ])

diff --git a/packaging/libmm-wfd.spec b/packaging/libmm-wfd.spec
index e1a83ea..ec4fb50 100755 (executable)
--- a/packaging/libmm-wfd.spec
+++ b/packaging/libmm-wfd.spec
@@ -1,8 +1,8 @@
 
 Name:       libmm-wfd
 Summary:    Multimedia Framework Wifi-Display Library
-Version:    0.2.16
-Release:    12
+Version:    0.2.17
+Release:    0
 Group:      System/Libraries
 License:    Apache License 2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -10,10 +10,9 @@ Requires(post):  /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
 BuildRequires:  pkgconfig(mm-ta)
 BuildRequires:  pkgconfig(mm-common)
-BuildRequires:  pkgconfig(gstreamer-0.10)
-BuildRequires:  pkgconfig(gstreamer-plugins-base-0.10)
-BuildRequires:  pkgconfig(gstreamer-interfaces-0.10)
-BuildRequires:  pkgconfig(gstreamer-app-0.10)
+BuildRequires:  pkgconfig(gstreamer-1.0)
+BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
+BuildRequires:  pkgconfig(gstreamer-app-1.0)
 BuildRequires:  pkgconfig(iniparser)
 BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  pkgconfig(dbus-1)
@@ -27,7 +26,7 @@ BuildRequires:        pkgconfig(dri2proto)
 BuildRequires: pkgconfig(libdri2)
 BuildRequires: pkgconfig(utilX)
 BuildRequires:  pkgconfig(vconf)
-BuildRequires:  pkgconfig(gst-rtsp-server-wfd)
+BuildRequires:  pkgconfig(gst-rtsp-server-wfd) >= 0.2.0
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 

diff --git a/server/miracast_server.c b/server/miracast_server.c
index 67d39ca..80f7a50 100755 (executable)
--- a/server/miracast_server.c
+++ b/server/miracast_server.c
@@ -164,7 +164,7 @@ static void wfd_set_signal();
 /*---------------------------------------------------------------------------\r
   |    LOCAL FUNCTION DEFINITIONS:                      |\r
   ---------------------------------------------------------------------------*/\r
-static bool msg_callback(int message, MMMessageParamType *param, void *user_param)\r
+static int msg_callback(int message, void *param, void *user_param)\r
 {\r
   /* TODO any error notification or state change should be forwarded to the active list of proxy apps */\r
   switch (message) {\r
@@ -174,7 +174,7 @@ static bool msg_callback(int message, MMMessageParamType *param, void *user_para
         if(!client) return FALSE;\r
         WFDServer *lserver = (WFDServer*) client->parent;\r
         if(!lserver) return FALSE;\r
-        debug_log("msg_callback error : code = %x\n", param->code);\r
+        debug_log("msg_callback error : code = %x\n", ((MMMessageParamType*)param)->code);\r
         debug_log ("DESTROY..\n\n");\r
         quit_pushing = TRUE;\r
         shutdown (lserver->sockfd, SHUT_RDWR);\r
@@ -190,7 +190,7 @@ static bool msg_callback(int message, MMMessageParamType *param, void *user_para
       mm_wfd_stop(g_wfd);\r
       break;\r
     case MM_MESSAGE_STATE_CHANGED:\r
-      g_current_state = param->state.current;\r
+      g_current_state = ((MMMessageParamType*)param)->state.current;\r
       switch(g_current_state)\r
       {\r
         case MM_WFD_STATE_NULL:\r
@@ -536,7 +536,7 @@ static void interpret (WFDClient *client, char *cmd)
     cmd_replay = g_string_new ("");\r
     g_string_append_printf (cmd_replay, "REPLAY WFD_PROXY_STATE_QUERY");\r
     g_string_append_printf (cmd_replay, "\r\n");\r
-    g_string_append_printf (cmd_replay, convert_state_to_string(g_current_state));\r
+    g_string_append_printf (cmd_replay, "%s", convert_state_to_string(g_current_state));\r
     proxy_write(client, g_string_free (cmd_replay, FALSE));\r
     debug_log ("STATE QUERY..demon return\n\n");\r
   }\r

diff --git a/src/include/mm_wfd_ini.h b/src/include/mm_wfd_ini.h
index 82333f5..f66e06b 100644 (file)
--- a/src/include/mm_wfd_ini.h
+++ b/src/include/mm_wfd_ini.h
@@ -24,6 +24,7 @@
 #define __MM_WFD_INI_H__
 
 #include <glib.h>
+#include <rtsp-client.h>
 
 #ifdef __cplusplus
   extern "C" {
@@ -36,35 +37,6 @@
 
 #define WFD_INI_MAX_STRLEN     80
 
-typedef enum __wfd_ini_videosink_element
-{
-  WFD_INI_VSINK_V4l2SINK = 0,
-  WFD_INI_VSINK_XIMAGESINK,
-  WFD_INI_VSINK_XVIMAGESINK,
-  WFD_INI_VSINK_FAKESINK,
-  WFD_INI_VSINK_EVASIMAGESINK,
-  WFD_INI_VSINK_GLIMAGESINK,
-  WFD_INI_VSINK_NUM
-}WFD_INI_VSINK_ELEMENT;
-
-typedef enum __wfd_ini_videosrc_element
-{
-  WFD_INI_VSRC_XVIMAGESRC,
-  WFD_INI_VSRC_FILESRC,
-  WFD_INI_VSRC_CAMERASRC,
-  WFD_INI_VSRC_VIDEOTESTSRC,
-  WFD_INI_VSRC_NUM
-}WFD_INI_VSRC_ELEMENT;
-
-typedef enum __wfd_ini_session_mode
-{
-  WFD_INI_AUDIO_VIDEO_MUXED,
-  WFD_INI_VIDEO_ONLY,
-  WFD_INI_AUDIO_ONLY,
-  WFD_INI_AUDIO_VIDEO_SAPERATE
-}WFD_INI_SESSION_MODE;
-
-
 /* NOTE : MMPlayer has no initalizing API for library itself
  * so we cannot decide when those ini values to be released.
  * this is the reason of all string items are static array.

diff --git a/src/include/mm_wfd_priv.h b/src/include/mm_wfd_priv.h
index 9551942..7adbb8b 100755 (executable)
--- a/src/include/mm_wfd_priv.h
+++ b/src/include/mm_wfd_priv.h
@@ -191,7 +191,7 @@ int _mmwfd_stop (MMHandleType hwfd);
 int _mmwfd_pause (MMHandleType hwfd);
 int _mmwfd_resume (MMHandleType hwfd);
 int _mmwfd_standby (MMHandleType hwfd);
-int _mmwfd_get_state(MMHandleType hwfd, int* state);
+int _mmwfd_get_state(MMHandleType hwfd, MMWfdStateType *state);
 gboolean __mmwfd_post_message(mm_wfd_t* wfd, enum MMMessageType msgtype, MMMessageParamType* param);
 int _mmwfd_set_message_callback(MMHandleType hwfd, MMMessageCallback callback, gpointer user_param);
 #endif

diff --git a/src/include/mm_wfd_proxy.h b/src/include/mm_wfd_proxy.h
index b2fb722..8576815 100755 (executable)
--- a/src/include/mm_wfd_proxy.h
+++ b/src/include/mm_wfd_proxy.h
@@ -112,7 +112,7 @@ typedef void (*WfdSrcProxyStateError_cb) (MMHandleType pHandle,
   *******************************************************/\r
 WfdSrcProxyRet WfdSrcProxyInit(\r
     MMHandleType *pHandle,\r
-    WfdSrcProxyStateError_cb *appCb,\r
+    WfdSrcProxyStateError_cb appCb,\r
     void *user_data );\r
 \r
 \r

diff --git a/src/mm_wfd.c b/src/mm_wfd.c
index 3b452c2..f989f80 100755 (executable)
--- a/src/mm_wfd.c
+++ b/src/mm_wfd.c
@@ -52,7 +52,7 @@ int mm_wfd_create(MMHandleType *wfd)
   debug_log("mm_wfd_create mm_wfd_ini_load\n");
 
   /* alloc wfd structure */
-  new_wfd = (MMHandleType)g_malloc(sizeof(mm_wfd_t));
+  new_wfd = (mm_wfd_t*)g_malloc(sizeof(mm_wfd_t));
   if ( !new_wfd )
   {
     debug_critical("Cannot allocate memory for wifi-display handle\n");
@@ -93,7 +93,7 @@ ERROR:
     MMWFD_FREEIF( new_wfd );
   }
   
-  *wfd = NULL;
+  *wfd = (MMHandleType)NULL;
   return result;
 }
 

diff --git a/src/mm_wfd_attrs.c b/src/mm_wfd_attrs.c
index 7d049fb..d0f25f3 100755 (executable)
--- a/src/mm_wfd_attrs.c
+++ b/src/mm_wfd_attrs.c
@@ -44,7 +44,7 @@ _mmwfd_construct_attribute(MMHandleType handle)
 
        debug_fenter();
 
-       return_val_if_fail(handle, NULL);
+       return_val_if_fail(handle, (MMHandleType)NULL);
 
        MMWfdAttrsSpec wfd_attrs[] =
        {
@@ -125,7 +125,7 @@ _mmwfd_construct_attribute(MMHandleType handle)
                                mmf_attrs_set_valid_range (attrs, idx,
                                                wfd_attrs[idx].value_min,
                                                wfd_attrs[idx].value_max,
-                                               wfd_attrs[idx].default_value);
+                                               (int)wfd_attrs[idx].default_value);
                        }
                        break;
 
@@ -144,7 +144,7 @@ _mmwfd_construct_attribute(MMHandleType handle)
 ERROR:
        _mmwfd_deconstruct_attribute(handle);
 
-       return NULL;
+       return (MMHandleType)NULL;
 }
 
 void

diff --git a/src/mm_wfd_priv.c b/src/mm_wfd_priv.c
index 0760519..f65091b 100755 (executable)
--- a/src/mm_wfd_priv.c
+++ b/src/mm_wfd_priv.c
@@ -21,6 +21,7 @@
  */
 
 #include <gst/gst.h>
+#include <rtsp-server.h>
 
 #include "mm_wfd_priv.h"
 
@@ -75,8 +76,8 @@ int _mmwfd_create (MMHandleType hwfd) // @
   /* construct attributes */
   // TODO: need to decide on attributes
 
-  wfd->attrs = _mmwfd_construct_attribute(wfd);
-  if ( NULL == wfd->attrs)
+  wfd->attrs = _mmwfd_construct_attribute((MMHandleType)wfd);
+  if ( (MMHandleType)NULL == wfd->attrs)
   {
     debug_critical("Failed to construct attributes\n");
     goto ERROR;
@@ -126,7 +127,7 @@ int _mmwfd_create (MMHandleType hwfd) // @
 ERROR:
 
   /* release attributes */
-  _mmwfd_deconstruct_attribute((mm_wfd_t *)wfd);
+  _mmwfd_deconstruct_attribute((MMHandleType)wfd);
 
   return MM_ERROR_WFD_INTERNAL;
 }
@@ -150,7 +151,7 @@ int _mmwfd_destroy (MMHandleType hwfd) // @
   g_object_unref (wfd->factory);
 
   /* release attributes */
-  _mmwfd_deconstruct_attribute( wfd );
+  _mmwfd_deconstruct_attribute( (MMHandleType)wfd );
 
   debug_fleave();
 
@@ -391,7 +392,7 @@ int _mmwfd_stop (MMHandleType hwfd) // @
   return ret;
 }
 
-int _mmwfd_get_state(MMHandleType hwfd, int *state) // @
+int _mmwfd_get_state(MMHandleType hwfd, MMWfdStateType *state) // @
 {
   mm_wfd_t *wfd = (mm_wfd_t*)hwfd;
 

diff --git a/src/mm_wfd_proxy.c b/src/mm_wfd_proxy.c
index 9b1b6a6..3644624 100755 (executable)
--- a/src/mm_wfd_proxy.c
+++ b/src/mm_wfd_proxy.c
@@ -104,7 +104,7 @@ WfdSrcProxyRet convert_string_to_status(gchar *buffer);
 \r
 WfdSrcProxyRet WfdSrcProxyInit(\r
     MMHandleType *pHandle,\r
-    WfdSrcProxyStateError_cb *appCb,\r
+    WfdSrcProxyStateError_cb appCb,\r
     void *user_data )\r
 {\r
   WfdSrcProxy *temp = NULL;\r
@@ -180,9 +180,9 @@ WfdSrcProxyRet WfdSrcProxySetIPAddrAndPort(
   proxy_cmd = g_string_new ("");\r
   g_string_append_printf (proxy_cmd, "WFD_PROXY_SET_IP_PORT");\r
   g_string_append_printf (proxy_cmd, "\r\nIP ");\r
-  g_string_append_printf (proxy_cmd, wfdsrcIP);\r
+  g_string_append_printf (proxy_cmd, "%s", wfdsrcIP);\r
   g_string_append_printf (proxy_cmd, "\r\nPORT ");\r
-  g_string_append_printf (proxy_cmd, wfdsrcPort);\r
+  g_string_append_printf (proxy_cmd, "%s", wfdsrcPort);\r
   g_string_append_printf (proxy_cmd, "\r\n");\r
   cmd_string = g_string_free (proxy_cmd, FALSE);\r
   debug_log("WfdSrcProxySetIPAddrAndPort command sent: %s \n", cmd_string);\r

diff --git a/test/mm_wfd_testsuite.c b/test/mm_wfd_testsuite.c
index 280f9ae..e6cc56a 100755 (executable)
--- a/test/mm_wfd_testsuite.c
+++ b/test/mm_wfd_testsuite.c
@@ -189,12 +189,12 @@ void TestFileInfo (char* filename);
 
 bool testsuite_sample_cb(void *stream, int stream_size, void *user_param);
 
-static bool msg_callback(int message, MMMessageParamType *param, void *user_param)
+static int msg_callback(int message, void *param, void *user_param)
 {
   switch (message) {
     case MM_MESSAGE_ERROR:
       quit_pushing = TRUE;
-      g_print("error : code = %x\n", param->code);
+      g_print("error : code = %x\n", ((MMMessageParamType *)param)->code);
       //g_print("Got MM_MESSAGE_ERROR, testsuite will be exit\n");
       //quit_program ();                                                       // 090519
       break;
@@ -219,7 +219,7 @@ static bool msg_callback(int message, MMMessageParamType *param, void *user_para
     break;
 
     case MM_MESSAGE_STATE_CHANGED:
-      g_current_state = param->state.current;
+      g_current_state = ((MMMessageParamType *)param)->state.current;
       //bw.jang :=:
       //g_print("current state : %d\n", g_current_state);
       //-->
@@ -260,7 +260,7 @@ static void input_display_mode(char *mode)
   dpy = XOpenDisplay(NULL);
   if (!dpy) {
     g_printf ("Error : fail to open display\n");
-    return 0;
+    return;
   }
   g_sc_status_atom = XInternAtom (dpy, STR_ATOM_SCRNCONF_STATUS, False);
        XSelectInput (dpy, RootWindow(dpy, 0), StructureNotifyMask);