audio/opensl: handle exception during initialization

Change-Id: Id6f3f10819c7b8092d66a51ad11307097d0e00af

src/media/audio/opensl/audio_common.h

@@ -48,7 +48,7 @@ inline SLDataFormat_PCM convertToSLSampleFormat(const ring::AudioFormat& infos)
 
 #define SLASSERT(x) { \
         if(SL_RESULT_SUCCESS != (x))\
-            throw std::runtime_error("OpenSLES error");\
+            throw std::runtime_error("OpenSLES error " + std::to_string(x));\
     }
 
 /*

src/media/audio/opensl/opensllayer.cpp

@@ -252,13 +252,22 @@ OpenSLLayer::initAudioPlayback()
 {
     using namespace std::placeholders;
     std::lock_guard<std::mutex> lck(playMtx);
+    try  {
         player_.reset(new opensl::AudioPlayer(hardwareFormat_, engineInterface_, SL_ANDROID_STREAM_VOICE));
         player_->setBufQueue(&playBufQueue_, &freePlayBufQueue_);
         player_->registerCallback(std::bind(&OpenSLLayer::engineServicePlay, this, _1));
+    } catch (const std::exception& e) {
+        RING_ERR("Error initializing audio playback: %s", e.what());
+        return;
+    }
 
+    try  {
         ringtone_.reset(new opensl::AudioPlayer(hardwareFormat_, engineInterface_, SL_ANDROID_STREAM_VOICE));
         ringtone_->setBufQueue(&ringBufQueue_, &freeRingBufQueue_);
         ringtone_->registerCallback(std::bind(&OpenSLLayer::engineServiceRing, this, _1));
+    } catch (const std::exception& e) {
+        RING_ERR("Error initializing ringtone playback: %s", e.what());
+    }
 }
 
 void
@@ -266,17 +275,25 @@ OpenSLLayer::initAudioCapture()
 {
     using namespace std::placeholders;
     std::lock_guard<std::mutex> lck(recMtx);
+    try  {
         recorder_.reset(new opensl::AudioRecorder(hardwareFormat_, engineInterface_));
         recorder_->setBufQueues(&freeRecBufQueue_, &recBufQueue_);
         recorder_->registerCallback(std::bind(&OpenSLLayer::engineServiceRec, this, _1));
+    } catch (const std::exception& e) {
+        RING_ERR("Error initializing audio capture: %s", e.what());
+    }
 }
 
 void
 OpenSLLayer::startAudioPlayback()
 {
+    if (not player_ and not ringtone_)
+        return;
     RING_WARN("Start audio playback");
 
+    if (player_)
         player_->start();
+    if (ringtone_)
         ringtone_->start();
     playThread = std::thread([&]() {
         std::unique_lock<std::mutex> lck(playMtx);
@@ -304,6 +321,8 @@ OpenSLLayer::startAudioPlayback()
 void
 OpenSLLayer::startAudioCapture()
 {
+    if (not recorder_)
+        return;
     RING_DBG("Start audio capture");
 
     recorder_->start();