diff --git a/Live/src/main/cpp/AudioStream.cpp b/Live/src/main/cpp/AudioStream.cpp index 6d3c6eb..f986b4f 100644 --- a/Live/src/main/cpp/AudioStream.cpp +++ b/Live/src/main/cpp/AudioStream.cpp @@ -15,8 +15,8 @@ AudioStream::~AudioStream() { } } -void AudioStream::setAudioCallback(AudioCallback audioCallback) { - this->audioCallback = audioCallback; +void AudioStream::setAudioCallback(AudioCallback callback) { + this->audioCallback = callback; } void AudioStream::setAudioEncInfo(int samplesInHZ, int channels) { diff --git a/Live/src/main/cpp/PacketQueue.h b/Live/src/main/cpp/PacketQueue.h index ac62817..1010924 100644 --- a/Live/src/main/cpp/PacketQueue.h +++ b/Live/src/main/cpp/PacketQueue.h @@ -1,83 +1,75 @@ -#ifndef SAFE_QUEUE_H -#define SAFE_QUEUE_H +#ifndef PACKET_QUEUE_H +#define PACKET_QUEUE_H #include #include -using namespace std; - template class PacketQueue { typedef void (*ReleaseCallback)(T &); - typedef void (*SyncHandle)(queue &); - public: void push(T new_value) { - lock_guard lk(mt); - if (running) { - q.push(new_value); - cv.notify_one(); + std::lock_guard lk(m_mutex); + if (m_running) { + m_queue.push(new_value); + m_cond.notify_one(); } } int pop(T &value) { int ret = 0; - unique_lock lk(mt); - if (!running) { + std::unique_lock lk(m_mutex); + if (!m_running) { return ret; } - if (!q.empty()) { - value = q.front(); - q.pop(); + if (!m_queue.empty()) { + value = m_queue.front(); + m_queue.pop(); ret = 1; } return ret; } void setRunning(bool run) { - lock_guard lk(mt); - this->running = run; + std::lock_guard lk(m_mutex); + m_running = run; } int empty() { - return q.empty(); + std::lock_guard lk(m_mutex); + return m_queue.empty(); } int size() { - return static_cast(q.size()); + std::lock_guard lk(m_mutex); + return static_cast(m_queue.size()); } void clear() { - lock_guard lk(mt); - int size = q.size(); + std::lock_guard lk(m_mutex); + int size = m_queue.size(); for (int i = 0; i < size; ++i) { - T value = q.front(); + T value = m_queue.front(); releaseCallback(value); - q.pop(); + m_queue.pop(); } } - void sync() { - lock_guard lk(mt); - syncHandle(q); - } - - void setReleaseCallback(ReleaseCallback r) { - releaseCallback = r; + void setReleaseCallback(ReleaseCallback callback) { + releaseCallback = callback; } private: - mutex mt; - condition_variable cv; + std::mutex m_mutex; + std::condition_variable m_cond; + std::queue m_queue; + bool m_running; - queue q; - bool running; ReleaseCallback releaseCallback; - SyncHandle syncHandle; }; -#endif +#endif // PACKET_QUEUE_H diff --git a/Live/src/main/cpp/VideoStream.cpp b/Live/src/main/cpp/VideoStream.cpp index 395abb7..a681520 100644 --- a/Live/src/main/cpp/VideoStream.cpp +++ b/Live/src/main/cpp/VideoStream.cpp @@ -1,6 +1,5 @@ #include -#include #include "VideoStream.h" #include "PushInterface.h"