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

Merge pull request #398 from fcecagno/fix-h263-stream

Browse Source 
Fix start/stop webcam events for the intermediary video formats
This commit is contained in:
Pedro Beschorner Marin 2017-04-17 17:49:41 -03:00 committed by GitHub
commit 7973a4f8de
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,12 +223,6 @@ public class VideoApplication extends MultiThreadedApplicationAdapter {
String meetingId = conn.getScope().getName();
String streamId = stream.getPublishedName();
publisher.userSharedWebcamMessage(meetingId, userId, streamId);
VideoStreamListener listener = new VideoStreamListener(conn.getScope(), stream, recordVideoStream, userId, packetTimeout);
listener.setEventRecordingService(recordingService);
stream.addStreamListener(listener);
streamListeners.put(conn.getScope().getName() + "-" + stream.getPublishedName(), listener);
addH263PublishedStream(streamId);
if (streamId.contains("/")) {
if(VideoRotator.getDirection(streamId) != null) {
@ -238,6 +232,11 @@ public class VideoApplication extends MultiThreadedApplicationAdapter {
}
else if (recordVideoStream) {
recordStream(stream);
publisher.userSharedWebcamMessage(meetingId, userId, streamId);
VideoStreamListener listener = new VideoStreamListener(conn.getScope(), stream, recordVideoStream, userId, packetTimeout);
listener.setEventRecordingService(recordingService);
stream.addStreamListener(listener);
streamListeners.put(conn.getScope().getName() + "-" + stream.getPublishedName(), listener);
}
}
@ -268,15 +267,22 @@ public class VideoApplication extends MultiThreadedApplicationAdapter {
String meetingId = conn.getScope().getName();
String streamId = stream.getPublishedName();
publisher.userUnshareWebcamRequestMessage(meetingId, userId, streamId);
IStreamListener listener = streamListeners.remove(scopeName + "-" + stream.getPublishedName());
if (listener != null) {
((VideoStreamListener) listener).streamStopped();
stream.removeStreamListener(listener);
}
if (recordVideoStream) {
if (streamId.contains("/")) {
removeH263ConverterIfNeeded(streamId);
if(videoRotators.containsKey(streamId)) {
// Stop rotator
videoRotators.remove(streamId).stop();
}
removeH263PublishedStream(streamId);
} else if (recordVideoStream) {
publisher.userUnshareWebcamRequestMessage(meetingId, userId, streamId);
long publishDuration = (System.currentTimeMillis() - stream.getCreationTime()) / 1000;
log.info("Stop recording event for stream=[{}] meeting=[{}]", stream.getPublishedName(), scopeName);
Map<String, String> event = new HashMap<String, String>();
@ -288,13 +294,6 @@ public class VideoApplication extends MultiThreadedApplicationAdapter {
event.put("eventName", "StopWebcamShareEvent");
recordingService.record(scopeName, event);
}
removeH263ConverterIfNeeded(streamId);
if(videoRotators.containsKey(streamId)) {
// Stop rotator
videoRotators.remove(streamId).stop();
}
removeH263PublishedStream(streamId);
}
/**