generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2215 from pengyanhai/master

Browse Source 
Tear down the OpenH264 encoder and decoder properly to avoid potential crash and memory leak
This commit is contained in:
huili2 2015-11-10 09:07:41 +08:00
commit 24916a652e
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
module/gmp-openh264.cpp
View File

@ -368,9 +368,24 @@ class OpenH264VideoEncoder : public GMPVideoEncoder, public RefCounted {
private:
virtual ~OpenH264VideoEncoder() {
worker_thread_->Join();
// Tear down the internal encoder
TearDownEncoder();
}
void TearDownEncoder() {
// Stop the worker thread first
if (worker_thread_) {
worker_thread_->Join();
worker_thread_ = nullptr;
}
// Destroy OpenH264 encoder
if (encoder_) {
WelsDestroySVCEncoder(encoder_);
encoder_ = nullptr;
}
}
void Error (GMPErr error) {
if (callback_) {
callback_->Error (error);
@ -727,8 +742,23 @@ class OpenH264VideoDecoder : public GMPVideoDecoder, public RefCounted {
private:
virtual ~OpenH264VideoDecoder() {
// Tear down the internal decoder
TearDownDecoder();
}
void TearDownDecoder() {
// Stop the worker thread first
if (worker_thread_) {
worker_thread_->Join();
worker_thread_ = nullptr;
}
// Destroy OpenH264 decoder
if (decoder_) {
WelsDestroyDecoder(decoder_);
decoder_ = nullptr;
}
}
void Error (GMPErr error) {
if (callback_) {
callback_->Error (error);