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 2017/09/14 07:06:12 UTC
openmeetings git commit: no jira: Documentation related to external
room video is added
Repository: openmeetings
Updated Branches:
refs/heads/3.3.x 78078ead5 -> ccfeabbfb
no jira: Documentation related to external room video is added
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/ccfeabbf
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/ccfeabbf
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/ccfeabbf
Branch: refs/heads/3.3.x
Commit: ccfeabbfb0643b3cbc56a9c6be0b0e740d2ba0c0
Parents: 78078ea
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Sep 14 14:06:04 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Sep 14 14:06:04 2017 +0700
----------------------------------------------------------------------
openmeetings-server/src/site/site.xml | 1 +
.../src/site/xdoc/ExternalVideo.xml | 33 ++++++++++++++++++++
2 files changed, 34 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ccfeabbf/openmeetings-server/src/site/site.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/site.xml b/openmeetings-server/src/site/site.xml
index 77d00a0..4cf92e8 100644
--- a/openmeetings-server/src/site/site.xml
+++ b/openmeetings-server/src/site/site.xml
@@ -61,6 +61,7 @@
<item name="VoIP and SIP" href="/voip-sip-integration.html" />
<item name="Errors table" href="/errorvalues.html" />
<item name="CalDAV and Google Calendar integration" href="/CalDAVandGCal.html" />
+ <item name="External Video/Camera" href="/ExternalVideo.html" />
</item>
<item name="Plugins" href="#plugins">
<item name="Moodle Plugin" href="/MoodlePlugin.html" />
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ccfeabbf/openmeetings-server/src/site/xdoc/ExternalVideo.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/ExternalVideo.xml b/openmeetings-server/src/site/xdoc/ExternalVideo.xml
new file mode 100644
index 0000000..21b75f8
--- /dev/null
+++ b/openmeetings-server/src/site/xdoc/ExternalVideo.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+ <properties>
+ <title>External Video/Camera</title>
+ <author email="dev@openmeetings.apache.org">Apache OpenMeetings Team</author>
+ </properties>
+ <body>
+ <section name="Connecting external video source">
+ 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:securityCode: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)
+ </section>
+ </body>
+</document>