[0.0.3] Revise code

- remove CMake version warning
- change to define mtpr error enum if not defined
- remove unnecessary json-glib dependancy
- use uniform initializer for memeber initialization
- place class method prior to class member for each access modifier
- remove unnecessary header include
- use static for global variable on test

Change-Id: Ie892d364340a59aa9ce0201725bb9bb4d2da7a57

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c611cb407f6ec635492540fb761031d396f80c7..11c699f7fba94f9b09501c1373f8cbc8e2f61bd4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION  2.8.12)
 SET(fw_name "capi-media-transporter")
 
 PROJECT(${fw_name})
@@ -11,7 +11,7 @@ SET(INC_DIR include)
 INCLUDE_DIRECTORIES(${INC_DIR})
 
 SET(dependents "dlog glib-2.0 gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 \
-                json-glib-1.0 iniparser mm-common capi-media-tool mm-display-interface \
+                iniparser mm-common capi-media-tool mm-display-interface \
                 cynara-client libsmack capi-system-info bundle capi-media-sound-manager \
                 gstreamer-rtsp-server-1.0 libpulse")
 

diff --git a/include/MediaSourceBinAudioTest.h b/include/MediaSourceBinAudioTest.h
index 11245a12663e07d3774e5864e763ff801243ac0b..0cf315cba95f477d2919ac909caadc73e73cf500 100644 (file)
--- a/include/MediaSourceBinAudioTest.h
+++ b/include/MediaSourceBinAudioTest.h
@@ -19,20 +19,14 @@
 
 #ifdef __cplusplus
 
+#include <string>
 
 #include "MediaTransporter.h"
-#include <string>
-#include <map>
-#include <mutex>
-#include <glib.h>
-#include <iniparser.h>
-#include <mm_resource_manager.h>
-#include "MediaSourceBinBase.h"
 #include "MediaTransporterGst.h"
+#include "MediaSourceBinBase.h"
 
 namespace tizen_media_transporter {
 
-#define RESOURCE_TYPE_MAX MM_RESOURCE_MANAGER_RES_TYPE_VIDEO_ENCODER + 1
 const std::string DEFAULT_ELEMENT_AUDIO_TEST = "audiotestsrc";
 
 class MediaSourceBinAudioTest : public MediaSourceBinBase
@@ -44,24 +38,25 @@ public:
        MediaSourceBinInfo generate() override;
 
 private:
-       struct audioInfo {
-               int channel = -1;
-               int rate = -1;
-               std::string format = "";
-       };
-
-       struct encodingInfo {
-               int bitrate = 0;
-       };
-
        void parseSourceParam(bundle* params);
        GstElement* createMicSource();
        void setEncoderParam(gst::GstElements& elements);
        void setSourceParam(gst::GstElements& elements);
        void replaceCapsWithAudioInfo(GstElement* element);
        void replaceEncCapsWithAudioInfo(GstElement* element);
+
+       struct audioInfo {
+               int channel { -1 };
+               int rate { -1 };
+               std::string format;
+       };
        audioInfo _audioInfo;
+
+       struct encodingInfo {
+               int bitrate = 0;
+       };
        encodingInfo _encInfo;
+
 };
 
 } // namespace

diff --git a/include/MediaSourceBinBase.h b/include/MediaSourceBinBase.h
index c1e17f723d024bebcedae71fa22e3e89f9de07af..1fcafb10312ed491335e889cd3543ba4e3617332 100644 (file)
--- a/include/MediaSourceBinBase.h
+++ b/include/MediaSourceBinBase.h
@@ -19,21 +19,15 @@
 
 #ifdef __cplusplus
 
-
-#include "MediaTransporter.h"
 #include <string>
 #include <vector>
-#include <map>
-#include <set>
 #include <mutex>
-#include <glib.h>
-#include <gst/gst.h>
-#include <iniparser.h>
-#include <bundle.h>
-#include <mm_resource_manager.h>
-#include "MediaTransporterParseIni.h"
 #include <tuple>
 
