diff options
Diffstat (limited to 'src/components/media_manager')
38 files changed, 434 insertions, 499 deletions
diff --git a/src/components/media_manager/include/media_manager/audio/a2dp_source_player_adapter.h b/src/components/media_manager/include/media_manager/audio/a2dp_source_player_adapter.h index 09985282d1..3f262b27bb 100644 --- a/src/components/media_manager/include/media_manager/audio/a2dp_source_player_adapter.h +++ b/src/components/media_manager/include/media_manager/audio/a2dp_source_player_adapter.h @@ -39,7 +39,7 @@ #include "utils/threads/thread_delegate.h" namespace protocol_handler { - class SessionObserver; +class SessionObserver; } namespace threads { @@ -49,28 +49,28 @@ class Thread; namespace media_manager { class A2DPSourcePlayerAdapter : public MediaAdapterImpl { - public: - A2DPSourcePlayerAdapter(protocol_handler::SessionObserver& session_observer); - ~A2DPSourcePlayerAdapter(); - void SendData(int32_t application_key, - const ::protocol_handler::RawMessagePtr message) {} - void StartActivity(int32_t application_key); - void StopActivity(int32_t application_key); - bool is_app_performing_activity(int32_t application_key) const; + public: + A2DPSourcePlayerAdapter(protocol_handler::SessionObserver& session_observer); + ~A2DPSourcePlayerAdapter(); + void SendData(int32_t application_key, + const ::protocol_handler::RawMessagePtr message) {} + void StartActivity(int32_t application_key); + void StopActivity(int32_t application_key); + bool is_app_performing_activity(int32_t application_key) const; - void set_connection_handler( - connection_handler::ConnectionHandlerImpl* connection_handler) { - connection_handler_ = connection_handler; - } + void set_connection_handler( + connection_handler::ConnectionHandlerImpl* connection_handler) { + connection_handler_ = connection_handler; + } - private: - class A2DPSourcePlayerThread; + private: + class A2DPSourcePlayerThread; - typedef std::pair<threads::Thread*, A2DPSourcePlayerThread*> Pair; - typedef std::map<int32_t, Pair> SourcesMap; - SourcesMap sources_; - protocol_handler::SessionObserver& session_observer_; - DISALLOW_COPY_AND_ASSIGN(A2DPSourcePlayerAdapter); + typedef std::pair<threads::Thread*, A2DPSourcePlayerThread*> Pair; + typedef std::map<int32_t, Pair> SourcesMap; + SourcesMap sources_; + protocol_handler::SessionObserver& session_observer_; + DISALLOW_COPY_AND_ASSIGN(A2DPSourcePlayerAdapter); }; } // namespace media_manager diff --git a/src/components/media_manager/include/media_manager/audio/audio_stream_sender_thread.h b/src/components/media_manager/include/media_manager/audio/audio_stream_sender_thread.h index e9de397eed..b956f2c9e2 100644 --- a/src/components/media_manager/include/media_manager/audio/audio_stream_sender_thread.h +++ b/src/components/media_manager/include/media_manager/audio/audio_stream_sender_thread.h @@ -39,7 +39,6 @@ #include "utils/conditional_variable.h" #include "utils/lock.h" - namespace NsSmartDeviceLink { namespace NsSmartObjects { class SmartObject; @@ -47,7 +46,7 @@ class SmartObject; } namespace application_manager { - class ApplicationManager; +class ApplicationManager; } namespace media_manager { @@ -66,71 +65,67 @@ typedef enum { ACQ_16_BIT = 1 } AudioCaptureQuality; -typedef enum { - AT_INVALID = -1, - AT_PCM = 0 -} AudioType; +typedef enum { AT_INVALID = -1, AT_PCM = 0 } AudioType; /* - * @brief AudioStreamSenderThread class used to read binary data written from microphone + * @brief AudioStreamSenderThread class used to read binary data written from + * microphone * and send it every 1 second to mobile device. */ class AudioStreamSenderThread : public threads::ThreadDelegate { - public: - /* - * @brief AudioStreamSenderThread class constructor - * - * @param session_key Session key of connection for Mobile side - * @param correlation_id Correlation id for response for Mobile side - */ - AudioStreamSenderThread(const std::string& fileName, - uint32_t session_key, - application_manager::ApplicationManager& app_mngr); - - /* - * @brief AudioStreamSenderThread class destructor - */ - ~AudioStreamSenderThread(); - - /** - * @brief Thread procedure. - */ - void threadMain(); - - /* - * @brief Retrieve session key - * - * @return Stored session key - */ - uint32_t session_key() const; - - void exitThreadMain(); - - private: - /* - * @brief Sends AudioPassThru request - */ - bool SendEndAudioPassThru(); - - void sendAudioChunkToMobile(); - - - bool getShouldBeStopped(); - void setShouldBeStopped(bool should_stop); - - uint32_t session_key_; - const std::string fileName_; - int32_t offset_; - volatile bool shouldBeStoped_; - sync_primitives::Lock shouldBeStoped_lock_; - sync_primitives::ConditionalVariable shouldBeStoped_cv_; - - static const int32_t kAudioPassThruTimeout; - - application_manager::ApplicationManager& application_manager_; - - - DISALLOW_COPY_AND_ASSIGN(AudioStreamSenderThread); + public: + /* + * @brief AudioStreamSenderThread class constructor + * + * @param session_key Session key of connection for Mobile side + * @param correlation_id Correlation id for response for Mobile side + */ + AudioStreamSenderThread(const std::string& fileName, + uint32_t session_key, + application_manager::ApplicationManager& app_mngr); + + /* + * @brief AudioStreamSenderThread class destructor + */ + ~AudioStreamSenderThread(); + + /** + * @brief Thread procedure. + */ + void threadMain(); + + /* + * @brief Retrieve session key + * + * @return Stored session key + */ + uint32_t session_key() const; + + void exitThreadMain(); + + private: + /* + * @brief Sends AudioPassThru request + */ + bool SendEndAudioPassThru(); + + void sendAudioChunkToMobile(); + + bool getShouldBeStopped(); + void setShouldBeStopped(bool should_stop); + + uint32_t session_key_; + const std::string fileName_; + int32_t offset_; + volatile bool shouldBeStoped_; + sync_primitives::Lock shouldBeStoped_lock_; + sync_primitives::ConditionalVariable shouldBeStoped_cv_; + + static const int32_t kAudioPassThruTimeout; + + application_manager::ApplicationManager& application_manager_; + + DISALLOW_COPY_AND_ASSIGN(AudioStreamSenderThread); }; } // namespace media_manager diff --git a/src/components/media_manager/include/media_manager/audio/file_audio_streamer_adapter.h b/src/components/media_manager/include/media_manager/audio/file_audio_streamer_adapter.h index f51aed0a47..dc0c001acf 100644 --- a/src/components/media_manager/include/media_manager/audio/file_audio_streamer_adapter.h +++ b/src/components/media_manager/include/media_manager/audio/file_audio_streamer_adapter.h @@ -39,9 +39,8 @@ namespace media_manager { class FileAudioStreamerAdapter : public FileStreamerAdapter { public: - FileAudioStreamerAdapter( - const std::string& audio_stream_file, - const std::string& app_storage_folder); + FileAudioStreamerAdapter(const std::string& audio_stream_file, + const std::string& app_storage_folder); ~FileAudioStreamerAdapter(); }; diff --git a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h index a3c4061162..7daf9c7add 100644 --- a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h +++ b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h @@ -43,22 +43,23 @@ class Thread; namespace media_manager { class FromMicRecorderAdapter : public MediaAdapterImpl { - public: - FromMicRecorderAdapter(); - ~FromMicRecorderAdapter(); - void SendData(int32_t application_key, - const ::protocol_handler::RawMessagePtr message) {} - void StartActivity(int32_t application_key); - void StopActivity(int32_t application_key); - bool is_app_performing_activity(int32_t application_key) const; - void set_output_file(const std::string& output_file); - void set_duration(int32_t duration); - private: - threads::Thread* recorder_thread_; - std::string output_file_; - const int32_t kDefaultDuration; - int32_t duration_; - DISALLOW_COPY_AND_ASSIGN(FromMicRecorderAdapter); + public: + FromMicRecorderAdapter(); + ~FromMicRecorderAdapter(); + void SendData(int32_t application_key, + const ::protocol_handler::RawMessagePtr message) {} + void StartActivity(int32_t application_key); + void StopActivity(int32_t application_key); + bool is_app_performing_activity(int32_t application_key) const; + void set_output_file(const std::string& output_file); + void set_duration(int32_t duration); + + private: + threads::Thread* recorder_thread_; + std::string output_file_; + const int32_t kDefaultDuration; + int32_t duration_; + DISALLOW_COPY_AND_ASSIGN(FromMicRecorderAdapter); }; } // namespace media_manager diff --git a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_listener.h b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_listener.h index 96eb32b400..c615195f94 100644 --- a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_listener.h +++ b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_listener.h @@ -37,7 +37,7 @@ #include "media_manager/media_adapter_listener.h" namespace application_manager { - class ApplicationManager; +class ApplicationManager; } namespace threads { @@ -46,25 +46,23 @@ class Thread; namespace media_manager { class FromMicRecorderListener : public MediaAdapterListener { - public: - FromMicRecorderListener(const std::string& file_name, - application_manager::ApplicationManager &); - ~FromMicRecorderListener(); - virtual void OnDataReceived( - int32_t application_key, - const DataForListener& data); - virtual void OnErrorReceived( - int32_t application_key, - const DataForListener& data); - virtual void OnActivityStarted(int32_t application_key); - virtual void OnActivityEnded(int32_t application_key); + public: + FromMicRecorderListener(const std::string& file_name, + application_manager::ApplicationManager&); + ~FromMicRecorderListener(); + virtual void OnDataReceived(int32_t application_key, + const DataForListener& data); + virtual void OnErrorReceived(int32_t application_key, + const DataForListener& data); + virtual void OnActivityStarted(int32_t application_key); + virtual void OnActivityEnded(int32_t application_key); - private: - threads::Thread* reader_; - std::string file_name_; - int32_t current_application_; - application_manager::ApplicationManager& application_manager_; - DISALLOW_COPY_AND_ASSIGN(FromMicRecorderListener); + private: + threads::Thread* reader_; + std::string file_name_; + int32_t current_application_; + application_manager::ApplicationManager& application_manager_; + DISALLOW_COPY_AND_ASSIGN(FromMicRecorderListener); }; } // namespace media_manager diff --git a/src/components/media_manager/include/media_manager/audio/from_mic_to_file_recorder_thread.h b/src/components/media_manager/include/media_manager/audio/from_mic_to_file_recorder_thread.h index 7bb036fa42..f0c6d3c48f 100644 --- a/src/components/media_manager/include/media_manager/audio/from_mic_to_file_recorder_thread.h +++ b/src/components/media_manager/include/media_manager/audio/from_mic_to_file_recorder_thread.h @@ -44,53 +44,52 @@ namespace media_manager { class FromMicToFileRecorderThread : public threads::ThreadDelegate { - public: - FromMicToFileRecorderThread(const std::string& output_file, - int32_t duration); - ~FromMicToFileRecorderThread(); - void threadMain(); + public: + FromMicToFileRecorderThread(const std::string& output_file, int32_t duration); + ~FromMicToFileRecorderThread(); + void threadMain(); - void exitThreadMain(); + void exitThreadMain(); - void set_output_file(const std::string& output_file); - void set_record_duration(int32_t duration); + void set_output_file(const std::string& output_file); + void set_record_duration(int32_t duration); - private: - int32_t argc_; - gchar** argv_; + private: + int32_t argc_; + gchar** argv_; - const std::string oKey_; - const std::string tKey_; + const std::string oKey_; + const std::string tKey_; - static GMainLoop* loop; - threads::Thread* sleepThread_; - bool shouldBeStoped_; - sync_primitives::Lock stopFlagLock_; + static GMainLoop* loop; + threads::Thread* sleepThread_; + bool shouldBeStoped_; + sync_primitives::Lock stopFlagLock_; - std::string outputFileName_, durationString_; + std::string outputFileName_, durationString_; - typedef struct { - GstElement* pipeline; - gint duration; - } GstTimeout; + typedef struct { + GstElement* pipeline; + gint duration; + } GstTimeout; - void initArgs(); + void initArgs(); - void psleep(void* timeout); + void psleep(void* timeout); - class SleepThreadDelegate : public threads::ThreadDelegate { - public: - explicit SleepThreadDelegate(GstTimeout timeout); + class SleepThreadDelegate : public threads::ThreadDelegate { + public: + explicit SleepThreadDelegate(GstTimeout timeout); - void threadMain(); + void threadMain(); - private: - GstTimeout timeout_; + private: + GstTimeout timeout_; - DISALLOW_COPY_AND_ASSIGN(SleepThreadDelegate); - }; + DISALLOW_COPY_AND_ASSIGN(SleepThreadDelegate); + }; - DISALLOW_COPY_AND_ASSIGN(FromMicToFileRecorderThread); + DISALLOW_COPY_AND_ASSIGN(FromMicToFileRecorderThread); }; } // namespace media_manager diff --git a/src/components/media_manager/include/media_manager/audio/pipe_audio_streamer_adapter.h b/src/components/media_manager/include/media_manager/audio/pipe_audio_streamer_adapter.h index 3695235886..d0dbbebd38 100644 --- a/src/components/media_manager/include/media_manager/audio/pipe_audio_streamer_adapter.h +++ b/src/components/media_manager/include/media_manager/audio/pipe_audio_streamer_adapter.h @@ -39,9 +39,8 @@ namespace media_manager { class PipeAudioStreamerAdapter : public PipeStreamerAdapter { public: - PipeAudioStreamerAdapter( - const std::string& named_audio_pipe_path, - const std::string& app_storage_folder); + PipeAudioStreamerAdapter(const std::string& named_audio_pipe_path, + const std::string& app_storage_folder); ~PipeAudioStreamerAdapter(); }; diff --git a/src/components/media_manager/include/media_manager/audio/socket_audio_streamer_adapter.h b/src/components/media_manager/include/media_manager/audio/socket_audio_streamer_adapter.h index 77a58195f0..c0f3174496 100644 --- a/src/components/media_manager/include/media_manager/audio/socket_audio_streamer_adapter.h +++ b/src/components/media_manager/include/media_manager/audio/socket_audio_streamer_adapter.h @@ -39,8 +39,8 @@ namespace media_manager { class SocketAudioStreamerAdapter : public SocketStreamerAdapter { public: - SocketAudioStreamerAdapter( - const std::string& server_address, uint16_t audio_streaming_port); + SocketAudioStreamerAdapter(const std::string& server_address, + uint16_t audio_streaming_port); virtual ~SocketAudioStreamerAdapter(); }; diff --git a/src/components/media_manager/include/media_manager/file_streamer_adapter.h b/src/components/media_manager/include/media_manager/file_streamer_adapter.h index 52092a3616..293c6721ee 100644 --- a/src/components/media_manager/include/media_manager/file_streamer_adapter.h +++ b/src/components/media_manager/include/media_manager/file_streamer_adapter.h @@ -42,8 +42,8 @@ namespace media_manager { class FileStreamerAdapter : public StreamerAdapter { public: - FileStreamerAdapter( - const std::string& file_name, const std::string& app_storage_folder); + FileStreamerAdapter(const std::string& file_name, + const std::string& app_storage_folder); virtual ~FileStreamerAdapter(); protected: @@ -60,8 +60,8 @@ class FileStreamerAdapter : public StreamerAdapter { virtual bool Send(protocol_handler::RawMessagePtr msg); private: - std::string file_name_; - std::string app_storage_folder_; + std::string file_name_; + std::string app_storage_folder_; std::ofstream* file_stream_; }; }; diff --git a/src/components/media_manager/include/media_manager/media_adapter.h b/src/components/media_manager/include/media_manager/media_adapter.h index 73622ecd43..3fe05cae33 100644 --- a/src/components/media_manager/include/media_manager/media_adapter.h +++ b/src/components/media_manager/include/media_manager/media_adapter.h @@ -46,7 +46,9 @@ class MediaAdapter { virtual void StopActivity(int32_t application_key) = 0; virtual bool is_app_performing_activity(int32_t application_key) const = 0; - virtual ~MediaAdapter() { ;} + virtual ~MediaAdapter() { + ; + } }; } // namespace media_manager #endif // SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_MEDIA_ADAPTER_H_ diff --git a/src/components/media_manager/include/media_manager/media_adapter_impl.h b/src/components/media_manager/include/media_manager/media_adapter_impl.h index a3a296150b..75c48c98b7 100644 --- a/src/components/media_manager/include/media_manager/media_adapter_impl.h +++ b/src/components/media_manager/include/media_manager/media_adapter_impl.h @@ -43,18 +43,18 @@ namespace media_manager { typedef utils::SharedPtr<MediaAdapterListener> MediaListenerPtr; class MediaAdapterImpl : public MediaAdapter { - public: - virtual ~MediaAdapterImpl(); - virtual void AddListener(const MediaListenerPtr& listener); - virtual void RemoveListener(const MediaListenerPtr& listener); + public: + virtual ~MediaAdapterImpl(); + virtual void AddListener(const MediaListenerPtr& listener); + virtual void RemoveListener(const MediaListenerPtr& listener); - protected: - MediaAdapterImpl(); - std::set<MediaListenerPtr> media_listeners_; - int32_t current_application_; + protected: + MediaAdapterImpl(); + std::set<MediaListenerPtr> media_listeners_; + int32_t current_application_; - private: - DISALLOW_COPY_AND_ASSIGN(MediaAdapterImpl); + private: + DISALLOW_COPY_AND_ASSIGN(MediaAdapterImpl); }; typedef utils::SharedPtr<MediaAdapterImpl> MediaAdapterImplPtr; diff --git a/src/components/media_manager/include/media_manager/media_adapter_listener.h b/src/components/media_manager/include/media_manager/media_adapter_listener.h index 423d41c89b..37c3925199 100644 --- a/src/components/media_manager/include/media_manager/media_adapter_listener.h +++ b/src/components/media_manager/include/media_manager/media_adapter_listener.h @@ -40,17 +40,14 @@ namespace media_manager { typedef int32_t DataForListener; class MediaAdapterListener { - public: - virtual ~MediaAdapterListener() { - } - virtual void OnDataReceived( - int32_t application_key, - const DataForListener& data) = 0; - virtual void OnErrorReceived( - int32_t application_key, - const DataForListener& data) = 0; - virtual void OnActivityStarted(int32_t application_key) = 0; - virtual void OnActivityEnded(int32_t application_key) = 0; + public: + virtual ~MediaAdapterListener() {} + virtual void OnDataReceived(int32_t application_key, + const DataForListener& data) = 0; + virtual void OnErrorReceived(int32_t application_key, + const DataForListener& data) = 0; + virtual void OnActivityStarted(int32_t application_key) = 0; + virtual void OnActivityEnded(int32_t application_key) = 0; }; } // namespace media_manager #endif // SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_MEDIA_ADAPTER_LISTENER_H_ diff --git a/src/components/media_manager/include/media_manager/media_manager.h b/src/components/media_manager/include/media_manager/media_manager.h index f1fb50e384..53e3690c13 100644 --- a/src/components/media_manager/include/media_manager/media_manager.h +++ b/src/components/media_manager/include/media_manager/media_manager.h @@ -39,28 +39,28 @@ namespace media_manager { class MediaManager { - public: - virtual void PlayA2DPSource(int32_t application_key) = 0; - virtual void StopA2DPSource(int32_t application_key) = 0; + public: + virtual void PlayA2DPSource(int32_t application_key) = 0; + virtual void StopA2DPSource(int32_t application_key) = 0; - virtual void StartMicrophoneRecording(int32_t application_key, - const std::string& outputFileName, - int32_t duration) = 0; - virtual void StopMicrophoneRecording(int32_t application_key) = 0; + virtual void StartMicrophoneRecording(int32_t application_key, + const std::string& outputFileName, + int32_t duration) = 0; + virtual void StopMicrophoneRecording(int32_t application_key) = 0; - virtual void StartStreaming( - int32_t application_key, protocol_handler::ServiceType service_type) = 0; - virtual void StopStreaming( - int32_t application_key, protocol_handler::ServiceType service_type) = 0; - virtual void FramesProcessed(int32_t application_key, - int32_t frame_number) = 0; - /** - * \brief Media manager settings getter - * \return pointer to media manager settings class - */ - virtual const MediaManagerSettings& settings() const = 0; + virtual void StartStreaming(int32_t application_key, + protocol_handler::ServiceType service_type) = 0; + virtual void StopStreaming(int32_t application_key, + protocol_handler::ServiceType service_type) = 0; + virtual void FramesProcessed(int32_t application_key, + int32_t frame_number) = 0; + /** + * \brief Media manager settings getter + * \return pointer to media manager settings class + */ + virtual const MediaManagerSettings& settings() const = 0; - virtual ~MediaManager(){} + virtual ~MediaManager() {} }; } // namespace media_manager diff --git a/src/components/media_manager/include/media_manager/pipe_streamer_adapter.h b/src/components/media_manager/include/media_manager/pipe_streamer_adapter.h index 8a5a85605c..1e998ef82f 100644 --- a/src/components/media_manager/include/media_manager/pipe_streamer_adapter.h +++ b/src/components/media_manager/include/media_manager/pipe_streamer_adapter.h @@ -41,8 +41,8 @@ namespace media_manager { class PipeStreamerAdapter : public StreamerAdapter { public: - PipeStreamerAdapter( - const std::string& named_pipe_path, const std::string& app_storage_folder); + PipeStreamerAdapter(const std::string& named_pipe_path, + const std::string& app_storage_folder); virtual ~PipeStreamerAdapter(); protected: @@ -61,7 +61,7 @@ class PipeStreamerAdapter : public StreamerAdapter { private: std::string named_pipe_path_; std::string app_storage_folder_; - int32_t pipe_fd_; + int32_t pipe_fd_; }; }; diff --git a/src/components/media_manager/include/media_manager/socket_streamer_adapter.h b/src/components/media_manager/include/media_manager/socket_streamer_adapter.h index 960c2de6c0..45311b6077 100644 --- a/src/components/media_manager/include/media_manager/socket_streamer_adapter.h +++ b/src/components/media_manager/include/media_manager/socket_streamer_adapter.h @@ -62,12 +62,12 @@ class SocketStreamerAdapter : public StreamerAdapter { private: std::string ip_; - uint16_t port_; + uint16_t port_; std::string header_; - int32_t socket_fd_; - int32_t send_socket_fd_; - bool is_first_frame_; + int32_t socket_fd_; + int32_t send_socket_fd_; + bool is_first_frame_; }; }; diff --git a/src/components/media_manager/include/media_manager/streamer_adapter.h b/src/components/media_manager/include/media_manager/streamer_adapter.h index 81291bcfe1..30353b8d09 100644 --- a/src/components/media_manager/include/media_manager/streamer_adapter.h +++ b/src/components/media_manager/include/media_manager/streamer_adapter.h @@ -60,8 +60,7 @@ class StreamerAdapter : public MediaAdapterImpl { virtual void StopActivity(int32_t application_key); virtual void SendData(int32_t application_key, const ::protocol_handler::RawMessagePtr msg); - virtual bool is_app_performing_activity( - int32_t application_key) const; + virtual bool is_app_performing_activity(int32_t application_key) const; protected: // TODO(AN): APPLINK-15203 Use MessageLoopThread @@ -80,7 +79,7 @@ class StreamerAdapter : public MediaAdapterImpl { private: sync_primitives::atomic_bool stop_flag_; - StreamerAdapter* adapter_; + StreamerAdapter* adapter_; DISALLOW_COPY_AND_ASSIGN(Streamer); }; @@ -89,7 +88,7 @@ class StreamerAdapter : public MediaAdapterImpl { int32_t current_application_; utils::MessageQueue<protocol_handler::RawMessagePtr> messages_; - Streamer* streamer_; + Streamer* streamer_; threads::Thread* thread_; DISALLOW_COPY_AND_ASSIGN(StreamerAdapter); diff --git a/src/components/media_manager/include/media_manager/streamer_listener.h b/src/components/media_manager/include/media_manager/streamer_listener.h index 5b31400586..32ba167985 100644 --- a/src/components/media_manager/include/media_manager/streamer_listener.h +++ b/src/components/media_manager/include/media_manager/streamer_listener.h @@ -42,22 +42,20 @@ namespace media_manager { class MediaManager; class StreamerListener : public MediaAdapterListener { - public: - StreamerListener(MediaManager& media_manager); - ~StreamerListener(); - virtual void OnDataReceived( - int32_t application_key, - const DataForListener& data); - virtual void OnErrorReceived( - int32_t application_key, - const DataForListener& data); - virtual void OnActivityStarted(int32_t application_key); - virtual void OnActivityEnded(int32_t application_key); + public: + StreamerListener(MediaManager& media_manager); + ~StreamerListener(); + virtual void OnDataReceived(int32_t application_key, + const DataForListener& data); + virtual void OnErrorReceived(int32_t application_key, + const DataForListener& data); + virtual void OnActivityStarted(int32_t application_key); + virtual void OnActivityEnded(int32_t application_key); - private: - int32_t current_application_; - media_manager::MediaManager& media_manager_; - DISALLOW_COPY_AND_ASSIGN(StreamerListener); + private: + int32_t current_application_; + media_manager::MediaManager& media_manager_; + DISALLOW_COPY_AND_ASSIGN(StreamerListener); }; } // namespace media_manager diff --git a/src/components/media_manager/include/media_manager/video/file_video_streamer_adapter.h b/src/components/media_manager/include/media_manager/video/file_video_streamer_adapter.h index 13bb76ecaa..1677b5ad34 100644 --- a/src/components/media_manager/include/media_manager/video/file_video_streamer_adapter.h +++ b/src/components/media_manager/include/media_manager/video/file_video_streamer_adapter.h @@ -39,9 +39,8 @@ namespace media_manager { class FileVideoStreamerAdapter : public FileStreamerAdapter { public: - FileVideoStreamerAdapter( - const std::string& video_stream_file, - const std::string& app_storage_folder); + FileVideoStreamerAdapter(const std::string& video_stream_file, + const std::string& app_storage_folder); ~FileVideoStreamerAdapter(); }; diff --git a/src/components/media_manager/include/media_manager/video/pipe_video_streamer_adapter.h b/src/components/media_manager/include/media_manager/video/pipe_video_streamer_adapter.h index b961cad026..3bf5723572 100644 --- a/src/components/media_manager/include/media_manager/video/pipe_video_streamer_adapter.h +++ b/src/components/media_manager/include/media_manager/video/pipe_video_streamer_adapter.h @@ -39,9 +39,8 @@ namespace media_manager { class PipeVideoStreamerAdapter : public PipeStreamerAdapter { public: - PipeVideoStreamerAdapter( - const std::string& named_video_pipe_path, - const std::string& app_storage_folder); + PipeVideoStreamerAdapter(const std::string& named_video_pipe_path, + const std::string& app_storage_folder); ~PipeVideoStreamerAdapter(); }; diff --git a/src/components/media_manager/include/media_manager/video/socket_video_streamer_adapter.h b/src/components/media_manager/include/media_manager/video/socket_video_streamer_adapter.h index 04c5aa5cf7..ad5739bd5f 100644 --- a/src/components/media_manager/include/media_manager/video/socket_video_streamer_adapter.h +++ b/src/components/media_manager/include/media_manager/video/socket_video_streamer_adapter.h @@ -42,8 +42,8 @@ namespace media_manager { class SocketVideoStreamerAdapter : public SocketStreamerAdapter { public: - SocketVideoStreamerAdapter( - const std::string& server_address, uint16_t video_streaming_port); + SocketVideoStreamerAdapter(const std::string& server_address, + uint16_t video_streaming_port); virtual ~SocketVideoStreamerAdapter(); }; diff --git a/src/components/media_manager/src/audio/file_audio_streamer_adapter.cc b/src/components/media_manager/src/audio/file_audio_streamer_adapter.cc index 26c1c2f8e1..f632fa81af 100644 --- a/src/components/media_manager/src/audio/file_audio_streamer_adapter.cc +++ b/src/components/media_manager/src/audio/file_audio_streamer_adapter.cc @@ -35,12 +35,9 @@ namespace media_manager { FileAudioStreamerAdapter::FileAudioStreamerAdapter( - const std::string& audio_stream_file, - const std::string& app_storage_folder) - : FileStreamerAdapter(audio_stream_file, app_storage_folder) { -} + const std::string& audio_stream_file, const std::string& app_storage_folder) + : FileStreamerAdapter(audio_stream_file, app_storage_folder) {} -FileAudioStreamerAdapter::~FileAudioStreamerAdapter() { -} +FileAudioStreamerAdapter::~FileAudioStreamerAdapter() {} } // namespace media_manager diff --git a/src/components/media_manager/src/audio/from_mic_recorder_adapter.cc b/src/components/media_manager/src/audio/from_mic_recorder_adapter.cc index 4a2f9ff618..d9735fcbbc 100644 --- a/src/components/media_manager/src/audio/from_mic_recorder_adapter.cc +++ b/src/components/media_manager/src/audio/from_mic_recorder_adapter.cc @@ -41,12 +41,10 @@ namespace media_manager { CREATE_LOGGERPTR_GLOBAL(logger_, "MediaManager") FromMicRecorderAdapter::FromMicRecorderAdapter() - : recorder_thread_(NULL) - , output_file_("default_recorded_audio.wav") - , kDefaultDuration(1000) - , duration_(kDefaultDuration) { - -} + : recorder_thread_(NULL) + , output_file_("default_recorded_audio.wav") + , kDefaultDuration(1000) + , duration_(kDefaultDuration) {} FromMicRecorderAdapter::~FromMicRecorderAdapter() { LOG4CXX_AUTO_TRACE(logger_); @@ -60,18 +58,16 @@ FromMicRecorderAdapter::~FromMicRecorderAdapter() { void FromMicRecorderAdapter::StartActivity(int32_t application_key) { LOG4CXX_DEBUG(logger_, "Start with app " << application_key); if (application_key == current_application_) { - LOG4CXX_WARN(logger_, "Running recording from mic for " - << current_application_); + LOG4CXX_WARN(logger_, + "Running recording from mic for " << current_application_); return; } -// Todd: No gstreamer recorder thread + // Todd: No gstreamer recorder thread if (!recorder_thread_) { FromMicToFileRecorderThread* thread_delegate = - new FromMicToFileRecorderThread( - output_file_, duration_); - recorder_thread_ = threads::CreateThread("MicrophoneRec", - thread_delegate); + new FromMicToFileRecorderThread(output_file_, duration_); + recorder_thread_ = threads::CreateThread("MicrophoneRec", thread_delegate); } if (NULL != recorder_thread_) { @@ -81,11 +77,11 @@ void FromMicRecorderAdapter::StartActivity(int32_t application_key) { } void FromMicRecorderAdapter::StopActivity(int32_t application_key) { - LOG4CXX_INFO(logger_, "FromMicRecorderAdapter::StopActivity " - << application_key); + LOG4CXX_INFO(logger_, + "FromMicRecorderAdapter::StopActivity " << application_key); if (application_key != current_application_) { - LOG4CXX_WARN(logger_, "Running activity on other app key " - << current_application_); + LOG4CXX_WARN(logger_, + "Running activity on other app key " << current_application_); return; } diff --git a/src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc b/src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc index 7e155fcb21..0239795d75 100644 --- a/src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc +++ b/src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc @@ -42,14 +42,14 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "MediaManager") GMainLoop* FromMicToFileRecorderThread::loop = NULL; FromMicToFileRecorderThread::FromMicToFileRecorderThread( - const std::string& output_file, int32_t duration) - : threads::ThreadDelegate(), - argc_(5), - argv_(NULL), - oKey_("-o"), - tKey_("-t"), - sleepThread_(NULL), - outputFileName_(output_file) { + const std::string& output_file, int32_t duration) + : threads::ThreadDelegate() + , argc_(5) + , argv_(NULL) + , oKey_("-o") + , tKey_("-t") + , sleepThread_(NULL) + , outputFileName_(output_file) { LOG4CXX_AUTO_TRACE(logger_); set_record_duration(duration); } @@ -64,7 +64,7 @@ FromMicToFileRecorderThread::~FromMicToFileRecorderThread() { } void FromMicToFileRecorderThread::set_output_file( - const std::string& output_file) { + const std::string& output_file) { LOG4CXX_AUTO_TRACE(logger_); outputFileName_ = output_file; } @@ -80,7 +80,7 @@ void FromMicToFileRecorderThread::set_record_duration(int32_t duration) { void FromMicToFileRecorderThread::initArgs() { LOG4CXX_AUTO_TRACE(logger_); - argv_ = new gchar*[argc_]; + argv_ = new gchar* [argc_]; argv_[0] = new gchar[14]; argv_[1] = new gchar[3]; @@ -114,20 +114,29 @@ void FromMicToFileRecorderThread::threadMain() { gint duration = -1; GOptionContext* context = NULL; GError* err = NULL; - GOptionEntry entries[] = { { - "device", 'd', 0, G_OPTION_ARG_FILENAME, &device, - "device file (Default: hw:0,0)", "SRC" - }, { - "output", 'o', 0, G_OPTION_ARG_FILENAME, &outfile, - "save output of the stream to DEST", "DEST" - }, { - "duration", 't', 0, G_OPTION_ARG_INT, &duration, - "length of time in seconds to capture", "int32_t" - }, { - NULL - } - }; -#ifndef GLIB_VERSION_2_32 // g_thread_init() does nothing since 2.32 + GOptionEntry entries[] = {{"device", + 'd', + 0, + G_OPTION_ARG_FILENAME, + &device, + "device file (Default: hw:0,0)", + "SRC"}, + {"output", + 'o', + 0, + G_OPTION_ARG_FILENAME, + &outfile, + "save output of the stream to DEST", + "DEST"}, + {"duration", + 't', + 0, + G_OPTION_ARG_INT, + &duration, + "length of time in seconds to capture", + "int32_t"}, + {NULL}}; +#ifndef GLIB_VERSION_2_32 // g_thread_init() does nothing since 2.32 if (!g_thread_supported()) { g_thread_init(NULL); } @@ -156,10 +165,10 @@ void FromMicToFileRecorderThread::threadMain() { // Set up error handling bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline)); - gst_bus_add_watch(bus, - reinterpret_cast<int32_t (*)(_GstBus*, _GstMessage*, void*)> - (recvmsg), - NULL); + gst_bus_add_watch( + bus, + reinterpret_cast<int32_t (*)(_GstBus*, _GstMessage*, void*)>(recvmsg), + NULL); gst_object_unref(bus); // Create all of the elements to be added to the pipeline @@ -199,7 +208,7 @@ void FromMicToFileRecorderThread::threadMain() { g_option_context_free(context); if (argv_) { - delete [] argv_; + delete[] argv_; argv_ = NULL; } return; @@ -213,7 +222,8 @@ void FromMicToFileRecorderThread::threadMain() { timeout.pipeline = pipeline; timeout.duration = duration; - sleepThread_ = threads::CreateThread("SleepThread", new SleepThreadDelegate(timeout)); + sleepThread_ = + threads::CreateThread("SleepThread", new SleepThreadDelegate(timeout)); sleepThread_->start(); } @@ -229,18 +239,16 @@ void FromMicToFileRecorderThread::threadMain() { g_option_context_free(context); if (argv_) { - delete [] argv_; + delete[] argv_; argv_ = NULL; } loop = NULL; } -FromMicToFileRecorderThread::SleepThreadDelegate::SleepThreadDelegate(GstTimeout - timeout) - : threads::ThreadDelegate(), - timeout_(timeout) { -} +FromMicToFileRecorderThread::SleepThreadDelegate::SleepThreadDelegate( + GstTimeout timeout) + : threads::ThreadDelegate(), timeout_(timeout) {} void FromMicToFileRecorderThread::SleepThreadDelegate::threadMain() { LOG4CXX_TRACE(logger_, "Sleep for " << timeout_.duration << " seconds"); diff --git a/src/components/media_manager/src/audio/pipe_audio_streamer_adapter.cc b/src/components/media_manager/src/audio/pipe_audio_streamer_adapter.cc index 9791fbd910..2220c08b26 100644 --- a/src/components/media_manager/src/audio/pipe_audio_streamer_adapter.cc +++ b/src/components/media_manager/src/audio/pipe_audio_streamer_adapter.cc @@ -37,10 +37,8 @@ namespace media_manager { PipeAudioStreamerAdapter::PipeAudioStreamerAdapter( const std::string& named_audio_pipe_path, const std::string& app_storage_folder) - : PipeStreamerAdapter(named_audio_pipe_path, app_storage_folder) { -} + : PipeStreamerAdapter(named_audio_pipe_path, app_storage_folder) {} -PipeAudioStreamerAdapter::~PipeAudioStreamerAdapter() { -} +PipeAudioStreamerAdapter::~PipeAudioStreamerAdapter() {} } // namespace media_manager diff --git a/src/components/media_manager/src/audio/socket_audio_streamer_adapter.cc b/src/components/media_manager/src/audio/socket_audio_streamer_adapter.cc index 465e0b133e..429fab01b3 100644 --- a/src/components/media_manager/src/audio/socket_audio_streamer_adapter.cc +++ b/src/components/media_manager/src/audio/socket_audio_streamer_adapter.cc @@ -34,21 +34,20 @@ #include "media_manager/audio/socket_audio_streamer_adapter.h" namespace { - const std::string kHeader = "HTTP/1.1 200 OK\r\n" - "Connection: Keep-Alive\r\n" - "Keep-Alive: timeout=15, max=300\r\n" - "Server: SDL\r\n" - "Content-Type: video/mp4\r\n\r\n"; +const std::string kHeader = + "HTTP/1.1 200 OK\r\n" + "Connection: Keep-Alive\r\n" + "Keep-Alive: timeout=15, max=300\r\n" + "Server: SDL\r\n" + "Content-Type: video/mp4\r\n\r\n"; } namespace media_manager { SocketAudioStreamerAdapter::SocketAudioStreamerAdapter( const std::string& server_address, uint16_t audio_streaming_port) - : SocketStreamerAdapter(server_address, audio_streaming_port, kHeader) { -} + : SocketStreamerAdapter(server_address, audio_streaming_port, kHeader) {} -SocketAudioStreamerAdapter::~SocketAudioStreamerAdapter() { -} +SocketAudioStreamerAdapter::~SocketAudioStreamerAdapter() {} } // namespace media_manager diff --git a/src/components/media_manager/src/file_streamer_adapter.cc b/src/components/media_manager/src/file_streamer_adapter.cc index 6105fe0356..3418f7d963 100644 --- a/src/components/media_manager/src/file_streamer_adapter.cc +++ b/src/components/media_manager/src/file_streamer_adapter.cc @@ -38,26 +38,22 @@ namespace media_manager { CREATE_LOGGERPTR_GLOBAL(logger_, "FileStreamerAdapter") -FileStreamerAdapter::FileStreamerAdapter( - const std::string& file_name, const std::string& app_storage_folder) - : StreamerAdapter(new FileStreamer(this, file_name, app_storage_folder)) { -} +FileStreamerAdapter::FileStreamerAdapter(const std::string& file_name, + const std::string& app_storage_folder) + : StreamerAdapter(new FileStreamer(this, file_name, app_storage_folder)) {} -FileStreamerAdapter::~FileStreamerAdapter() { -} +FileStreamerAdapter::~FileStreamerAdapter() {} FileStreamerAdapter::FileStreamer::FileStreamer( FileStreamerAdapter* const adapter, const std::string& file_name, const std::string& app_storage_folder) - : Streamer(adapter), - file_name_(file_name), - app_storage_folder_(app_storage_folder), - file_stream_(NULL) { -} + : Streamer(adapter) + , file_name_(file_name) + , app_storage_folder_(app_storage_folder) + , file_stream_(NULL) {} -FileStreamerAdapter::FileStreamer::~FileStreamer() { -} +FileStreamerAdapter::FileStreamer::~FileStreamer() {} bool FileStreamerAdapter::FileStreamer::Connect() { LOG4CXX_AUTO_TRACE(logger_); @@ -68,13 +64,11 @@ bool FileStreamerAdapter::FileStreamer::Connect() { file_stream_ = file_system::Open(file_name_); if (!file_stream_) { - LOG4CXX_ERROR(logger_, "Cannot open file stream " - << file_name_); + LOG4CXX_ERROR(logger_, "Cannot open file stream " << file_name_); return false; } - LOG4CXX_INFO(logger_, "File " << file_name_ - << " was successfuly opened"); + LOG4CXX_INFO(logger_, "File " << file_name_ << " was successfuly opened"); return true; } @@ -92,15 +86,12 @@ bool FileStreamerAdapter::FileStreamer::Send( protocol_handler::RawMessagePtr msg) { LOG4CXX_AUTO_TRACE(logger_); if (!file_stream_) { - LOG4CXX_ERROR(logger_, "File stream not found " - << file_name_); + LOG4CXX_ERROR(logger_, "File stream not found " << file_name_); return false; } - if (!file_system::Write(file_stream_, msg->data(), - msg->data_size())) { - LOG4CXX_ERROR(logger_, "Failed writing data to file " - << file_name_); + if (!file_system::Write(file_stream_, msg->data(), msg->data_size())) { + LOG4CXX_ERROR(logger_, "Failed writing data to file " << file_name_); return false; } diff --git a/src/components/media_manager/src/media_adapter_impl.cc b/src/components/media_manager/src/media_adapter_impl.cc index 7d8cfb9059..cf15a7af97 100644 --- a/src/components/media_manager/src/media_adapter_impl.cc +++ b/src/components/media_manager/src/media_adapter_impl.cc @@ -37,9 +37,7 @@ namespace media_manager { CREATE_LOGGERPTR_GLOBAL(logger_, "MediaManager") -MediaAdapterImpl::MediaAdapterImpl() - : current_application_(0) { -} +MediaAdapterImpl::MediaAdapterImpl() : current_application_(0) {} MediaAdapterImpl::~MediaAdapterImpl() { media_listeners_.clear(); diff --git a/src/components/media_manager/src/pipe_streamer_adapter.cc b/src/components/media_manager/src/pipe_streamer_adapter.cc index 07ca407386..8bf14a546e 100644 --- a/src/components/media_manager/src/pipe_streamer_adapter.cc +++ b/src/components/media_manager/src/pipe_streamer_adapter.cc @@ -42,57 +42,55 @@ namespace media_manager { CREATE_LOGGERPTR_GLOBAL(logger_, "PipeStreamerAdapter") -PipeStreamerAdapter::PipeStreamerAdapter( - const std::string& named_pipe_path, const std::string& app_storage_folder) - : StreamerAdapter(new PipeStreamer(this, named_pipe_path, app_storage_folder)) { -} +PipeStreamerAdapter::PipeStreamerAdapter(const std::string& named_pipe_path, + const std::string& app_storage_folder) + : StreamerAdapter( + new PipeStreamer(this, named_pipe_path, app_storage_folder)) {} -PipeStreamerAdapter::~PipeStreamerAdapter() { -} +PipeStreamerAdapter::~PipeStreamerAdapter() {} PipeStreamerAdapter::PipeStreamer::PipeStreamer( PipeStreamerAdapter* const adapter, const std::string& named_pipe_path, const std::string& app_storage_folder) - : Streamer(adapter), - named_pipe_path_(named_pipe_path), - app_storage_folder_(app_storage_folder), - pipe_fd_(0) { - if (!file_system::CreateDirectoryRecursively(app_storage_folder_)) { - LOG4CXX_ERROR(logger_, "Cannot create app storage folder " - << app_storage_folder_ ); - return; - } - if ((mkfifo(named_pipe_path_.c_str(), - S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH) < 0) - && (errno != EEXIST)) { - LOG4CXX_ERROR(logger_, "Cannot create pipe " << named_pipe_path_); - } else { - LOG4CXX_INFO(logger_, "Pipe " << named_pipe_path_ - << " was successfully created"); - } + : Streamer(adapter) + , named_pipe_path_(named_pipe_path) + , app_storage_folder_(app_storage_folder) + , pipe_fd_(0) { + if (!file_system::CreateDirectoryRecursively(app_storage_folder_)) { + LOG4CXX_ERROR(logger_, + "Cannot create app storage folder " << app_storage_folder_); + return; + } + if ((mkfifo(named_pipe_path_.c_str(), S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH) < + 0) && + (errno != EEXIST)) { + LOG4CXX_ERROR(logger_, "Cannot create pipe " << named_pipe_path_); + } else { + LOG4CXX_INFO(logger_, + "Pipe " << named_pipe_path_ << " was successfully created"); + } } PipeStreamerAdapter::PipeStreamer::~PipeStreamer() { - if (0 == unlink(named_pipe_path_.c_str()) ) { + if (0 == unlink(named_pipe_path_.c_str())) { LOG4CXX_INFO(logger_, "Pipe " << named_pipe_path_ << " was removed"); } else { LOG4CXX_ERROR(logger_, "Error removing pipe " << named_pipe_path_); } } - bool PipeStreamerAdapter::PipeStreamer::Connect() { LOG4CXX_AUTO_TRACE(logger_); pipe_fd_ = open(named_pipe_path_.c_str(), O_RDWR, 0); if (-1 == pipe_fd_) { - LOG4CXX_ERROR(logger_, "Cannot open pipe for writing " - << named_pipe_path_); + LOG4CXX_ERROR(logger_, "Cannot open pipe for writing " << named_pipe_path_); return false; } - LOG4CXX_INFO(logger_, "Pipe " << named_pipe_path_ - << " was successfuly opened for writing"); + LOG4CXX_INFO(logger_, + "Pipe " << named_pipe_path_ + << " was successfuly opened for writing"); return true; } @@ -110,14 +108,13 @@ bool PipeStreamerAdapter::PipeStreamer::Send( LOG4CXX_AUTO_TRACE(logger_); ssize_t ret = write(pipe_fd_, msg->data(), msg->data_size()); if (-1 == ret) { - LOG4CXX_ERROR(logger_, "Failed writing data to pipe " - << named_pipe_path_); + LOG4CXX_ERROR(logger_, "Failed writing data to pipe " << named_pipe_path_); return false; } if (static_cast<uint32_t>(ret) != msg->data_size()) { - LOG4CXX_WARN(logger_, "Couldn't write all the data to pipe " - << named_pipe_path_); + LOG4CXX_WARN(logger_, + "Couldn't write all the data to pipe " << named_pipe_path_); } LOG4CXX_INFO(logger_, "Streamer::sent " << msg->data_size()); diff --git a/src/components/media_manager/src/socket_streamer_adapter.cc b/src/components/media_manager/src/socket_streamer_adapter.cc index 25164de30b..2bb0fe10ec 100644 --- a/src/components/media_manager/src/socket_streamer_adapter.cc +++ b/src/components/media_manager/src/socket_streamer_adapter.cc @@ -44,32 +44,27 @@ namespace media_manager { CREATE_LOGGERPTR_GLOBAL(logger, "SocketStreamerAdapter") -SocketStreamerAdapter::SocketStreamerAdapter( - const std::string& ip, - const uint16_t port, - const std::string& header) - : StreamerAdapter(new SocketStreamer(this, ip, port, header)) { -} +SocketStreamerAdapter::SocketStreamerAdapter(const std::string& ip, + const uint16_t port, + const std::string& header) + : StreamerAdapter(new SocketStreamer(this, ip, port, header)) {} -SocketStreamerAdapter::~SocketStreamerAdapter() { -} +SocketStreamerAdapter::~SocketStreamerAdapter() {} SocketStreamerAdapter::SocketStreamer::SocketStreamer( SocketStreamerAdapter* const adapter, const std::string& ip, const uint16_t port, const std::string& header) - : Streamer(adapter), - ip_(ip), - port_(port), - header_(header), - socket_fd_(0), - send_socket_fd_(0), - is_first_frame_(true) { -} + : Streamer(adapter) + , ip_(ip) + , port_(port) + , header_(header) + , socket_fd_(0) + , send_socket_fd_(0) + , is_first_frame_(true) {} -SocketStreamerAdapter::SocketStreamer::~SocketStreamer() { -} +SocketStreamerAdapter::SocketStreamer::~SocketStreamer() {} bool SocketStreamerAdapter::SocketStreamer::Connect() { LOG4CXX_AUTO_TRACE(logger); @@ -80,13 +75,13 @@ bool SocketStreamerAdapter::SocketStreamer::Connect() { } int32_t optval = 1; - if (-1 == setsockopt(socket_fd_, SOL_SOCKET, SO_REUSEADDR, - &optval, sizeof optval)) { + if (-1 == setsockopt( + socket_fd_, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof optval)) { LOG4CXX_ERROR(logger, "Unable to set sockopt"); return false; } - struct sockaddr_in serv_addr_ = { 0 }; + struct sockaddr_in serv_addr_ = {0}; serv_addr_.sin_addr.s_addr = inet_addr(ip_.c_str()); serv_addr_.sin_family = AF_INET; serv_addr_.sin_port = htons(port_); @@ -128,8 +123,7 @@ bool SocketStreamerAdapter::SocketStreamer::Send( LOG4CXX_AUTO_TRACE(logger); ssize_t ret; if (is_first_frame_) { - ret = send(send_socket_fd_, header_.c_str(), - header_.size(), MSG_NOSIGNAL); + ret = send(send_socket_fd_, header_.c_str(), header_.size(), MSG_NOSIGNAL); if (static_cast<uint32_t>(ret) != header_.size()) { LOG4CXX_ERROR(logger, "Unable to send data to socket"); return false; @@ -137,16 +131,15 @@ bool SocketStreamerAdapter::SocketStreamer::Send( is_first_frame_ = false; } - ret = send(send_socket_fd_, msg->data(), - msg->data_size(), MSG_NOSIGNAL); + ret = send(send_socket_fd_, msg->data(), msg->data_size(), MSG_NOSIGNAL); if (-1 == ret) { LOG4CXX_ERROR(logger, "Unable to send data to socket"); return false; } if (static_cast<uint32_t>(ret) != msg->data_size()) { - LOG4CXX_WARN(logger, "Couldn't send all the data to socket " - << send_socket_fd_); + LOG4CXX_WARN(logger, + "Couldn't send all the data to socket " << send_socket_fd_); } LOG4CXX_INFO(logger, "Streamer::sent " << msg->data_size()); diff --git a/src/components/media_manager/src/streamer_adapter.cc b/src/components/media_manager/src/streamer_adapter.cc index 3246744ba9..44f46d92b2 100644 --- a/src/components/media_manager/src/streamer_adapter.cc +++ b/src/components/media_manager/src/streamer_adapter.cc @@ -38,10 +38,7 @@ namespace media_manager { CREATE_LOGGERPTR_GLOBAL(logger, "StreamerAdapter") StreamerAdapter::StreamerAdapter(Streamer* const streamer) - : current_application_(0), - messages_(), - streamer_(streamer), - thread_(NULL) { + : current_application_(0), messages_(), streamer_(streamer), thread_(NULL) { DCHECK(streamer_); thread_ = threads::CreateThread("StreamerAdapter", streamer_); } @@ -55,8 +52,9 @@ StreamerAdapter::~StreamerAdapter() { void StreamerAdapter::StartActivity(int32_t application_key) { LOG4CXX_AUTO_TRACE(logger); if (is_app_performing_activity(application_key)) { - LOG4CXX_WARN(logger, "Activity for application: " - << application_key << " has been already started"); + LOG4CXX_WARN(logger, + "Activity for application: " << application_key + << " has been already started"); return; } messages_.Reset(); @@ -76,8 +74,9 @@ void StreamerAdapter::StartActivity(int32_t application_key) { void StreamerAdapter::StopActivity(int32_t application_key) { LOG4CXX_AUTO_TRACE(logger); if (!is_app_performing_activity(application_key)) { - LOG4CXX_WARN(logger, "Activity for application: " - << application_key << " has not been started"); + LOG4CXX_WARN(logger, + "Activity for application: " << application_key + << " has not been started"); return; } @@ -96,8 +95,9 @@ void StreamerAdapter::SendData(int32_t application_key, const ::protocol_handler::RawMessagePtr msg) { LOG4CXX_AUTO_TRACE(logger); if (!is_app_performing_activity(application_key)) { - LOG4CXX_ERROR(logger, "Activity for application: " - << application_key << " has not been started"); + LOG4CXX_ERROR(logger, + "Activity for application: " << application_key + << " has not been started"); return; } messages_.push(msg); @@ -109,13 +109,11 @@ bool StreamerAdapter::is_app_performing_activity( } StreamerAdapter::Streamer::Streamer(StreamerAdapter* const adapter) - : stop_flag_(false), - adapter_(adapter) { + : stop_flag_(false), adapter_(adapter) { DCHECK(adapter_); } -StreamerAdapter::Streamer::~Streamer() { -} +StreamerAdapter::Streamer::~Streamer() {} void StreamerAdapter::Streamer::threadMain() { LOG4CXX_AUTO_TRACE(logger); @@ -148,11 +146,12 @@ void StreamerAdapter::Streamer::threadMain() { static int32_t messages_for_session = 0; ++messages_for_session; - LOG4CXX_DEBUG(logger, "Handling map streaming message. This is " - << messages_for_session << " message for " - << adapter_->current_application_); - std::set<MediaListenerPtr>::iterator it = adapter_->media_listeners_ - .begin(); + LOG4CXX_DEBUG(logger, + "Handling map streaming message. This is " + << messages_for_session << " message for " + << adapter_->current_application_); + std::set<MediaListenerPtr>::iterator it = + adapter_->media_listeners_.begin(); for (; adapter_->media_listeners_.end() != it; ++it) { (*it)->OnDataReceived(adapter_->current_application_, messages_for_session); diff --git a/src/components/media_manager/src/streamer_listener.cc b/src/components/media_manager/src/streamer_listener.cc index 97f3c5300f..2d6c3bc984 100644 --- a/src/components/media_manager/src/streamer_listener.cc +++ b/src/components/media_manager/src/streamer_listener.cc @@ -39,31 +39,27 @@ namespace media_manager { CREATE_LOGGERPTR_GLOBAL(logger_, "MediaManager") StreamerListener::StreamerListener(MediaManager& media_manager) - : current_application_(0), - media_manager_(media_manager) { -} + : current_application_(0), media_manager_(media_manager) {} StreamerListener::~StreamerListener() { OnActivityEnded(current_application_); } -void StreamerListener::OnDataReceived( - int32_t application_key, - const DataForListener& data) { +void StreamerListener::OnDataReceived(int32_t application_key, + const DataForListener& data) { media_manager_.FramesProcessed(application_key, data); } -void StreamerListener::OnErrorReceived( - int32_t application_key, - const DataForListener& data) { +void StreamerListener::OnErrorReceived(int32_t application_key, + const DataForListener& data) { LOG4CXX_AUTO_TRACE(logger_); } void StreamerListener::OnActivityStarted(int32_t application_key) { LOG4CXX_AUTO_TRACE(logger_); if (current_application_ == application_key) { - LOG4CXX_WARN(logger_, "Already performing activity for " - << application_key); + LOG4CXX_WARN(logger_, + "Already performing activity for " << application_key); return; } current_application_ = application_key; @@ -72,8 +68,8 @@ void StreamerListener::OnActivityStarted(int32_t application_key) { void StreamerListener::OnActivityEnded(int32_t application_key) { LOG4CXX_AUTO_TRACE(logger_); if (current_application_ != application_key) { - LOG4CXX_WARN(logger_, "Already not performing activity for " - << application_key); + LOG4CXX_WARN(logger_, + "Already not performing activity for " << application_key); return; } current_application_ = 0; diff --git a/src/components/media_manager/src/video/file_video_streamer_adapter.cc b/src/components/media_manager/src/video/file_video_streamer_adapter.cc index 8674a406fb..f9e4d58a0e 100644 --- a/src/components/media_manager/src/video/file_video_streamer_adapter.cc +++ b/src/components/media_manager/src/video/file_video_streamer_adapter.cc @@ -35,12 +35,9 @@ namespace media_manager { FileVideoStreamerAdapter::FileVideoStreamerAdapter( - const std::string& video_stream_file, - const std::string& app_storage_folder) - : FileStreamerAdapter(video_stream_file, app_storage_folder) { -} + const std::string& video_stream_file, const std::string& app_storage_folder) + : FileStreamerAdapter(video_stream_file, app_storage_folder) {} -FileVideoStreamerAdapter::~FileVideoStreamerAdapter() { -} +FileVideoStreamerAdapter::~FileVideoStreamerAdapter() {} } // namespace media_manager diff --git a/src/components/media_manager/src/video/pipe_video_streamer_adapter.cc b/src/components/media_manager/src/video/pipe_video_streamer_adapter.cc index 0ced20f9e9..cf1a6fb347 100644 --- a/src/components/media_manager/src/video/pipe_video_streamer_adapter.cc +++ b/src/components/media_manager/src/video/pipe_video_streamer_adapter.cc @@ -37,10 +37,8 @@ namespace media_manager { PipeVideoStreamerAdapter::PipeVideoStreamerAdapter( const std::string& named_video_pipe_path, const std::string& app_storage_folder) - : PipeStreamerAdapter(named_video_pipe_path, app_storage_folder) { -} + : PipeStreamerAdapter(named_video_pipe_path, app_storage_folder) {} -PipeVideoStreamerAdapter::~PipeVideoStreamerAdapter() { -} +PipeVideoStreamerAdapter::~PipeVideoStreamerAdapter() {} } // namespace media_manager diff --git a/src/components/media_manager/src/video/socket_video_streamer_adapter.cc b/src/components/media_manager/src/video/socket_video_streamer_adapter.cc index a6cf14e032..12ae93da69 100644 --- a/src/components/media_manager/src/video/socket_video_streamer_adapter.cc +++ b/src/components/media_manager/src/video/socket_video_streamer_adapter.cc @@ -33,19 +33,20 @@ #include "media_manager/video/socket_video_streamer_adapter.h" namespace { - const std::string kHeader = "HTTP/1.1 200 OK\r\n" - "Connection: Keep-Alive\r\n" - "Keep-Alive: timeout=15, max=300\r\n" - "Server: SDL\r\n" - "Content-Type: video/mp4\r\n\r\n"; +const std::string kHeader = + "HTTP/1.1 200 OK\r\n" + "Connection: Keep-Alive\r\n" + "Keep-Alive: timeout=15, max=300\r\n" + "Server: SDL\r\n" + "Content-Type: video/mp4\r\n\r\n"; } namespace media_manager { -SocketVideoStreamerAdapter::SocketVideoStreamerAdapter(const std::string& server_address, uint16_t video_streaming_port) +SocketVideoStreamerAdapter::SocketVideoStreamerAdapter( + const std::string& server_address, uint16_t video_streaming_port) : SocketStreamerAdapter(server_address, video_streaming_port, kHeader) {} -SocketVideoStreamerAdapter::~SocketVideoStreamerAdapter() { -} +SocketVideoStreamerAdapter::~SocketVideoStreamerAdapter() {} } // namespace media_manager diff --git a/src/components/media_manager/src/video/video_stream_to_file_adapter.cc b/src/components/media_manager/src/video/video_stream_to_file_adapter.cc index 8ca547ed10..f41954b117 100644 --- a/src/components/media_manager/src/video/video_stream_to_file_adapter.cc +++ b/src/components/media_manager/src/video/video_stream_to_file_adapter.cc @@ -40,16 +40,15 @@ namespace media_manager { CREATE_LOGGERPTR_GLOBAL(logger, "VideoStreamToFileAdapter") VideoStreamToFileAdapter::VideoStreamToFileAdapter(const std::string& file_name) - : file_name_(file_name), - is_ready_(false), - thread_(threads::CreateThread("VideoStreamer", - new Streamer(this))) { + : file_name_(file_name) + , is_ready_(false) + , thread_(threads::CreateThread("VideoStreamer", new Streamer(this))) { Init(); } VideoStreamToFileAdapter::~VideoStreamToFileAdapter() { LOG4CXX_AUTO_TRACE(logger); - if ((0 != current_application_ ) && (is_ready_)) { + if ((0 != current_application_) && (is_ready_)) { StopActivity(current_application_); } thread_->join(); @@ -68,10 +67,9 @@ void VideoStreamToFileAdapter::Init() { } void VideoStreamToFileAdapter::SendData( - int32_t application_key, - const ::protocol_handler::RawMessagePtr message) { - LOG4CXX_INFO(logger, "VideoStreamToFileAdapter::SendData " - << application_key); + int32_t application_key, const ::protocol_handler::RawMessagePtr message) { + LOG4CXX_INFO(logger, + "VideoStreamToFileAdapter::SendData " << application_key); if (application_key != current_application_) { LOG4CXX_WARN(logger, "Wrong application " << application_key); @@ -84,11 +82,11 @@ void VideoStreamToFileAdapter::SendData( } void VideoStreamToFileAdapter::StartActivity(int32_t application_key) { - LOG4CXX_INFO(logger, "VideoStreamToFileAdapter::StartActivity " - << application_key); + LOG4CXX_INFO(logger, + "VideoStreamToFileAdapter::StartActivity " << application_key); if (application_key == current_application_) { - LOG4CXX_WARN(logger, "Already running video stream to file for " - << application_key); + LOG4CXX_WARN( + logger, "Already running video stream to file for " << application_key); return; } @@ -103,11 +101,11 @@ void VideoStreamToFileAdapter::StartActivity(int32_t application_key) { } void VideoStreamToFileAdapter::StopActivity(int32_t application_key) { - LOG4CXX_INFO(logger, "VideoStreamToFileAdapter::StopActivity " - << application_key); + LOG4CXX_INFO(logger, + "VideoStreamToFileAdapter::StopActivity " << application_key); if (application_key != current_application_) { - LOG4CXX_WARN(logger, "Performing activity for another key " - << current_application_); + LOG4CXX_WARN( + logger, "Performing activity for another key " << current_application_); return; } @@ -121,17 +119,13 @@ void VideoStreamToFileAdapter::StopActivity(int32_t application_key) { } } -bool VideoStreamToFileAdapter::is_app_performing_activity(int32_t - application_key) { +bool VideoStreamToFileAdapter::is_app_performing_activity( + int32_t application_key) { return (application_key == current_application_ && is_ready_); } -VideoStreamToFileAdapter::Streamer::Streamer( - VideoStreamToFileAdapter* server) - : server_(server), - stop_flag_(false), - file_stream_(NULL) { -} +VideoStreamToFileAdapter::Streamer::Streamer(VideoStreamToFileAdapter* server) + : server_(server), stop_flag_(false), file_stream_(NULL) {} VideoStreamToFileAdapter::Streamer::~Streamer() { server_ = NULL; @@ -186,7 +180,7 @@ void VideoStreamToFileAdapter::Streamer::open() { file_stream_ = file_system::Open(server_->file_name_); if (!file_stream_) { - LOG4CXX_WARN(logger, "Can't open file stream! " << server_->file_name_); + LOG4CXX_WARN(logger, "Can't open file stream! " << server_->file_name_); } else { LOG4CXX_INFO(logger, "file_stream_ opened :" << file_stream_); } diff --git a/src/components/media_manager/test/include/media_adapter_impl_mock.h b/src/components/media_manager/test/include/media_adapter_impl_mock.h index 7a820cf566..ff9c2fec9f 100644 --- a/src/components/media_manager/test/include/media_adapter_impl_mock.h +++ b/src/components/media_manager/test/include/media_adapter_impl_mock.h @@ -53,18 +53,15 @@ typedef utils::SharedPtr<MediaAdapterListener> MediaListenerPtr; class MockMediaAdapterImpl : public ::media_manager::MediaAdapterImpl { public: MOCK_METHOD1(AddListener, - void(const utils::SharedPtr<MediaAdapterListener>&)); + void(const utils::SharedPtr<MediaAdapterListener>&)); MOCK_METHOD1(RemoveListener, - void(const utils::SharedPtr<MediaAdapterListener> &)); + void(const utils::SharedPtr<MediaAdapterListener>&)); MOCK_METHOD2(SendData, - void(int32_t application_key, - const ::protocol_handler::RawMessagePtr message)); - MOCK_METHOD1(StartActivity, - void(int32_t application_key)); - MOCK_METHOD1(StopActivity, - void(int32_t application_key)); - MOCK_CONST_METHOD1(is_app_performing_activity, - bool(int32_t application_key)); + void(int32_t application_key, + const ::protocol_handler::RawMessagePtr message)); + MOCK_METHOD1(StartActivity, void(int32_t application_key)); + MOCK_METHOD1(StopActivity, void(int32_t application_key)); + MOCK_CONST_METHOD1(is_app_performing_activity, bool(int32_t application_key)); }; } // namespace media_manager_test diff --git a/src/components/media_manager/test/include/media_adapter_listener_mock.h b/src/components/media_manager/test/include/media_adapter_listener_mock.h index 8a29b3b3e7..2ba64479b6 100644 --- a/src/components/media_manager/test/include/media_adapter_listener_mock.h +++ b/src/components/media_manager/test/include/media_adapter_listener_mock.h @@ -46,18 +46,13 @@ namespace media_manager_test { class MockMediaAdapterListener : public ::media_manager::MediaAdapterListener { public: MOCK_METHOD2(OnDataReceived, - void(int32_t application_key, - const int32_t& data)); - MOCK_METHOD1(OnActivityStarted, - void(int32_t application_key)); - MOCK_METHOD1(OnActivityEnded, - void(int32_t application_key)); + void(int32_t application_key, const int32_t& data)); + MOCK_METHOD1(OnActivityStarted, void(int32_t application_key)); + MOCK_METHOD1(OnActivityEnded, void(int32_t application_key)); MOCK_METHOD2(OnErrorReceived, - void(int32_t application_key, - const int32_t& data)); + void(int32_t application_key, const int32_t& data)); }; - } // namespace media_manager_test } // namespace components } // namespace test diff --git a/src/components/media_manager/test/include/media_adapter_mock.h b/src/components/media_manager/test/include/media_adapter_mock.h index 14782cdb1a..576a1a1a9f 100644 --- a/src/components/media_manager/test/include/media_adapter_mock.h +++ b/src/components/media_manager/test/include/media_adapter_mock.h @@ -47,17 +47,13 @@ namespace media_manager_test { class MockMediaAdapter : public ::media_manager::MediaAdapter { public: MOCK_METHOD2(SendData, - void(int32_t application_key, - const ::protocol_handler::RawMessagePtr message)); - MOCK_METHOD1(StartActivity, - void(int32_t application_key)); - MOCK_METHOD1(StopActivity, - void(int32_t application_key)); - MOCK_CONST_METHOD1(is_app_performing_activity, - bool(int32_t application_key)); + void(int32_t application_key, + const ::protocol_handler::RawMessagePtr message)); + MOCK_METHOD1(StartActivity, void(int32_t application_key)); + MOCK_METHOD1(StopActivity, void(int32_t application_key)); + MOCK_CONST_METHOD1(is_app_performing_activity, bool(int32_t application_key)); }; - } // namespace media_manager_test } // namespace components } // namespace test |