[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1946] recording after detaching camera is fixed

[solomax]

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

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


The following commit(s) were added to refs/heads/4.0.x by this push:
     new 749c06c  [OPENMEETINGS-1946] recording after detaching camera is fixed
749c06c is described below

commit 749c06cd77c80e836bedfe58b32ab5fd4bc6c8ef
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Tue Oct 9 10:01:45 2018 +0700

    [OPENMEETINGS-1946] recording after detaching camera is fixed
---
 .../openmeetings/core/data/record/listener/async/StreamAudioWriter.java | 2 +-
 .../java/org/apache/openmeetings/core/service/RecordingService.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java
index f4ccdaa..6f94f89 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java
@@ -67,7 +67,7 @@ public class StreamAudioWriter extends BaseStreamWriter {
                                        return;
                                }
                                // we should not skip audio data in case it is 
Audio only interview
-                               if (isInterview && isScreenData && 
startTimeStamp == -1 && KEYFRAME != streampacket.getFrameType()) {
+                               if ((isInterview || isScreenData) && 
startTimeStamp == -1 && KEYFRAME != streampacket.getFrameType()) {
                                        //skip until keyframe
                                        log.trace("##REC:: no KEYFRAME, 
skipping");
                                        return;
diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/RecordingService.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/RecordingService.java
index 3b99d55..0dd78d3 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/RecordingService.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/service/RecordingService.java
@@ -362,7 +362,7 @@ public class RecordingService {
                                Long metaId = metaDataDao.add(recordingId, now, 
audioOnly, videoOnly, false, streamName, rcl.getSid());
 
                                // Start FLV recording
-                               addListener(conn, broadcastId, streamName, 
metaId, !audioOnly, isInterview);
+                               addListener(conn, broadcastId, streamName, 
metaId, false, isInterview);
 
                                // Add Meta Data
                                rcl.setMetaId(metaId);