You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/04/20 07:55:13 UTC

[openmeetings] branch master updated: Doc update: example of camera streaming is added

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 6799c68  Doc update: example of camera streaming is added
6799c68 is described below

commit 6799c6877b2d27a30660f70148d8f8bfad36fbc1
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Apr 20 14:54:23 2018 +0700

    Doc update: example of camera streaming is added
---
 openmeetings-server/src/site/xdoc/ExternalVideo.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/openmeetings-server/src/site/xdoc/ExternalVideo.xml b/openmeetings-server/src/site/xdoc/ExternalVideo.xml
index d8f78ad..2907f79 100644
--- a/openmeetings-server/src/site/xdoc/ExternalVideo.xml
+++ b/openmeetings-server/src/site/xdoc/ExternalVideo.xml
@@ -21,13 +21,21 @@
 	</properties>
 	<body>
 		<section name="Connecting external video source">
-			correct ffmpeg command for testing (width/height only works if both specified)
-			<source>
+			<div>
+				correct ffmpeg command for testing (width/height only works if both specified)
+				<source>
 <![CDATA[
 ffmpeg -re -i Avengers2.mp4 -vcodec flv -f flv -rtmp_conn "O:1 NS:sid:SID_OF_EXISTENT_USER NN:width:720 NN:height:480 O:0" rtmp://localhost:1935/openmeetings/ROOM_ID/UNIQUE_BROADCAST_ID_STRING
 ]]>
-			</source>
-			SID_OF_EXISTENT_USER == Admin->Connections -> client "sid" parameter (NOT broadcastId, NOT uid)
+				</source>
+				Sending video from external camera on Linux: (more info <a href="https://trac.ffmpeg.org/wiki/Capture/Webcam">here</a>)
+				<source>
+<![CDATA[
+ffmpeg -re -f v4l2 -framerate 30 -video_size 720x480 -i /dev/video0 -vcodec flv -f flv -rtmp_conn "O:1 NS:sid:SID_OF_EXISTENT_USER NN:width:720 NN:height:480 O:0" rtmp://localhost:1935/openmeetings/ROOM_ID/UNIQUE_BROADCAST_ID_STRING
+]]>
+				</source>
+				SID_OF_EXISTENT_USER == Admin->Connections -> client "sid" parameter (NOT broadcastId, NOT uid)
+			</div>
 		</section>
 	</body>
 </document>

-- 
To stop receiving notification emails like this one, please contact
solomax@apache.org.