From d510ad2d85f79d54d440d0bf72217f65a27a5966 Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Sun, 19 Jul 2020 16:01:17 +0000 Subject: [PATCH] 49_SSCam: contrib 9.5.0 git-svn-id: https://svn.fhem.de/fhem/trunk@22436 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/DS_Starter/49_SSCam.pm | 21 +++++++++++-- fhem/contrib/DS_Starter/49_SSCamSTRM.pm | 41 ++++++++++++++++++++----- 2 files changed, 53 insertions(+), 9 deletions(-) diff --git a/fhem/contrib/DS_Starter/49_SSCam.pm b/fhem/contrib/DS_Starter/49_SSCam.pm index 7377b6a61..60562984b 100644 --- a/fhem/contrib/DS_Starter/49_SSCam.pm +++ b/fhem/contrib/DS_Starter/49_SSCam.pm @@ -8329,6 +8329,8 @@ sub _streamDevMJPEG { $link = $hash->{HELPER}{STMKEYMJPEGHTTP}; } + return $ret if(!$link); + if($apiaudiostmmaxver) { $audiolink = "$proto://$serveraddr:$serverport/webapi/$apiaudiostmpath?api=$apiaudiostm&version=$apiaudiostmmaxver&method=Stream&cameraId=$camid&_sid=$sid"; } @@ -11773,6 +11775,7 @@ return; lastsnap - the streaming device playback the newest snapshot mjpeg - the streaming device playback a permanent MJPEG video stream (Streamkey method) switched - playback of different streaming types. Buttons for mode control are provided. + master - with the master device another defined streaming device can be adopted and its content displayed

@@ -11829,9 +11832,15 @@ attr <name> genericStrmHtmlTag <img $HTMLATTR As default the snapshot is retrieved in a reduced resolution. In order to use the original resolution, the attribute "snapGallerySize = Full" has to be set in the associated camera device (compare Internal PARENT). There also the attribute "pollcaminfoall" should be set to retrieve the newest snapshot regularly. +

+ + Streaming Device "master"

+ + This type cannot play back streams itself. Switching the playback of the content of another defined + Streaming Devices is done by the Set command adopt in the Master Streaming Device.
- -

+

+
@@ -13753,6 +13764,12 @@ attr <name> genericStrmHtmlTag <img $HTMLATTR Auflösung abgerufen. Um die Originalauflösung zu verwenden, ist im zugehörigen Kameradevice (Internal PARENT) das Attribut "snapGallerySize = Full" zu setzen. Dort sollte ebenfalls das Attribut "pollcaminfoall" gesetzt sein, um regelmäßig die neuesten Schnappschußdaten abzurufen. +

+ + Streaming Device "master"

+ + Dieser Typ kann selbst keine Streams wiedergeben. Die Umschaltung der Wiedergabe des Contents eines anderen definierten + Streaming Devices erfolgt durch den Set-Befehl adopt im Master Streaming Device.


diff --git a/fhem/contrib/DS_Starter/49_SSCamSTRM.pm b/fhem/contrib/DS_Starter/49_SSCamSTRM.pm index 419058e6a..43a5f582f 100644 --- a/fhem/contrib/DS_Starter/49_SSCamSTRM.pm +++ b/fhem/contrib/DS_Starter/49_SSCamSTRM.pm @@ -768,7 +768,8 @@ return $ret;