mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-03-10 03:06:37 +00:00
49_SSCam: contrib 9.5.0
git-svn-id: https://svn.fhem.de/fhem/trunk@22436 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1
parent
e1424f75da
commit
d510ad2d85
@ -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;
|
||||
<tr><td>lastsnap </td><td>- the streaming device playback the newest snapshot </td></tr>
|
||||
<tr><td>mjpeg </td><td>- the streaming device playback a permanent MJPEG video stream (Streamkey method) </td></tr>
|
||||
<tr><td>switched </td><td>- playback of different streaming types. Buttons for mode control are provided. </td></tr>
|
||||
<tr><td>master </td><td>- with the master device another defined streaming device can be adopted and its content displayed </td></tr>
|
||||
</table>
|
||||
</ul>
|
||||
<br><br>
|
||||
@ -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
|
||||
<b>"snapGallerySize = Full"</b> 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.
|
||||
<br><br>
|
||||
|
||||
<b>Streaming Device "master"</b> <br><br>
|
||||
|
||||
This type cannot play back streams itself. Switching the playback of the content of another defined
|
||||
Streaming Devices is done by the Set command <b>adopt</b> in the Master Streaming Device.
|
||||
<br>
|
||||
</ul>
|
||||
<br><br>
|
||||
<br><br>
|
||||
</ul>
|
||||
|
||||
<ul>
|
||||
<li><b> createPTZcontrol </b> (valid for PTZ-CAM)</li> <br>
|
||||
@ -11841,6 +11850,7 @@ attr <name> genericStrmHtmlTag <img $HTMLATTR
|
||||
With the "ptzPanel_.*"-<a href="#SSCamattr">attributes</a> or respectively the specific attributes of the SSCamSTRM-device
|
||||
the properties of the control panel can be affected. <br>
|
||||
<br><br>
|
||||
<br>
|
||||
</ul>
|
||||
|
||||
<ul>
|
||||
@ -13698,6 +13708,7 @@ attr <name> genericStrmHtmlTag <img $HTMLATTR
|
||||
<tr><td>lastsnap </td><td>- das Streaming-Device zeigt den neuesten Schnappschuß an </td></tr>
|
||||
<tr><td>mjpeg </td><td>- das Streaming-Device gibt einen permanenten MJPEG Kamerastream wieder (Streamkey Methode) </td></tr>
|
||||
<tr><td>switched </td><td>- Wiedergabe unterschiedlicher Streamtypen. Drucktasten zur Steuerung werden angeboten. </td></tr>
|
||||
<tr><td>master </td><td>- mit dem Master Device kann ein anderes definiertes Streaming Device adoptiert und dessen Content angezeigt werden </td></tr>
|
||||
</table>
|
||||
</ul>
|
||||
<br>
|
||||
@ -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
|
||||
<b>"snapGallerySize = Full"</b> zu setzen.
|
||||
Dort sollte ebenfalls das Attribut "pollcaminfoall" gesetzt sein, um regelmäßig die neuesten Schnappschußdaten abzurufen.
|
||||
<br><br>
|
||||
|
||||
<b>Streaming Device "master"</b> <br><br>
|
||||
|
||||
Dieser Typ kann selbst keine Streams wiedergeben. Die Umschaltung der Wiedergabe des Contents eines anderen definierten
|
||||
Streaming Devices erfolgt durch den Set-Befehl <b>adopt</b> im Master Streaming Device.
|
||||
<br>
|
||||
<br><br>
|
||||
</ul>
|
||||
|
||||
@ -768,7 +768,8 @@ return $ret;
|
||||
<ul>
|
||||
The module SSCamSTRM is a special device module synchronized to the SSCam module. It is used for definition of
|
||||
Streaming-Devices. <br>
|
||||
Dependend of the Streaming-Device state, different buttons are provided to start actions:
|
||||
Dependend of the Streaming-Device state, different buttons are provided to start actions: <br><br>
|
||||
|
||||
<ul>
|
||||
<table>
|
||||
<colgroup> <col width=25%> <col width=75%> </colgroup>
|
||||
@ -801,7 +802,12 @@ return $ret;
|
||||
<br><br>
|
||||
|
||||
<ul>
|
||||
A SSCam Streaming-device is defined by the SSCam "set <name> createStreamDev" command.
|
||||
A SSCam Streaming-device is defined by the SSCam command: <br><br>
|
||||
|
||||
<ul>
|
||||
set <name> createStreamDev <Device Typ> <br><br>
|
||||
</ul>
|
||||
|
||||
Please refer to SSCam <a href="#SSCamcreateStreamDev">"createStreamDev"</a> command.
|
||||
<br><br>
|
||||
</ul>
|
||||
@ -811,7 +817,7 @@ return $ret;
|
||||
<ul>
|
||||
|
||||
<ul>
|
||||
<li><b>popupStream</b> <br>
|
||||
<li><b>popupStream</b> (only valid if MODEL != master)<br>
|
||||
|
||||
The current streaming content is depicted in a popup window. By setting attribute "popupWindowSize" the
|
||||
size of display can be adjusted. The attribute "popupStreamTo" determines the type of the popup window.
|
||||
@ -822,6 +828,14 @@ return $ret;
|
||||
</ul>
|
||||
<br>
|
||||
|
||||
<ul>
|
||||
<li><b>adopt <Streaming device> </b> (only valid if MODEL = master)<br>
|
||||
|
||||
A Streaming Device of type <b>master</b> adopts the content of another defined Streaming Device.
|
||||
</li>
|
||||
</ul>
|
||||
<br>
|
||||
|
||||
</ul>
|
||||
<br>
|
||||
|
||||
@ -1009,7 +1023,7 @@ attr <name> genericStrmHtmlTag <img $HTMLATTR
|
||||
<ul>
|
||||
<br>
|
||||
Das Modul SSCamSTRM ist ein mit SSCam abgestimmtes Gerätemodul zur Definition von Streaming-Devices. <br>
|
||||
Abhängig vom Zustand des Streaming-Devices werden zum Start von Aktionen unterschiedliche Drucktasten angeboten:
|
||||
Abhängig vom Zustand des Streaming-Devices werden zum Start von Aktionen unterschiedliche Drucktasten angeboten: <br><br>
|
||||
<ul>
|
||||
<table>
|
||||
<colgroup> <col width=25%> <col width=75%> </colgroup>
|
||||
@ -1042,8 +1056,13 @@ attr <name> genericStrmHtmlTag <img $HTMLATTR
|
||||
<br><br>
|
||||
|
||||
<ul>
|
||||
Ein SSCam Streaming-Device wird durch den SSCam Befehl "set <name> createStreamDev" erstellt.
|
||||
Siehe auch die Beschreibung zum SSCam <a href="#SSCamcreateStreamDev">"createStreamDev"</a> Befehl.
|
||||
Ein SSCam Streaming-Device wird durch den SSCam Befehl <br><br>
|
||||
|
||||
<ul>
|
||||
set <name> createStreamDev <Device Typ> <br><br>
|
||||
</ul>
|
||||
|
||||
erstellt. Siehe auch die Beschreibung zum SSCam <a href="#SSCamcreateStreamDev">"createStreamDev"</a> Befehl.
|
||||
<br><br>
|
||||
</ul>
|
||||
|
||||
@ -1052,7 +1071,7 @@ attr <name> genericStrmHtmlTag <img $HTMLATTR
|
||||
<ul>
|
||||
|
||||
<ul>
|
||||
<li><b>popupStream [OK | <Sekunden>]</b> <br>
|
||||
<li><b>popupStream [OK | <Sekunden>]</b> (nur wenn MODEL != master)<br>
|
||||
|
||||
Der aktuelle Streaminhalt wird in einem Popup-Fenster dargestellt. Mit dem Attribut "popupWindowSize" kann die
|
||||
Darstellungsgröße eingestellt werden. Das Attribut "popupStreamTo" legt die Art des Popup-Fensters fest.
|
||||
@ -1064,6 +1083,14 @@ attr <name> genericStrmHtmlTag <img $HTMLATTR
|
||||
</ul>
|
||||
<br>
|
||||
|
||||
<ul>
|
||||
<li><b>adopt <Streaming Device> </b> (nur wenn MODEL = master)<br>
|
||||
|
||||
Ein Streaming Device vom Type <b>master</b> übernimmt (adoptiert) den Content eines anderen definierten Streaming Devices.
|
||||
</li>
|
||||
</ul>
|
||||
<br>
|
||||
|
||||
</ul>
|
||||
<br>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user