diff options
Diffstat (limited to 'src/components/media_manager/include')
4 files changed, 25 insertions, 8 deletions
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 3645a9cb81..a246e468b7 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 @@ -62,6 +62,12 @@ typedef enum { typedef enum { AT_INVALID = -1, AT_PCM = 0 } AudioType; +// AudioPassThru +typedef struct { + std::vector<uint8_t> binary_data; + int32_t session_key; +} AudioData; + /* * @brief AudioStreamSenderThread class used to read binary data written from * microphone @@ -104,6 +110,18 @@ class AudioStreamSenderThread : public threads::ThreadDelegate { */ bool SendEndAudioPassThru(); + /** + * @brief Creates AudioPassThru data chunk and inserts it + * to audio_pass_thru_messages_ + * + * @param session_key Id of application for which + * audio pass thru should be sent + * + * @param binary_data AudioPassThru data chunk + */ + void SendAudioPassThroughNotification(uint32_t session_key, + std::vector<uint8_t>& binary_data); + void sendAudioChunkToMobile(); bool getShouldBeStopped(); 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 75c48c98b7..37401f9c2b 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 @@ -40,7 +40,7 @@ namespace media_manager { -typedef utils::SharedPtr<MediaAdapterListener> MediaListenerPtr; +typedef std::shared_ptr<MediaAdapterListener> MediaListenerPtr; class MediaAdapterImpl : public MediaAdapter { public: @@ -57,7 +57,7 @@ class MediaAdapterImpl : public MediaAdapter { DISALLOW_COPY_AND_ASSIGN(MediaAdapterImpl); }; -typedef utils::SharedPtr<MediaAdapterImpl> MediaAdapterImplPtr; +typedef std::shared_ptr<MediaAdapterImpl> MediaAdapterImplPtr; } // namespace media_manager diff --git a/src/components/media_manager/include/media_manager/media_manager_impl.h b/src/components/media_manager/include/media_manager/media_manager_impl.h index 7fbd4f2f6f..749356e656 100644 --- a/src/components/media_manager/include/media_manager/media_manager_impl.h +++ b/src/components/media_manager/include/media_manager/media_manager_impl.h @@ -86,10 +86,10 @@ class MediaManagerImpl : public MediaManager, void set_mock_mic_listener(MediaListenerPtr media_listener); void set_mock_mic_recorder(MediaAdapterImpl* media_adapter); void set_mock_streamer(protocol_handler::ServiceType stype, - ::utils::SharedPtr<MediaAdapterImpl> mock_stream); + std::shared_ptr<MediaAdapterImpl> mock_stream); void set_mock_streamer_listener( protocol_handler::ServiceType stype, - ::utils::SharedPtr<MediaAdapterListener> mock_stream); + std::shared_ptr<MediaAdapterListener> mock_stream); #endif // BUILD_TESTS protected: 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 5ac8e05cac..56bf941f8e 100644 --- a/src/components/media_manager/include/media_manager/streamer_adapter.h +++ b/src/components/media_manager/include/media_manager/streamer_adapter.h @@ -37,8 +37,7 @@ #include "utils/message_queue.h" #include "utils/threads/thread.h" #include "utils/threads/thread_delegate.h" -#include "utils/atomic_object.h" -#include "utils/shared_ptr.h" +#include <atomic> #include "protocol/raw_message.h" namespace media_manager { @@ -80,7 +79,7 @@ class StreamerAdapter : public MediaAdapterImpl { virtual bool Send(protocol_handler::RawMessagePtr msg) = 0; private: - sync_primitives::atomic_bool stop_flag_; + std::atomic_bool stop_flag_; StreamerAdapter* adapter_; DISALLOW_COPY_AND_ASSIGN(Streamer); @@ -96,7 +95,7 @@ class StreamerAdapter : public MediaAdapterImpl { DISALLOW_COPY_AND_ASSIGN(StreamerAdapter); }; -typedef utils::SharedPtr<StreamerAdapter> StreamerAdapterPtr; +typedef std::shared_ptr<StreamerAdapter> StreamerAdapterPtr; } // namespace media_manager |