+#include "MediaTransporter.h"
+#include "MediaTransporterParseIni.h"
+#include "MediaTransporterGst.h"
+
 namespace tizen_media_transporter {
 
 using MediaSourceBinInfo = std::tuple<mtprSourceType, GstBin*, ResourceSet>;
@@ -44,7 +38,7 @@ const std::string ELEMENT_NAME_ENCODE_CAPSFILTER = "encCapsfilter";
 class IMediaSourceBin
 {
 public:
-       virtual ~IMediaSourceBin() {}
+       virtual ~IMediaSourceBin() = default;
        virtual MediaSourceBinInfo generate() = 0;
 };
 
@@ -55,8 +49,8 @@ public:
        ~MediaSourceBinBase() = default;
 
 protected:
-       std::vector<GstElement*> createVideoRestOfElements(const MtprMediaSourceIni& ini);
-       std::vector<GstElement*> createAudioRestOfElements(const MtprMediaSourceIni& ini);
+       gst::GstElements createVideoRestOfElements(const MtprMediaSourceIni& ini);
+       gst::GstElements createAudioRestOfElements(const MtprMediaSourceIni& ini);
 };
 
 } // namespace

diff --git a/include/MediaSourceBinCamera.h b/include/MediaSourceBinCamera.h
index 927ad3a32941db1ae98dea0ec4a0642004b6e6a0..caddb6c45e66cda51e66cf90bde3c5cc95e0da09 100644 (file)
--- a/include/MediaSourceBinCamera.h
+++ b/include/MediaSourceBinCamera.h
@@ -19,16 +19,11 @@
 
 #ifdef __cplusplus
 
+#include <string>
 
 #include "MediaTransporter.h"
-#include <string>
-#include <map>
-#include <mutex>
-#include <glib.h>
-#include <iniparser.h>
-#include <mm_resource_manager.h>
-#include "MediaSourceBinBase.h"
 #include "MediaTransporterGst.h"
+#include "MediaSourceBinBase.h"
 
 namespace tizen_media_transporter {
 
@@ -43,24 +38,25 @@ public:
        MediaSourceBinInfo generate() override;
 
 private:
-       struct videoInfo {
-               int width = -1;
-               int height = -1;
-               int frameRate = -1;
-       };
-
-       struct encodingInfo {
-               int bitrate = 0;
-       };
-
        void parseSourceParam(bundle* params);
        GstElement* createCameraSource();
        void setEncoderParam(gst::GstElements& elements);
        void setSourceParam(gst::GstElements& elements);
        void replaceCapsWithVideoInfo(GstElement* element);
        void replaceEncCapsWithVideoInfo(GstElement* element);
+
+       struct videoInfo {
+               int width { -1 };
+               int height { -1 };
+               int frameRate { -1 };
+       };
        videoInfo _videoInfo;
+
+       struct encodingInfo {
+               int bitrate { 0 };
+       };
        encodingInfo _encInfo;
+
 };
 
 } // namespace

diff --git a/include/MediaSourceBinFactory.h b/include/MediaSourceBinFactory.h
index e90d67c38c9b7d212bb234499cf477260eee15cf..610ae81d72c796d1b95dd457d23c7adbf6db3f76 100644 (file)
--- a/include/MediaSourceBinFactory.h
+++ b/include/MediaSourceBinFactory.h
@@ -19,17 +19,16 @@
 
 #ifdef __cplusplus
 
-#include "MediaSourceBinBase.h"
-#include <string>
-#include <map>
 #include <bundle.h>
 
+#include "MediaSourceBinBase.h"
+
 namespace tizen_media_transporter {
 
 class MediaSourceBinFactory
 {
 public:
-    static IMediaSourceBin* create(mtprSourceType type, bundle* param_list);
+       static IMediaSourceBin* create(mtprSourceType type, bundle* param_list);
 };
 
 } // namespace

