1 files changed, 60 insertions, 5 deletions

diff --git a/src/components/media_manager/src/audio/audio_stream_sender_thread.cc b/src/components/media_manager/src/audio/audio_stream_sender_thread.cc
index 9b0057dfe8..23181e7431 100644
--- a/src/components/media_manager/src/audio/audio_stream_sender_thread.cc
+++ b/src/components/media_manager/src/audio/audio_stream_sender_thread.cc
@@ -38,8 +38,9 @@
 #include <string>
 #include <string.h>
 #include "application_manager/application_manager.h"
-#include "application_manager/mobile_command_factory.h"
 #include "application_manager/application_impl.h"
+#include "application_manager/rpc_service.h"
+#include "application_manager/commands/command.h"
 #include "smart_objects/smart_object.h"
 #include "interfaces/MOBILE_API.h"
 #include "utils/file_system.h"
@@ -51,6 +52,7 @@
 
 namespace media_manager {
 using sync_primitives::AutoLock;
+namespace strings = application_manager::strings;
 
 #ifdef EXTENDED_MEDIA_MODE
 const int32_t AudioStreamSenderThread::kAudioPassThruTimeout = 50;
@@ -59,6 +61,15 @@ const int32_t AudioStreamSenderThread::kAudioPassThruTimeout = 1000;
 #endif
 const uint32_t kMqueueMessageSize = 4095;
 
+// Size of RIFF header contained in a .wav file: 12 bytes for 'RIFF' chunk
+// descriptor, 24 bytes for 'fmt ' sub-chunk and 8 bytes for 'data' sub-chunk
+// header.
+// The correct format of audio stream for AudioPassThru feature is to include
+// only audio sample data. Since both pre-recorded file (audio.8bit.wav) and
+// GStreamer-generated file contain RIFF header, we will skip it when reading
+// the files.
+static const uint32_t kRIFFHeaderSize = 44;
+
 CREATE_LOGGERPTR_GLOBAL(logger_, "MediaManager")
 
 AudioStreamSenderThread::AudioStreamSenderThread(
@@ -67,7 +78,7 @@ AudioStreamSenderThread::AudioStreamSenderThread(
     application_manager::ApplicationManager& app_mngr)
     : session_key_(session_key)
     , fileName_(fileName)
-    , offset_(0)
+    , offset_(kRIFFHeaderSize)
     , shouldBeStoped_(false)
     , shouldBeStoped_lock_()
     , shouldBeStoped_cv_()
@@ -80,7 +91,7 @@ AudioStreamSenderThread::~AudioStreamSenderThread() {}
 void AudioStreamSenderThread::threadMain() {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  offset_ = 0;
+  offset_ = kRIFFHeaderSize;
 
   while (false == getShouldBeStopped()) {
     AutoLock auto_lock(shouldBeStoped_lock_);
@@ -118,15 +129,59 @@ void AudioStreamSenderThread::sendAudioChunkToMobile() {
     offset_ = offset_ + to - from;
     std::vector<uint8_t> data(from, to);
 
-    application_manager_.SendAudioPassThroughNotification(session_key_, data);
+    SendAudioPassThroughNotification(session_key_, data);
     binaryData.clear();
   }
 #if !defined(EXTENDED_MEDIA_MODE)
   // without recording stream restart reading 1-sec file
-  offset_ = 0;
+  offset_ = kRIFFHeaderSize;
 #endif
 }
 
+void AudioStreamSenderThread::SendAudioPassThroughNotification(
+    uint32_t session_key, std::vector<uint8_t>& binary_data) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  if (!application_manager_.is_audio_pass_thru_active()) {
+    LOG4CXX_ERROR(logger_,
+                  "Trying to send PassThroughNotification"
+                  " when PassThrough is not active");
+    return;
+  }
+
+  AudioData data;
+  data.session_key = session_key;
+  data.binary_data = binary_data;
+
+  smart_objects::SmartObjectSPtr on_audio_pass =
+      std::make_shared<smart_objects::SmartObject>();
+
+  if (!on_audio_pass) {
+    LOG4CXX_ERROR(logger_, "OnAudioPassThru NULL pointer");
+    return;
+  }
+
+  LOG4CXX_DEBUG(logger_, "Fill smart object");
+
+  (*on_audio_pass)[strings::params][strings::message_type] =
+      application_manager::MessageType::kNotification;
+
+  (*on_audio_pass)[strings::params][strings::connection_key] =
+      static_cast<int32_t>(data.session_key);
+  (*on_audio_pass)[strings::params][strings::function_id] =
+      mobile_apis::FunctionID::OnAudioPassThruID;
+
+  LOG4CXX_DEBUG(logger_, "Fill binary data");
+  // binary data
+  (*on_audio_pass)[strings::params][strings::binary_data] =
+      smart_objects::SmartObject(data.binary_data);
+
+  LOG4CXX_DEBUG(logger_, "After fill binary data");
+  LOG4CXX_DEBUG(logger_, "Send data");
+  application_manager_.GetRPCService().ManageMobileCommand(
+      on_audio_pass, application_manager::commands::Command::SOURCE_SDL);
+}
+
 bool AudioStreamSenderThread::getShouldBeStopped() {
   AutoLock auto_lock(shouldBeStoped_lock_);