WiP: routing tests

Author: swichu91

MIMXRT1052.svd

@@ -17,8 +17,6 @@ endif()
 
 set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BUILD_DIRECTORY})
 
-set(CMAKE_CXX_STANDARD 14)
-
 if(${PROJECT_TARGET} STREQUAL "TARGET_RT1051")
     include(targets/Target_RT1051.cmake)
 elseif(${PROJECT_TARGET} STREQUAL "TARGET_Linux")

module-apps/CMakeLists.txt

@@ -17,6 +17,7 @@
 #include "i18/i18.hpp"
 
 #include "service-cellular/api/CellularServiceAPI.hpp"
+#include "service-audio/api/AudioServiceAPI.hpp"
 
 #include "Label.hpp"
 #include "Margins.hpp"
@@ -130,6 +131,8 @@ void CallWindow::onBeforeShow( ShowMode mode, uint32_t command, SwitchData* data
 bool CallWindow::handleLeftButton() {
 	if( state == State::INCOMMING_CALL ) {
 		auto ret = CellularServiceAPI::AnswerIncomingCall(application);
+		AudioServiceAPI::RoutingStart(application);
+
 		LOG_INFO("AnswerIncomingCall: %s",(ret?"OK":"FAIL"));
 		if( ret ) {
 			state = State::CALL_IN_PROGRESS;
@@ -156,6 +159,7 @@ bool CallWindow::handleLeftButton() {
 bool CallWindow::handleCenterButton() {
 	if( state == State::INCOMMING_CALL ) {
 		auto ret = CellularServiceAPI::HangupCall(application);
+		AudioServiceAPI::Stop(application);
 		LOG_INFO("HangupCall: %s",(ret?"OK":"FAIL"));
 		//TODO switch to message templates window
 		return true;

module-apps/application-call/windows/CallWindow.cpp

@@ -35,7 +35,7 @@ namespace audio {
         Audio(std::function<int32_t(AudioEvents event)> asyncCallback);
 
         //Events
-        int32_t SendEvent(const Operation::Event evt, const EventData *data);
+        int32_t SendEvent(const Operation::Event evt, const EventData *data=nullptr);
 
         //utilities
         Position GetPosition();
@@ -57,7 +57,7 @@ namespace audio {
         //TODO:M.P Set/Get inputGain/outputVolume for each profile
 
         //Operations
-        int32_t Start(Operation::Type op, const char *fileName);
+        int32_t Start(Operation::Type op, const char *fileName="");
 
         int32_t Stop();
 

module-audio/Audio/Audio.hpp

@@ -37,7 +37,7 @@ namespace audio {
                 inst = std::make_unique<PlaybackOperation>(fileName);
                 break;
             case Type::Router:
-                //TODO:M.P inst = std::make_unique<RouterOperation>(fileName,prof);
+                inst = std::make_unique<RouterOperation>(fileName);
                 break;
             case Type::Recorder:
                 inst = std::make_unique<RecorderOperation>(fileName);

module-audio/Audio/Operation/Operation.cpp

@@ -52,6 +52,8 @@ namespace audio {
             BTHeadsetOff,
             BTA2DPOn,
             BTA2DPOff,
+            StartCallRecording,
+            StopCallRecording,
         };
 
         virtual ~Operation() {}
@@ -67,7 +69,7 @@ namespace audio {
 
         virtual int32_t Resume() = 0;
 
-        virtual int32_t SendEvent(const Event evt, const EventData *data) = 0;
+        virtual int32_t SendEvent(const Event evt, const EventData *data=nullptr) = 0;
 
         virtual int32_t SetOutputVolume(float vol) = 0;
 

module-audio/Audio/Operation/Operation.hpp

@@ -56,26 +56,27 @@ namespace audio {
         currentProfile = availableProfiles[0].get();
 
         uint32_t channels = 0;
-        if (currentProfile->GetInOutFlags() & static_cast<uint32_t >(AudioDevice::Flags::InputLeft)) {
-            channels++;
-        }
-        if (currentProfile->GetInOutFlags() & static_cast<uint32_t >(AudioDevice::Flags::InputRight)) {
-            channels++;
+        if ((currentProfile->GetInOutFlags() & static_cast<uint32_t >(AudioDevice::Flags::InputLeft)) ||
+            (currentProfile->GetInOutFlags() & static_cast<uint32_t >(AudioDevice::Flags::InputRight))) {
+            channels = 1;
+        } else if (currentProfile->GetInOutFlags() & static_cast<uint32_t >(AudioDevice::Flags::InputStereo)) {
+            channels = 2;
         }
 
+
         enc = Encoder::Create(file, Encoder::Format{
                 .chanNr=channels,
                 .sampleRate=currentProfile->GetSampleRate()
         });
 
-        if(enc == nullptr){
+        if (enc == nullptr) {
             LOG_ERROR("Error during initializing encoder");
             return;
         }
 
 
         audioDevice = AudioDevice::Create(currentProfile->GetAudioDeviceType(), audioCallback).value_or(nullptr);
-        if(audioDevice == nullptr){
+        if (audioDevice == nullptr) {
             LOG_ERROR("Error creating AudioDevice");
             return;
         }

module-audio/Audio/Operation/RecorderOperation.cpp

@@ -19,8 +19,6 @@
 
 namespace audio {
 
-    class Encoder;
-
 
     class RecorderOperation : public Operation {
     public: