svn commit: r1555325 - in /openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener: StreamListener.java async/StreamAudioWriter.java

[solomax]

Author: solomax
Date: Sat Jan  4 06:06:55 2014
New Revision: 1555325

URL: http://svn.apache.org/r1555325
Log:
[OPENMEETINGS-337] Frames are not skipped in case of audio-only interview;
Logs are improved

Modified:
    
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/StreamListener.java
    
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java

Modified: 
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/StreamListener.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/StreamListener.java?rev=1555325&r1=1555324&r2=1555325&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/StreamListener.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/StreamListener.java
 Sat Jan  4 06:06:55 2014
@@ -45,8 +45,7 @@ public class StreamListener implements I
                        boolean isScreenData, boolean isInterview, 
FlvRecordingMetaDataDao metaDataDao
                        , FlvRecordingMetaDeltaDao metaDeltaDao) {
                streamWriter = isAudio
-                       ? new StreamAudioWriter(streamName, scope, metaDataId, 
isScreenData, isInterview, metaDataDao
-                                       , metaDeltaDao)
+                       ? new StreamAudioWriter(streamName, scope, metaDataId, 
isScreenData, isInterview, metaDataDao, metaDeltaDao)
                        : new StreamVideoWriter(streamName, scope, metaDataId, 
isScreenData, isInterview, metaDataDao);
        }
 
@@ -61,6 +60,9 @@ public class StreamListener implements I
                                cachedEvent.setFrameType(((VideoData) 
streampacket).getFrameType());
                        }
 
+                       if (log.isTraceEnabled()) {
+                               log.trace("Packet recieved. type: {} frame 
type: {}", cachedEvent.getDataType(), cachedEvent.getFrameType());
+                       }
                        streamWriter.append(cachedEvent);
                } catch (Exception e) {
                        log.error("[packetReceived]", e);

Modified: 
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java?rev=1555325&r1=1555324&r2=1555325&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java
 Sat Jan  4 06:06:55 2014
@@ -75,7 +75,8 @@ public class StreamAudioWriter extends B
                                        log.warn("Negative TimeStamp");
                                        return;
                                }
-                               if (isInterview && startTimeStamp == -1 && 
KEYFRAME != streampacket.getFrameType()) {
+                               // we should not skip audio data in case it is 
Audio only interview
+                               if (isInterview && isScreenData && 
startTimeStamp == -1 && KEYFRAME != streampacket.getFrameType()) {
                                        //skip until keyframe
                                        log.trace("no KEYFRAME, skipping");
                                        return;