diff --git a/include/MediaSourceBinMic.h b/include/MediaSourceBinMic.h
index f65a4c3a52e51b679073525b2d5ac5ac24360b9f..2520b1c7d4f97f6622bc8744f9fffd0a4058d6c6 100644 (file)
--- a/include/MediaSourceBinMic.h
+++ b/include/MediaSourceBinMic.h
@@ -21,11 +21,7 @@
 
 
 #include <string>
-#include <map>
-#include <mutex>
 #include <glib.h>
-#include <iniparser.h>
-#include <mm_resource_manager.h>
 #include <sound_manager.h>
 
 #include "MediaTransporter.h"
@@ -46,25 +42,26 @@ public:
        void setSoundStreamInfo(sound_stream_info_h streamInfo);
 
 private:
-       struct audioInfo {
-               int channel = -1;
-               int rate = -1;
-               std::string format = "";
-       };
-
-       struct encodingInfo {
-               int bitrate = 0;
-       };
-
        void parseSourceParam(bundle* params);
        GstElement* createMicSource();
        void setEncoderParam(gst::GstElements& elements);
        void setSourceParam(gst::GstElements& elements);
        void replaceCapsWithAudioInfo(GstElement* element);
        void replaceEncCapsWithAudioInfo(GstElement* element);
+
+       struct audioInfo {
+               int channel { -1 };
+               int rate { -1 };
+               std::string format;
+       };
        audioInfo _audioInfo;
+
+       struct encodingInfo {
+               int bitrate { 0 };
+       };
        encodingInfo _encInfo;
-       std::string _streamInfo = "";
+
+       std::string _streamInfo;
 };
 
 } // namespace

diff --git a/include/MediaSourceBinVideoTest.h b/include/MediaSourceBinVideoTest.h
index 0de1cbceb14f6b2149006d7a310b6d15bd75cd38..b8dbefc968facec72efbec30ee6735a3f4b86742 100644 (file)
--- a/include/MediaSourceBinVideoTest.h
+++ b/include/MediaSourceBinVideoTest.h
@@ -19,16 +19,11 @@
 
 #ifdef __cplusplus
 
+#include <string>
 
 #include "MediaTransporter.h"
-#include <string>
-#include <map>
-#include <mutex>
-#include <glib.h>
-#include <iniparser.h>
-#include <mm_resource_manager.h>
-#include "MediaSourceBinBase.h"
 #include "MediaTransporterGst.h"
+#include "MediaSourceBinBase.h"
 
 namespace tizen_media_transporter {
 
@@ -43,24 +38,25 @@ public:
        MediaSourceBinInfo generate() override;
 
 private:
-       struct videoInfo {
-               int width = -1;
-               int height = -1;
-               int frameRate = -1;
-       };
-
-       struct encodingInfo {
-               int bitrate = 0;
-       };
-
        void parseSourceParam(bundle* params);
        GstElement* createVideoTestSource();
        void setEncoderParam(gst::GstElements& elements);
        void setSourceParam(gst::GstElements& elements);
        void replaceCapsWithVideoInfo(GstElement* element);
        void replaceEncCapsWithVideoInfo(GstElement* element);
+
+       struct videoInfo {
+               int width { -1 };
+               int height { -1 };
+               int frameRate { -1 };
+       };
        videoInfo _videoInfo;
+
+       struct encodingInfo {
+               int bitrate { 0 };
+       };
        encodingInfo _encInfo;
+
 };
 
 } // namespace

diff --git a/include/MediaTransporterBase.h b/include/MediaTransporterBase.h
index b29483d6c58fa15428bc5b5de2bc90a107f7de8b..e5bf3bbaff682a08285a94e2c9cbd37aa250e1b1 100644 (file)
--- a/include/MediaTransporterBase.h
+++ b/include/MediaTransporterBase.h
@@ -19,17 +19,14 @@
 
 #ifdef __cplusplus
 
-
-#include "MediaTransporter.h"
 #include <string>
-#include <map>
-#include <set>
 #include <mutex>
 #include <glib.h>
-#include <iniparser.h>
 #include <mm_resource_manager.h>
 #include <gst/gst.h>
 #include <bundle.h>
