fix(audioTrackRender): make thread safe

alibaba · Apr 13, 2020 · 93d4fa7 · 93d4fa7
1 parent 8904fd7
commit 93d4fa7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/framework/render/audio/Android/AudioTrackRender.cpp b/framework/render/audio/Android/AudioTrackRender.cpp
@@ -284,8 +284,8 @@ uint64_t AudioTrackRender::getDevicePlayedSimples()
 
 int AudioTrackRender::device_write(unique_ptr<IAFFrame> &frame)
 {
-    uint64_t playedSamples = getDevicePlayedSimples();
     if(mFlushPositionReset != FlushRestPosition::notReset) {
+        uint64_t playedSamples = getDevicePlayedSimples();
         if (playedSamples >= 0x7F000000) {
             uint64_t deviceQueDuration = device_get_que_duration();
             if (deviceQueDuration > 0) {

diff --git a/framework/render/audio/Android/AudioTrackRender.h b/framework/render/audio/Android/AudioTrackRender.h
@@ -81,12 +81,12 @@ class AudioTrackRender :
 
 
 private:
-    uint64_t mBasePlayedPosition = 0;
+    std::atomic<uint64_t> mBasePlayedPosition = 0;
     uint8_t *mPcmBuffer = nullptr;
     int64_t mPcmBufferLen = 0;
 
     int64_t mPlayedBufferLen = 0;
-    int64_t mAudioFlushPosition = 0;
+    std::atomic<int64_t> mAudioFlushPosition = 0;
 
     std::atomic<uint64_t> mSendSimples{0};
     int mSimpleSize{0};
@@ -96,7 +96,7 @@ class AudioTrackRender :
         unknow , reset, notReset
     };
 
-    FlushRestPosition mFlushPositionReset = FlushRestPosition::unknow;
+    std::atomic<FlushRestPosition> mFlushPositionReset = FlushRestPosition::unknow;
 
 };