Add mtu_size and modify license in spec file

Change-Id: I1ca5f3fb68a44b438a95da9e6922a4d263ca80ff

diff --git a/config/mmfw_wfd.ini b/config/mmfw_wfd.ini
index 818f8d8be94122ed7c10f450c69edb861b3d467d..5c15bc9bd95ef338d52e0023ac25beb43d7164f6 100755 (executable)
--- a/config/mmfw_wfd.ini
+++ b/config/mmfw_wfd.ini
@@ -18,6 +18,7 @@ disable segtrap = yes ; same effect with --gst-disable-segtrap
 videosink element = 2
 
 videobitrate value = 6144000
+mtu_size value = 1400
 
 video converter element =
 

diff --git a/packaging/libmm-wfd.spec b/packaging/libmm-wfd.spec
index 71a01c6c3a38e59ce6d04b3f972b0d381887e521..e1a83ea49c23823910a43c2f23e2edb78698c52d 100755 (executable)
--- a/packaging/libmm-wfd.spec
+++ b/packaging/libmm-wfd.spec
@@ -2,9 +2,9 @@
 Name:       libmm-wfd
 Summary:    Multimedia Framework Wifi-Display Library
 Version:    0.2.16
-Release:    11
+Release:    12
 Group:      System/Libraries
-License:    LGPL
+License:    Apache License 2.0
 Source0:    %{name}-%{version}.tar.gz
 Requires(post):  /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig

diff --git a/src/include/mm_wfd_ini.h b/src/include/mm_wfd_ini.h
index 400c08bf8cd1548f1891d681517a6591259391ea..82333f560cc2aea4978248666920fca5fcb6b658 100644 (file)
--- a/src/include/mm_wfd_ini.h
+++ b/src/include/mm_wfd_ini.h
@@ -1,18 +1,23 @@
-/* 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+/*
+ * libmm-wfd
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Copyright (c) 2011 - 2013 Samsung Electronics Co., Ltd. All rights reserved.
+ *
+ * Contact: JongHyuk Choi <jhchoi.choi@samsung.com>, ByungWook Jang <bw.jang@samsung.com>,
+ * Manoj Kumar K <manojkumar.k@samsung.com>, Hyunil Park <hyunil46.park@samsung.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
  */
 
 #ifndef __MM_WFD_INI_H__
@@ -25,11 +30,7 @@
 #endif
 
 
-#if defined(MMFW_DEBUG_MODE)
-#define MM_WFD_INI_DEFAULT_PATH        "/opt/etc/mmfw_wfd.ini"
-#else
 #define MM_WFD_INI_DEFAULT_PATH        "/usr/etc/mmfw_wfd.ini"
-#endif
 
 #define WFD_INI() mm_wfd_ini_get_structure()
 
@@ -88,6 +89,7 @@ typedef struct __mm_wfd_ini
   gint delay_before_repeat;
   gint eos_delay; // @
   gint videobitrate;
+  gint mtu_size;
 
   gchar gst_param[5][256]; // @
   gchar exclude_element_keyword[10][WFD_INI_MAX_STRLEN];
@@ -109,6 +111,7 @@ typedef struct __mm_wfd_ini
 #define DEFAULT_VIDEOSINK                              WFD_INI_VSINK_XVIMAGESINK
 #define DEFAULT_VIDEOSRC                               WFD_INI_VSRC_XVIMAGESRC
 #define DEFAULT_VIDEO_BITRATE                          3072000 /* bps */
+#define DEFAULT_MTU_SIZE        1400 /* bytes */
 #define DEFAULT_SESSION_MODE                           0
 #define DEFAULT_GST_PARAM                              ""
 #define DEFAULT_EXCLUDE_KEYWORD                                ""
@@ -143,6 +146,8 @@ videosink element = 2 \n\
 \n\
 videobitrate value = 6144000 \n\
 \n\
+mtu_size value = 1400 \n\
+\n\
 video converter element = \n\
 \n\
 ; if yes. gstreamer will not update registry \n\

diff --git a/src/mm_wfd_ini.c b/src/mm_wfd_ini.c
index 441ba4f3b84a194dd858c6a085a45415fdebc0cb..a7cf47dde18353c190998dfa4896688037ce1b58 100755 (executable)
--- a/src/mm_wfd_ini.c
+++ b/src/mm_wfd_ini.c
@@ -112,6 +112,7 @@ mm_wfd_ini_load(void)
     g_wfd_ini.skip_rescan = iniparser_getboolean(dict, "general:skip rescan", DEFAULT_SKIP_RESCAN);
     g_wfd_ini.videosink_element = iniparser_getint(dict, "general:videosink element", DEFAULT_VIDEOSINK);
     g_wfd_ini.videobitrate = iniparser_getint(dict, "general:videobitrate value", DEFAULT_VIDEO_BITRATE);
+    g_wfd_ini.mtu_size = iniparser_getint(dict, "general:mtu_size value", DEFAULT_MTU_SIZE);
     g_wfd_ini.generate_dot = iniparser_getboolean(dict, "general:generate dot", DEFAULT_GENERATE_DOT);
     g_wfd_ini.provide_clock= iniparser_getboolean(dict, "general:provide clock", DEFAULT_PROVIDE_CLOCK);
     g_wfd_ini.live_state_change_timeout = iniparser_getint(dict, "general:live state change timeout", DEFAULT_LIVE_STATE_CHANGE_TIMEOUT);
@@ -148,6 +149,7 @@ mm_wfd_ini_load(void)
     g_wfd_ini.skip_rescan = DEFAULT_SKIP_RESCAN;
     g_wfd_ini.videosink_element = DEFAULT_VIDEOSINK;
     g_wfd_ini.videobitrate = DEFAULT_VIDEO_BITRATE;
+    g_wfd_ini.mtu_size = DEFAULT_MTU_SIZE;
     g_wfd_ini.generate_dot = DEFAULT_GENERATE_DOT;
     g_wfd_ini.provide_clock= DEFAULT_PROVIDE_CLOCK;
     g_wfd_ini.live_state_change_timeout = DEFAULT_LIVE_STATE_CHANGE_TIMEOUT;
@@ -194,7 +196,8 @@ mm_wfd_ini_load(void)
   debug_log("disable_segtrap : %d\n", g_wfd_ini.disable_segtrap);
   debug_log("skip rescan : %d\n", g_wfd_ini.skip_rescan);
   debug_log("videosink element(0:v4l2sink, 1:ximagesink, 2:xvimagesink, 3:fakesink) : %d\n", g_wfd_ini.videosink_element);
-    debug_log("video_bitrate : %d\n", g_wfd_ini.videobitrate);
+  debug_log("video_bitrate : %d\n", g_wfd_ini.videobitrate);
+  debug_log("mtu_size : %d\n", g_wfd_ini.mtu_size);
   debug_log("generate_dot : %d\n", g_wfd_ini.generate_dot);
   debug_log("provide_clock : %d\n", g_wfd_ini.provide_clock);
   debug_log("live_state_change_timeout(sec) : %d\n", g_wfd_ini.live_state_change_timeout);