BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Begin debug to restream video data

Browse Source
This commit is contained in:
Hugo Lazzari 2014-01-13 09:20:24 -02:00
parent e9960681ba
commit ce4107bf50
6 changed files with 264 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bbb-video/build.gradle
View File

@ -82,6 +82,7 @@ dependencies {
// Red5
providedCompile 'org/red5:red5:1.0r4643@jar'
compile files('./lib/red5-client-1.0.2-RC1.jar')
// Logging
providedCompile 'ch.qos.logback:logback-core:1.0.9@jar'

26
bbb-video/src/main/java/org/bigbluebutton/app/video/StreamState.java Normal file
View File

@ -0,0 +1,26 @@
/*
* RED5 Open Source Flash Server - http://code.google.com/p/red5/
*
* Copyright 2006-2012 by respective authors (see below). All rights reserved.
*
* 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.
*/
package org.bigbluebutton.app.video;
public enum StreamState {
STOPPED, CONNECTING, STREAM_CREATING, PUBLISHING, PUBLISHED, UNPUBLISHED;
}

193
bbb-video/src/main/java/org/bigbluebutton/app/video/StreamingProxy.java Normal file
View File

@ -0,0 +1,193 @@
package org.bigbluebutton.app.video;
/*
* RED5 Open Source Flash Server - http://code.google.com/p/red5/
*
* Copyright (c) 2006-2010 by respective authors (see below). All rights reserved.
*
* This library is free software; you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
* Foundation; either version 2.1 of the License, or (at your option) any later
* version.
*
* This library is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License along
* with this library; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.red5.io.utils.ObjectMap;
import org.red5.server.api.service.IPendingServiceCall;
import org.red5.server.api.service.IPendingServiceCallback;
import org.red5.server.messaging.IMessage;
import org.red5.server.messaging.IMessageComponent;
import org.red5.server.messaging.IPipe;
import org.red5.server.messaging.IPipeConnectionListener;
import org.red5.server.messaging.IPushableConsumer;
import org.red5.server.messaging.OOBControlMessage;
import org.red5.server.messaging.PipeConnectionEvent;
;
import org.red5.server.net.rtmp.event.Notify;
import org.red5.server.net.rtmp.status.StatusCodes;
import org.red5.server.stream.message.RTMPMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.red5.client.net.rtmp.RTMPClient;
import org.red5.client.net.rtmp.INetStreamEventHandler;
/**
* A proxy to publish stream from server to server.
*
* TODO: Use timer to monitor the connect/stream creation.
*
* @author Steven Gong (steven.gong@gmail.com)
* @author Andy Shaules (bowljoman@hotmail.com)
*/
public class StreamingProxy implements IPushableConsumer, IPipeConnectionListener, INetStreamEventHandler,
IPendingServiceCallback {
private static Logger log = LoggerFactory.getLogger(StreamingProxy.class);
private List<IMessage> frameBuffer = new ArrayList<IMessage>();
public static final String LIVE = "live";
public static final String RECORD = "record";
public static final String APPEND = "append";
private static final int STOPPED = 0;
private static final int CONNECTING = 1;
private static final int STREAM_CREATING = 2;
private static final int PUBLISHING = 3;
private static final int PUBLISHED = 4;
private String host;
private int port;
private String app;
private RTMPClient rtmpClient;
private int state;
private String publishName;
private int streamId;
private String publishMode;
public void init() {
rtmpClient = new RTMPClient();
state = STOPPED;
}
public synchronized void start(String publishName, String publishMode, Object[] params) {
System.out.println("CONECTANDO");
state = CONNECTING;
this.publishName = publishName;
this.publishMode = publishMode;
Map<String, Object> defParams = rtmpClient.makeDefaultConnectionParams(host, port, app);
System.out.println(host);
System.out.println(defParams);
System.out.println(port);
System.out.println(params);
rtmpClient.connect(host, port, defParams, this, params);
}
public synchronized void stop() {
if (state >= STREAM_CREATING) {
rtmpClient.disconnect();
}
state = STOPPED;
}
public void onPipeConnectionEvent(PipeConnectionEvent event) {
// nothing to do
}
synchronized public void pushMessage(IPipe pipe, IMessage message) throws IOException {
if (state >= PUBLISHED && message instanceof RTMPMessage) {
RTMPMessage rtmpMsg = (RTMPMessage) message;
rtmpClient.publishStreamData(streamId, rtmpMsg);
} else {
frameBuffer.add(message);
}
}
public void onOOBControlMessage(IMessageComponent source, IPipe pipe, OOBControlMessage oobCtrlMsg) {
}
public void setHost(String host) {
this.host = host;
}
public void setPort(int port) {
this.port = port;
}
public void setApp(String app) {
this.app = app;
}
public synchronized void onStreamEvent(Notify notify) {
log.debug("onStreamEvent: {}", notify);
ObjectMap<?, ?> map = (ObjectMap<?, ?>) notify.getCall().getArguments()[0];
String code = (String) map.get("code");
log.debug("<:{}", code);
if (StatusCodes.NS_PUBLISH_START.equals(code)) {
state = PUBLISHED;
rtmpClient.invoke("FCPublish", new Object[] { publishName }, this);
while (frameBuffer.size() > 0) {
rtmpClient.publishStreamData(streamId, frameBuffer.remove(0));
}
}
}
public synchronized void resultReceived(IPendingServiceCall call) {
System.out.println("RECEBI RESULTADO");
System.out.println("RECEBI RESULTADO");
System.out.println("RECEBI RESULTADO");
System.out.println("RECEBI RESULTADO");
System.out.println("RECEBI RESULTADO");
System.out.println("RECEBI RESULTADO");
System.out.println("RECEBI RESULTADO");
System.out.println("RECEBI RESULTADO");
System.out.println("RECEBI RESULTADO");
log.debug("resultReceived:> {}", call.getServiceMethodName());
if ("connect".equals(call.getServiceMethodName())) {
state = STREAM_CREATING;
System.out.println("CRIANDO STREAM");
rtmpClient.createStream(this);
} else if ("createStream".equals(call.getServiceMethodName())) {
System.out.println("CRIANDO STREAM 2");
state = PUBLISHING;
Object result = call.getResult();
if (result instanceof Integer) {
Integer streamIdInt = (Integer) result;
streamId = streamIdInt.intValue();
log.debug("Publishing: {}", state);
rtmpClient.publish(streamIdInt.intValue(), publishName, publishMode, this);
} else {
rtmpClient.disconnect();
state = STOPPED;
}
}
}
}

32
bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
View File

@ -25,6 +25,9 @@ import org.red5.server.adapter.MultiThreadedApplicationAdapter;
import org.red5.server.api.IConnection;
import org.red5.server.api.Red5;
import org.red5.server.api.scope.IScope;
import org.red5.server.api.scope.IBasicScope;
import org.red5.server.api.scope.IBroadcastScope;
import org.red5.server.api.scope.ScopeType;
import org.red5.server.api.stream.IBroadcastStream;
import org.red5.server.api.stream.IServerStream;
import org.red5.server.api.stream.IStreamListener;
@ -70,6 +73,17 @@ public class VideoApplication extends MultiThreadedApplicationAdapter {
super.streamPublishStart(stream);
}
public IBroadcastScope getBroadcastScope(IScope scope, String name) {
IBasicScope basicScope = scope.getBasicScope(ScopeType.BROADCAST, name);
if (!(basicScope instanceof IBroadcastScope)) {
return null;
} else {
return (IBroadcastScope) basicScope;
}
}
@Override
public void streamBroadcastStart(IBroadcastStream stream) {
IConnection conn = Red5.getConnectionLocal();
@ -83,6 +97,24 @@ public class VideoApplication extends MultiThreadedApplicationAdapter {
stream.addStreamListener(listener);
streamListeners.put(conn.getScope().getName() + "-" + stream.getPublishedName(), listener);
}
System.out.println("TESTE " + stream.getPublishedName());
System.out.println("TESTE");
System.out.println("TESTE");
System.out.println("TESTE");
System.out.println("TESTE");
System.out.println("TESTE");
IScope scope = stream.getScope();
IBroadcastScope bsScope = getBroadcastScope(scope, stream.getPublishedName());
StreamingProxy proxy = new StreamingProxy();
proxy.setHost("0.0.0.0");
proxy.setApp("video");
proxy.setPort(1935);
proxy.init();
bsScope.subscribe(proxy, null);
proxy.start("MY_STRING", StreamingProxy.LIVE, null);
//streamingProxyMap.put(stream.getPublishedName(), proxy);
//stream.addStreamListener(this);
}
@Override

1
bigbluebutton-client/src/VideoconfModule.mxml
View File

@ -45,6 +45,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
public function get uri():String {
LogUtil.debug("URL eh: " + _attributes.uri + "/" + _attributes.room);
return _attributes.uri + "/" + _attributes.room;
}

10
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoWindow.mxml
View File

@ -208,9 +208,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
filter.divisor = videoOptions.filterDivisor;
_video.filters = [filter];
}
LogUtil.debug("PLyaying: " + stream);
ns.play(stream);
this.streamName = stream;
//ns.play(stream);
ns.play("MY_STRING");
LogUtil.debug("Playing MY_STRING 2");
this.streamName = "MY_STRING";
this.width = _video.width + paddingHorizontal;
this.height = _video.height + paddingVertical;
@ -233,6 +236,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
private function onNetStatus(e:NetStatusEvent):void{
LogUtil.debug(e.info.code);
switch(e.info.code){
case "NetStream.Publish.Start":
LogUtil.debug("NetStream.Publish.Start for broadcast stream " + streamName);
@ -253,6 +258,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
case "NetStream.Play.NoSupportedTrackFound":
LogUtil.debug("The MP4 doesn't contain any supported tracks");
break;
}
}