From 667b09259cd1d8992e11a659d77b46ebdc680592 Mon Sep 17 00:00:00 2001
From: Barry <870709864@qq.com>
Date: Sat, 15 Jun 2019 18:29:19 +0800
Subject: [PATCH] =?UTF-8?q?update:VideoBuffer=20stop=E9=87=8D=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E4=B8=BAinterrupt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 QtScrcpy/decoder/decoder.cpp     | 2 +-
 QtScrcpy/decoder/videobuffer.cpp | 6 +++---
 QtScrcpy/decoder/videobuffer.h   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/QtScrcpy/decoder/decoder.cpp b/QtScrcpy/decoder/decoder.cpp
index 8038fd6..9407772 100644
--- a/QtScrcpy/decoder/decoder.cpp
+++ b/QtScrcpy/decoder/decoder.cpp
@@ -235,7 +235,7 @@ void Decoder::stopDecode()
 {
     m_quit = true;
     if (m_vb) {
-        m_vb->stop();
+        m_vb->interrupt();
     }
     wait();
 }
diff --git a/QtScrcpy/decoder/videobuffer.cpp b/QtScrcpy/decoder/videobuffer.cpp
index bd95582..05af238 100644
--- a/QtScrcpy/decoder/videobuffer.cpp
+++ b/QtScrcpy/decoder/videobuffer.cpp
@@ -74,7 +74,7 @@ bool VideoBuffer::offerDecodedFrame()
 #ifndef SKIP_FRAMES
     // if SKIP_FRAMES is disabled, then the decoder must wait for the current
     // frame to be consumed
-    while (!m_renderingFrameConsumed && !m_stopped) {
+    while (!m_renderingFrameConsumed && !m_interrupted) {
         m_renderingFrameConsumedCond.wait(&m_mutex);
     }    
 #else
@@ -105,11 +105,11 @@ const AVFrame *VideoBuffer::consumeRenderedFrame()
     return m_renderingframe;
 }
 
-void VideoBuffer::stop()
+void VideoBuffer::interrupt()
 {
 #ifndef SKIP_FRAMES
     m_mutex.lock();
-    m_stopped = true;
+    m_interrupted = true;
     m_mutex.unlock();
     // wake up blocking wait
     m_renderingFrameConsumedCond.wakeOne();
diff --git a/QtScrcpy/decoder/videobuffer.h b/QtScrcpy/decoder/videobuffer.h
index 8a33411..8c0e9af 100644
--- a/QtScrcpy/decoder/videobuffer.h
+++ b/QtScrcpy/decoder/videobuffer.h
@@ -33,7 +33,7 @@ public:
     const AVFrame* consumeRenderedFrame();
 
     // wake up and avoid any blocking call
-    void stop();
+    void interrupt();
 
 private:
     void swap();
@@ -47,7 +47,7 @@ private:
 
 #ifndef SKIP_FRAMES
     QWaitCondition m_renderingFrameConsumedCond;
-    bool m_stopped = true;    
+    bool m_interrupted = true;
 #endif
 };