ANSCENTER/ANSCORE
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix double stops

Browse Source
This commit is contained in:
Tuan Nghia Nguyen
2026-04-22 10:19:03 +10:00
parent 57cc8e0a56
commit 0e203eef99
6 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/ANSCV/ANSFLV.cpp
View File

@@ -62,8 +62,11 @@ namespace ANSCENTER {
}
clientToClose = std::move(_playerClient);
}
// reset() runs the destructor which calls close() exactly once.
// Do NOT call close() explicitly before reset() — second close would
// re-enter decoder Stop/flush on already-torn-down state.
if (clientToClose) {
clientToClose->close();
clientToClose.reset();
}
}
static void VerifyGlobalANSFLVLicense(const std::string& licenseKey) {
@@ -144,7 +147,8 @@ namespace ANSCENTER {
std::lock_guard<std::recursive_mutex> lock(_mutex);
_isPlaying = false;
}
_playerClient->close();
// CHttpFlvPlayer::open() calls close() internally at the top —
// no need to close explicitly (would be a double-close).
std::lock_guard<std::recursive_mutex> lock(_mutex);
Setup();
_isPlaying = _playerClient->play();

8
modules/ANSCV/ANSMJPEG.cpp
View File

@@ -59,8 +59,11 @@ namespace ANSCENTER {
}
clientToClose = std::move(_playerClient);
}
// reset() runs the destructor which calls close() exactly once.
// Do NOT call close() explicitly before reset() — second close would
// re-enter decoder Stop/flush on already-torn-down state.
if (clientToClose) {
clientToClose->close();
clientToClose.reset();
}
}
static void VerifyGlobalANSMJPEGLicense(const std::string& licenseKey) {
@@ -141,7 +144,8 @@ namespace ANSCENTER {
std::lock_guard<std::recursive_mutex> lock(_mutex);
_isPlaying = false;
}
_playerClient->close();
// CHttpMjpegPlayer::open() calls close() internally at the top —
// no need to close explicitly (would be a double-close).
std::lock_guard<std::recursive_mutex> lock(_mutex);
Setup();
_isPlaying = _playerClient->play();

8
modules/ANSCV/ANSRTMP.cpp
View File

@@ -61,8 +61,11 @@ namespace ANSCENTER {
}
clientToClose = std::move(_playerClient);
}
// reset() runs the destructor which calls close() exactly once.
// Do NOT call close() explicitly before reset() — second close would
// re-enter decoder Stop/flush on already-torn-down state.
if (clientToClose) {
clientToClose->close();
clientToClose.reset();
}
}
static void VerifyGlobalANSRTMPLicense(const std::string& licenseKey) {
@@ -138,7 +141,8 @@ namespace ANSCENTER {
std::lock_guard<std::recursive_mutex> lock(_mutex);
_isPlaying = false;
}
_playerClient->close();
// CRtmpPlayer::open() calls close() internally at the top —
// no need to close explicitly (would be a double-close).
std::lock_guard<std::recursive_mutex> lock(_mutex);
Setup();
_isPlaying = _playerClient->play();

5
modules/ANSCV/ANSRTSP.cpp
View File

@@ -128,8 +128,11 @@ namespace ANSCENTER {
// close() destroys the NVDEC decoder ONLY. Pool slot buffers
// (regular cudaMallocPitch allocations) are untouched — they
// belong to the global GpuNV12SlotPool, not the decoder.
// reset() runs ~CRtspPlayer which calls close() exactly once —
// do NOT call close() explicitly here (the destructor would call
// it again, which re-enters torn-down decoder state).
if (clientToClose) {
clientToClose->close();
clientToClose.reset();
// Force CUDA runtime to release all cached memory from the destroyed
// NVDEC decoder. Without this, cuMemFree returns memory to the CUDA

8
modules/ANSCV/ANSSRT.cpp
View File

@@ -61,8 +61,11 @@ namespace ANSCENTER {
}
clientToClose = std::move(_playerClient);
}
// reset() runs the destructor which calls close() exactly once.
// Do NOT call close() explicitly before reset() — second close would
// re-enter decoder Stop/flush on already-torn-down state.
if (clientToClose) {
clientToClose->close();
clientToClose.reset();
}
}
static void VerifyGlobalANSSRTLicense(const std::string& licenseKey) {
@@ -136,7 +139,8 @@ namespace ANSCENTER {
std::lock_guard<std::recursive_mutex> lock(_mutex);
_isPlaying = false;
}
_playerClient->close();
// CSrtPlayer::open() calls close() internally at the top —
// no need to close explicitly (would be a double-close).
std::lock_guard<std::recursive_mutex> lock(_mutex);
Setup();
_isPlaying = _playerClient->play();

10
tests/ANSCV-UnitTest/ANSCV-UnitTest.cpp
View File

@@ -849,11 +849,11 @@ int RSTPTestCVClient() {
while (true) {
index++;
std::cout << "Index=" << index << std::endl;
//if ((index == 200) || (index == 800) || (index == 1200)) { StopRTSP(&rtspClient); }
//if ((index == 400) || (index == 1000) || (index == 1500)) { StartRTSP(&rtspClient); }
if ((index == 200) || (index == 800) || (index == 1200)) { StopRTSP(&rtspClient); }
if ((index == 400) || (index == 1000) || (index == 1500)) { StartRTSP(&rtspClient); }
//if ((index == 1800) || (index == 2200) || (index == 2500)) { StartRTSP(&rtspClient); }
//if ((index == 2000) || (index == 2300) || (index == 2700)) { StartRTSP(&rtspClient); }
//if (index > 20000) break;
if (index > 20000) break;
auto start = std::chrono::system_clock::now();
cv::Mat* image = nullptr; // ✅ Use a pointer to hold the allocated image
GetRTSPCVImage(&rtspClient, width, height, pts,&image);
@@ -1645,7 +1645,7 @@ int main()
// so this works without the unit test having to link FFmpeg itself.
//ANSCV_PrintFFmpegLicense_S();
//FilePlayerClientDoubleDestroy();
FilePlayerClientCVTest();
//FilePlayerClientCVTest();
//VideoPlayerClientTest();
//VideoPlayerClientDoubleDestroy();
// VideoPlayerClientTest();
@@ -1655,7 +1655,7 @@ int main()
// TestGetImage();
//PureOpenCV();
// RSTPTestClient();
//RSTPTestCVClient();
RSTPTestCVClient();
//TestCreateImageFromJpegStringFile();
//TestCreateImageFromFile();
//for (int i = 0; i < 100; i++) {