From b2654881ae49ee7db7f5a0a27e72e109e31db9ab Mon Sep 17 00:00:00 2001
From: philippegorley <philippe.gorley@savoirfairelinux.com>
Date: Tue, 16 Oct 2018 17:26:15 -0400
Subject: [PATCH] localrecorder: correctly create read offsets

Also avoids race conditions when stopping the recorder

Change-Id: I498b2f9802e647a05410bd5bcb5cf4248a02bcf4
---
 src/media/localrecorder.cpp | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/media/localrecorder.cpp b/src/media/localrecorder.cpp
index 345fb9ed2..893b0dda7 100644
--- a/src/media/localrecorder.cpp
+++ b/src/media/localrecorder.cpp
@@ -2,6 +2,7 @@
  *  Copyright (C) 2018 Savoir-faire Linux Inc.
  *
  *  Author: Hugo Lefeuvre <hugo.lefeuvre@savoirfairelinux.com>
+ *  Author: Philippe Gorley <philippe.gorley@savoirfairelinux.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -69,12 +70,11 @@ LocalRecorder::startRecording()
     }
 
     // audio recording
-    auto rb = ring::Manager::instance().getRingBufferPool().getRingBuffer(RingBufferPool::DEFAULT_ID);
-    rb->createReadOffset(RingBufferPool::DEFAULT_ID);
-    ring::Manager::instance().startAudioDriverStream();
-    // TODO wait for AudioLayer::hardwareFormatAvailable callback, otherwise a race condition happens here
+    // create read offset in RingBuffer
+    Manager::instance().getRingBufferPool().bindHalfDuplexOut(path_, RingBufferPool::DEFAULT_ID);
+    Manager::instance().startAudioDriverStream();
 
-    audioInput_.reset(new ring::AudioInput(RingBufferPool::DEFAULT_ID));
+    audioInput_.reset(new AudioInput(path_));
     audioInput_->initRecorder(recorder_);
 
 #ifdef RING_VIDEO
@@ -96,16 +96,13 @@ LocalRecorder::startRecording()
 void
 LocalRecorder::stopRecording()
 {
+    Recordable::stopRecording();
+
     if (audioInput_) {
-        auto rb = ring::Manager::instance().getRingBufferPool().getRingBuffer(RingBufferPool::DEFAULT_ID);
-        rb->removeReadOffset(RingBufferPool::DEFAULT_ID);
-        audioInput_.reset();
-        audioInput_ = nullptr;
+         Manager::instance().getRingBufferPool().unBindHalfDuplexOut(path_, RingBufferPool::DEFAULT_ID);
     } else {
         RING_ERR("could not stop audio layer (audio input is null)");
     }
-
-    Recordable::stopRecording();
 }
 
 } // namespace ring
-- 
GitLab