public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ipcamera] Fix orphan ffmpeg process after stopping stream URL (#14909)

Browse Source 
* Setting ffmpeg reference 'ffmpegMjpeg' to null after stopping convertion to fix automatic restart of ffmpeg process.

---------

Signed-off-by: Thomas Burri <th@thonojato.ch>
This commit is contained in:
tb4jc
2023-05-08 11:43:49 +02:00
committed by GitHub
parent 254efb5372
commit a2dcf2fcef
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bundles/org.openhab.binding.ipcamera/src/main/java/org/openhab/binding/ipcamera/internal/servlet/CameraServlet.java
View File

@@ -212,6 +212,9 @@ public class CameraServlet extends IpCameraServlet {
Ffmpeg localMjpeg = handler.ffmpegMjpeg; Ffmpeg localMjpeg = handler.ffmpegMjpeg;
if (localMjpeg != null) { if (localMjpeg != null) {
localMjpeg.stopConverting(); localMjpeg.stopConverting();
// Set reference to ffmpegMjpeg to null to prevent automatic reconnection
// in handler's pollCameraRunnable() check for frozen camera
handler.ffmpegMjpeg = null;
} }
} else { } else {
handler.closeChannel(handler.getTinyUrl(handler.mjpegUri)); handler.closeChannel(handler.getTinyUrl(handler.mjpegUri));