+
+#include "MediaTransporter.h"
 #include "MediaTransporterParseIni.h"
 #include "MediaTransporterCallback.h"
 #include "MediaTransporterObserver.h"

diff --git a/include/MediaTransporterCallback.h b/include/MediaTransporterCallback.h
index 24d4ee92225462fa1c07108b48e0040e0c664b3e..811b3d7d05d6317f124eb216ce42c53e2c88cb6b 100644 (file)
--- a/include/MediaTransporterCallback.h
+++ b/include/MediaTransporterCallback.h
@@ -17,14 +17,10 @@
 #ifndef __TIZEN_MEDIA_TRANSPORTER_CALLBACK_H__
 #define __TIZEN_MEDIA_TRANSPORTER_CALLBACK_H__
 
-#include <stdio.h>
-#include <dlog.h>
-
-#include <map>
 #include <variant>
 #include <memory>
-
 #include <media_packet.h>
+
 #include "MediaTransporter.h"
 
 #ifdef __cplusplus

diff --git a/include/MediaTransporterDisplay.h b/include/MediaTransporterDisplay.h
index 9eff6ca8223945194995386f6c7e4dc979e78fab..639d89ba93381a6540950e942fdf7d04314de292 100644 (file)
--- a/include/MediaTransporterDisplay.h
+++ b/include/MediaTransporterDisplay.h
@@ -17,7 +17,6 @@
 #ifndef __TIZEN_MEDIA_TRANSPORTER_DISPLAY_H__
 #define __TIZEN_MEDIA_TRANSPORTER_DISPLAY_H__
 
-#include <stdio.h>
 #include <mutex>
 #include <mm_display_interface.h>
 #include <gst/gst.h>

diff --git a/include/MediaTransporterFactory.h b/include/MediaTransporterFactory.h
index df0825ede3db1b0f5383cf220cae0461a6eff187..a8721d1159f19f10ea928ebbbd0a193a6609b1b2 100644 (file)
--- a/include/MediaTransporterFactory.h
+++ b/include/MediaTransporterFactory.h
@@ -20,15 +20,13 @@
 #ifdef __cplusplus
 
 #include "MediaTransporterBase.h"
-#include <string>
-#include <map>
 
 namespace tizen_media_transporter {
 
 class MediaTransporterFactory
 {
 public:
-    static MediaTransporterBase* create(mtprConnectionType type);
+       static MediaTransporterBase* create(mtprConnectionType type);
 };
 
 } // namespace

diff --git a/include/MediaTransporterGst.h b/include/MediaTransporterGst.h
index 79acaa46bf447a6a802e3b212586fc944c398356..72901b4dc3269addae13794c8dedbf25526fd319 100644 (file)
--- a/include/MediaTransporterGst.h
+++ b/include/MediaTransporterGst.h
@@ -18,6 +18,7 @@
 #define __TIZEN_MEDIA_TRANSPORTER_GST_H__
 
 #ifdef __cplusplus
+
 #include <glib.h>
 #include <gst/gst.h>
 #include <gst/audio/audio.h>

diff --git a/include/MediaTransporterObserver.h b/include/MediaTransporterObserver.h
index f90ce2c0752e3c45e46c868556ef8dc1cb7d98b6..c5e98eb572f26ba96269843e7abe2ab31694e413 100644 (file)
--- a/include/MediaTransporterObserver.h
+++ b/include/MediaTransporterObserver.h
@@ -17,8 +17,6 @@
 #ifndef __TIZEN_MEDIA_TRANSPORTER_OBSERVER_H__
 #define __TIZEN_MEDIA_TRANSPORTER_OBSERVER_H__
 
-#include <stdio.h>
-#include <dlog.h>
 #include <vector>
 
 #ifdef __cplusplus
@@ -30,14 +28,14 @@ namespace tizen_media_transporter {
 class IObserver
 {
 public:
-    virtual ~IObserver() = default;
-    virtual void changed() = 0;
+       virtual ~IObserver() = default;
+       virtual void changed() = 0;
 };
 
 class IObservable
 {
 public:
-       virtual ~IObservable() {}
+       virtual ~IObservable() = default;
 
        virtual void subscribe(IObserver *observer) = 0;
        virtual void unsubscribe(IObserver *observer) = 0;

diff --git a/include/MediaTransporterParseIni.h b/include/MediaTransporterParseIni.h
index 744cc462dc3aabe62f3fe5c523f42649a2f841c4..9cc5a81394b2a65b8ea03b591a1d660925482526 100644 (file)
--- a/include/MediaTransporterParseIni.h
+++ b/include/MediaTransporterParseIni.h
@@ -22,6 +22,7 @@
 #include <string>
 #include <vector>
 #include <iniparser.h>
+
 #include "mtpr.h"
 
 namespace tizen_media_transporter {

diff --git a/include/MediaTransporterReceiver.h b/include/MediaTransporterReceiver.h
index 671375514ca9211ce135dd237f60df9673d77624..924df8ae348993dea0354dfb6a668a2bd3bff46d 100644 (file)
--- a/include/MediaTransporterReceiver.h
+++ b/include/MediaTransporterReceiver.h
@@ -19,14 +19,12 @@
 
 #ifdef __cplusplus
 
-
-#include "MediaTransporter.h"
 #include <string>
-#include <map>
-#include <climits>
-#include <gst/gst.h>
+#include <memory>
 #include <media_format.h>
 #include <sound_manager_internal.h>
+
+#include "MediaTransporter.h"
 #include "MediaTransporterBase.h"
 #include "MediaTransporterGst.h"
 #include "MediaTransporterCallback.h"
@@ -60,6 +58,17 @@ public:
        void setSoundStreamInfo(sound_stream_info_h streamInfo);
 
 protected:
+       int _buildForwardingElements(GstElement* demux, GstPad* pad, GCallback callback);
+       void _buildForwardingSink(gst::GstElements& elements, GstPad* pad, GCallback callback);
+
+       int _buildAudioRenderingElements(GstElement* demux, GstPad* pad);
+       int _buildVideoRenderingElements(GstElement* demux, GstPad* pad);
+
+       static void _streamAddedCallback(GstPad* pad, gpointer data);
+       static void _noMoreStreamCallback(gpointer data);
+       static void _encodedAudioStreamCallback(GstElement* object, GstBuffer* buffer, GstPad* pad, gpointer data);
+       static void _encodedVideoStreamCallback(GstElement* object, GstBuffer* buffer, GstPad* pad, gpointer data);
+
        std::unique_ptr<IInvokable> _trackAddedCallback;
        std::unique_ptr<IInvokable> _noMoreTrackCallback;
 
@@ -73,19 +82,9 @@ protected:
        std::shared_ptr<MediaTransporterDisplay> _display;
        std::string _streamInfo;
 
-       int _buildForwardingElements(GstElement* demux, GstPad* pad, GCallback callback);
-       void _buildForwardingSink(gst::GstElements& elements, GstPad* pad, GCallback callback);
-
-       int _buildAudioRenderingElements(GstElement* demux, GstPad* pad);
-       int _buildVideoRenderingElements(GstElement* demux, GstPad* pad);
-
-       static void _streamAddedCallback(GstPad* pad, gpointer data);
-       static void _noMoreStreamCallback(gpointer data);
-       static void _encodedAudioStreamCallback(GstElement* object, GstBuffer* buffer, GstPad* pad, gpointer data);
-       static void _encodedVideoStreamCallback(GstElement* object, GstBuffer* buffer, GstPad* pad, gpointer data);
-
 private:
        static media_packet_h _makeMediaPacket(GstBuffer* buffer, GstPad* pad, media_format_h* format);
+
        void _buildAudioRenderingSink(gst::GstElements& elements);
        void _buildVideoRenderingSink(gst::GstElements& elements);
 };

diff --git a/include/MediaTransporterReceiverRist.h b/include/MediaTransporterReceiverRist.h
index 54dff456b0347c6358f00ef4286bb0beea654952..0435b2731e4d9675ff819d511c78278e6f56f507 100644 (file)
--- a/include/MediaTransporterReceiverRist.h
+++ b/include/MediaTransporterReceiverRist.h
@@ -19,14 +19,12 @@
 
 #ifdef __cplusplus
 
+#include <string>
 
 #include "MediaTransporter.h"
-#include <string>
-#include <map>
-#include <climits>
-#include <gst/gst.h>
 #include "MediaTransporterBase.h"
 #include "MediaTransporterReceiver.h"
+#include "MediaTransporterGst.h"
 
 namespace tizen_media_transporter {
 
@@ -50,8 +48,8 @@ public:
        mtprConnectionType type() override { return MTPR_CONNECTION_TYPE_RIST_RECEIVER; }
 
 private:
-       static void _demuxPadAddedCallback(GstElement *demux, GstPad *new_pad, gpointer userData);
-       static void _demuxNoMorePadsCallback(GstElement *demux, gpointer userData);
+       static void _demuxPadAddedCallback(GstElement* demux, GstPad* new_pad, gpointer userData);
+       static void _demuxNoMorePadsCallback(GstElement* demux, gpointer userData);
 
        std::string _receiverAddress;
 };

diff --git a/include/MediaTransporterReceiverSrt.h b/include/MediaTransporterReceiverSrt.h
index 64626cd292dfed32ebc91ac4bec293a5e8345f3b..94ae6e52fda98de703140ee83f3fcf981b6ef86c 100644 (file)
--- a/include/MediaTransporterReceiverSrt.h
+++ b/include/MediaTransporterReceiverSrt.h
@@ -19,14 +19,12 @@
 
 #ifdef __cplusplus
 
+#include <string>
 
 #include "MediaTransporter.h"
-#include <string>
-#include <map>
-#include <climits>
-#include <gst/gst.h>
 #include "MediaTransporterBase.h"
 #include "MediaTransporterReceiver.h"
+#include "MediaTransporterGst.h"
 
 namespace tizen_media_transporter {
 
@@ -50,8 +48,8 @@ public:
        mtprConnectionType type() override { return MTPR_CONNECTION_TYPE_SRT_RECEIVER; }
 
 private:
-       static void _demuxPadAddedCallback(GstElement *demux, GstPad *new_pad, gpointer userData);
-       static void _demuxNoMorePadsCallback(GstElement *demux, gpointer userData);
+       static void _demuxPadAddedCallback(GstElement* demux, GstPad* new_pad, gpointer userData);
+       static void _demuxNoMorePadsCallback(GstElement* demux, gpointer userData);
 
        std::string _senderAddress;
 };

diff --git a/include/MediaTransporterResource.h b/include/MediaTransporterResource.h
index 8237dd3e434b8d289a201f42ea8a3c86697a0b81..97c53d793328fdb5d4a860f9d1c270cf46278ad2 100644 (file)
--- a/include/MediaTransporterResource.h
+++ b/include/MediaTransporterResource.h
@@ -19,7 +19,6 @@
 
 #include <mutex>
 #include <map>
-
 #include <mm_resource_manager.h>
 
 #include "MediaTransporter.h"
@@ -47,8 +46,8 @@ private:
        int create();
        int destroy();
        int acquireInternal(mm_resource_manager_res_type_e type);
-
        bool resourceReleased(mm_resource_manager_res_h res);
+
        mm_resource_manager_h _mgr { nullptr };
        std::map<mm_resource_manager_res_type_e, mm_resource_manager_res_h> _resources;
        bool _onReleaseCallback { false };

diff --git a/include/MediaTransporterSender.h b/include/MediaTransporterSender.h
index fd351fdbf3066c2376b750f953df2edb0c63625c..67a42aed107dfe03e8c650c3f8cb6a340da0ac3a 100644 (file)
--- a/include/MediaTransporterSender.h
+++ b/include/MediaTransporterSender.h
@@ -19,15 +19,12 @@
 
 #ifdef __cplusplus
 
+#include <map>
+#include <memory>
 
 #include "MediaTransporter.h"
-#include <string>
-#include <map>
-#include <climits>
-#include <gst/gst.h>
 #include "MediaTransporterBase.h"
 #include "MediaSourceBinBase.h"
-#include <memory>
 
 namespace tizen_media_transporter {
 
@@ -39,6 +36,7 @@ public:
 
        int addMediaSource(IMediaSourceBin* sourceBin);
        void removeMediaSource(int id);
+
        IMediaSourceBin* getMediaSource(int id);
 
 protected:

diff --git a/include/MediaTransporterSenderRist.h b/include/MediaTransporterSenderRist.h
index 68994a7f515961843a6dab0fa3c2e5775f9ac09a..884de6023eb5e8bdb8dc363aa37df1b30d976092 100644 (file)
--- a/include/MediaTransporterSenderRist.h
+++ b/include/MediaTransporterSenderRist.h
@@ -19,17 +19,15 @@
 
 #ifdef __cplusplus
 
-
-#include "MediaTransporter.h"
 #include <string>
 #include <climits>
-#include <gst/gst.h>
+
+#include "MediaTransporter.h"
 #include "MediaTransporterSender.h"
+#include "MediaTransporterGst.h"
 
 namespace tizen_media_transporter {
 
-#define RESOURCE_TYPE_MAX MM_RESOURCE_MANAGER_RES_TYPE_VIDEO_ENCODER + 1
-
 class MediaTransporterSenderRist : public MediaTransporterSender
 {
 public:

diff --git a/include/MediaTransporterSenderRtsp.h b/include/MediaTransporterSenderRtsp.h
index 772db4be63861a49f84908fbd8af6bd62f49ef0a..1818a39ce825fa089af85ad6335b6701194e9b4d 100644 (file)
--- a/include/MediaTransporterSenderRtsp.h
+++ b/include/MediaTransporterSenderRtsp.h
@@ -19,11 +19,9 @@
 
 #ifdef __cplusplus
 
+#include <string>
 
 #include "MediaTransporter.h"
-#include <string>
-#include <climits>
-#include <gst/gst.h>
 #include "MediaTransporterSender.h"
 
 namespace tizen_media_transporter {

diff --git a/include/MediaTransporterSenderSrt.h b/include/MediaTransporterSenderSrt.h
index 1c5d96eb14db32cf5d20be475ea5eb3a15f1073e..4b5b1557e14859bea5f8c0ba2f1f9b3641408593 100644 (file)
--- a/include/MediaTransporterSenderSrt.h
+++ b/include/MediaTransporterSenderSrt.h
@@ -19,13 +19,11 @@
 
 #ifdef __cplusplus
 
+#include <string>
 
 #include "MediaTransporter.h"
-#include <string>
-#include <climits>
-#include <gio/gio.h>
-#include <gst/gst.h>
 #include "MediaTransporterSender.h"
+#include "MediaTransporterGst.h"
 
 namespace tizen_media_transporter {
 

diff --git a/include/MediaTransporterSenderToServerRtsp.h b/include/MediaTransporterSenderToServerRtsp.h
index b6b2bd0c99699ca24deae1d12bbdfa3ee4e7b139..63ee26faca411ab6567b9ec3edc9fb976026c578 100644 (file)
--- a/include/MediaTransporterSenderToServerRtsp.h
+++ b/include/MediaTransporterSenderToServerRtsp.h
@@ -19,12 +19,11 @@
 
 #ifdef __cplusplus
 
+#include <string>
 
 #include "MediaTransporter.h"
-#include <string>
-#include <climits>
-#include <gst/gst.h>
 #include "MediaTransporterSender.h"
+#include "MediaTransporterGst.h"
 
 namespace tizen_media_transporter {
 

diff --git a/include/mtpr.h b/include/mtpr.h
index 9d3dd91f79c7c79548122deee733e36925920c03..34de8dfe7fe2ac431d7778f5e59936eda003a71a 100644 (file)
--- a/include/mtpr.h
+++ b/include/mtpr.h
@@ -35,7 +35,9 @@ extern "C" {
 /* TEMP Define ***********************************************/
 /* FIXME: this definition have to be applied
           at core/api/common pkg, include/tizen_error.h file */
+#ifndef TIZEN_ERROR_MEDIA_TRANSPORTER
 #define TIZEN_ERROR_MEDIA_TRANSPORTER -0x01A30000
+#endif
 /*************************************************************/
 
 /**

diff --git a/packaging/capi-media-transporter.spec b/packaging/capi-media-transporter.spec
index b94ba4117b93330dbf88cf70364dafeb8ec4d791..a9386471ef1b1605b7d4fce8ae57928693845e11 100644 (file)
--- a/packaging/capi-media-transporter.spec
+++ b/packaging/capi-media-transporter.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-transporter
 Summary:    A Media Transporter library in Tizen Native API
-Version:    0.0.2
+Version:    0.0.3
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
@@ -19,7 +19,6 @@ BuildRequires:  pkgconfig(gstreamer-rtsp-server-1.0)
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(appcore-efl)
 BuildRequires:  pkgconfig(elementary)
-BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(iniparser)
 BuildRequires:  pkgconfig(bundle)
 BuildRequires:  pkgconfig(mm-display-interface)

diff --git a/src/MediaSourceBinBase.cpp b/src/MediaSourceBinBase.cpp
index 9bd3f13d3088b07318e17f35884f0dc13978eef1..bdba56322b605e161a891642ff54d0cfe8750c5b 100644 (file)
--- a/src/MediaSourceBinBase.cpp
+++ b/src/MediaSourceBinBase.cpp
@@ -16,7 +16,6 @@
 
 #include "MediaSourceBinBase.h"
 #include "MediaTransporterException.h"
-#include "MediaTransporterGst.h"
 #include "MediaTransporterLog.h"
 #include "MediaTransporterParseIni.h"
 #include <sstream>

diff --git a/src/MediaTransporterSenderSrt.cpp b/src/MediaTransporterSenderSrt.cpp
index 2cd8cd757e6296a92f3655d2552ebf3b60ffaea5..5de67bb97aa3ac36b9d421f8ed576922727a705a 100644 (file)
--- a/src/MediaTransporterSenderSrt.cpp
+++ b/src/MediaTransporterSenderSrt.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
+#include <gio/gio.h>
+
 #include "MediaTransporterBase.h"
 #include "MediaTransporterException.h"
 #include "MediaTransporterSenderSrt.h"
-#include "MediaTransporterGst.h"
 #include "MediaTransporterLog.h"
 #include "MediaTransporterUtil.h"
 #include "MediaTransporterParseIni.h"

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index cba788f5bad64c59f959b215191b871f7ee37ab0..1e85874b69a56508a1b5a7bb8558499fec2fe6ce 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
 SET(fw_test "${fw_name}-test")
 
 INCLUDE_DIRECTORIES(../include)

diff --git a/test/mtpr_test.c b/test/mtpr_test.c
index a05a2e5fe259f705b84118efca92557c886300f9..473c66e1c00357202aa172e385f1b19fbec32690 100644 (file)
--- a/test/mtpr_test.c
+++ b/test/mtpr_test.c
@@ -86,9 +86,9 @@ static bool g_dump_data = false;
 static FILE* video_dump = NULL;
 static FILE* audio_dump = NULL;
 
-int g_menu_state = CURRENT_STATUS_MAINMENU;
-sound_stream_info_h g_mic_stream_info = NULL;
-sound_stream_info_h g_stream_info = NULL;
+static int g_menu_state = CURRENT_STATUS_MAINMENU;
+static sound_stream_info_h g_mic_stream_info = NULL;
+static sound_stream_info_h g_stream_info = NULL;
 
 static void _mtpr_test_unset_track_cb();
 static void _mtpr_test_unset_encoded_audio_frame_cb();
@@ -209,7 +209,7 @@ static int app_terminate(void *data)
        return 0;
 }
 
-struct appcore_ops ops = {
+static struct appcore_ops ops = {
        .create = app_create,
        .terminate = app_terminate,
 };