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 2013/12/05 05:54:29 UTC
svn commit: r1548014 - in
/openmeetings/branches/2.x/src/org/apache/openmeetings:
data/flvrecord/listener/BaseStreamListener.java
data/flvrecord/listener/StreamListener.java remote/FLVRecorderService.java
Author: solomax
Date: Thu Dec 5 04:54:29 2013
New Revision: 1548014
URL: http://svn.apache.org/r1548014
Log:
[OPENMEETINGS-556] code clean up
Removed:
openmeetings/branches/2.x/src/org/apache/openmeetings/data/flvrecord/listener/BaseStreamListener.java
Modified:
openmeetings/branches/2.x/src/org/apache/openmeetings/data/flvrecord/listener/StreamListener.java
openmeetings/branches/2.x/src/org/apache/openmeetings/remote/FLVRecorderService.java
Modified: openmeetings/branches/2.x/src/org/apache/openmeetings/data/flvrecord/listener/StreamListener.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/data/flvrecord/listener/StreamListener.java?rev=1548014&r1=1548013&r2=1548014&view=diff
==============================================================================
--- openmeetings/branches/2.x/src/org/apache/openmeetings/data/flvrecord/listener/StreamListener.java (original)
+++ openmeetings/branches/2.x/src/org/apache/openmeetings/data/flvrecord/listener/StreamListener.java Thu Dec 5 04:54:29 2013
@@ -31,21 +31,23 @@ import org.apache.openmeetings.data.flvr
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.scope.IScope;
import org.red5.server.api.stream.IBroadcastStream;
+import org.red5.server.api.stream.IStreamListener;
import org.red5.server.api.stream.IStreamPacket;
import org.red5.server.net.rtmp.event.VideoData;
import org.slf4j.Logger;
-public class StreamListener extends BaseStreamListener {
+public class StreamListener implements IStreamListener {
private static final Logger log = Red5LoggerFactory.getLogger(StreamListener.class, webAppRootKey);
private final BaseStreamWriter streamWriter;
- public StreamListener(boolean isAudio, String streamName, IScope scope, Long flvRecordingMetaDataId, boolean isScreenData,
- boolean isInterview, FlvRecordingMetaDataDao metaDataDao, FlvRecordingMetaDeltaDao metaDeltaDao) {
+ public StreamListener(boolean isAudio, String streamName, IScope scope, Long metaDataId,
+ boolean isScreenData, boolean isInterview, FlvRecordingMetaDataDao metaDataDao
+ , FlvRecordingMetaDeltaDao metaDeltaDao) {
streamWriter = isAudio
- ? new StreamAudioWriter(streamName, scope, flvRecordingMetaDataId, isScreenData, isInterview,
- metaDataDao, metaDeltaDao)
- : new StreamVideoWriter(streamName, scope, flvRecordingMetaDataId, isScreenData, isInterview, metaDataDao);
+ ? new StreamAudioWriter(streamName, scope, metaDataId, isScreenData, isInterview, metaDataDao
+ , metaDeltaDao)
+ : new StreamVideoWriter(streamName, scope, metaDataId, isScreenData, isInterview, metaDataDao);
}
public void packetReceived(IBroadcastStream broadcastStream, IStreamPacket streampacket) {
@@ -56,7 +58,7 @@ public class StreamListener extends Base
cachedEvent.setTimestamp(streampacket.getTimestamp());
cachedEvent.setCurrentTime(new Date());
if (streampacket instanceof VideoData) {
- cachedEvent.setFrameType(((VideoData)streampacket).getFrameType());
+ cachedEvent.setFrameType(((VideoData) streampacket).getFrameType());
}
streamWriter.append(cachedEvent);
@@ -65,9 +67,7 @@ public class StreamListener extends Base
}
}
- @Override
public void closeStream() {
streamWriter.stop();
}
-
}
Modified: openmeetings/branches/2.x/src/org/apache/openmeetings/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/remote/FLVRecorderService.java?rev=1548014&r1=1548013&r2=1548014&view=diff
==============================================================================
--- openmeetings/branches/2.x/src/org/apache/openmeetings/remote/FLVRecorderService.java (original)
+++ openmeetings/branches/2.x/src/org/apache/openmeetings/remote/FLVRecorderService.java Thu Dec 5 04:54:29 2013
@@ -38,7 +38,6 @@ import org.apache.openmeetings.data.flvr
import org.apache.openmeetings.data.flvrecord.converter.FlvInterviewConverterTask;
import org.apache.openmeetings.data.flvrecord.converter.FlvInterviewReConverterTask;
import org.apache.openmeetings.data.flvrecord.converter.FlvRecorderConverterTask;
-import org.apache.openmeetings.data.flvrecord.listener.BaseStreamListener;
import org.apache.openmeetings.data.flvrecord.listener.StreamListener;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.data.user.dao.UsersDao;
@@ -75,7 +74,7 @@ public class FLVRecorderService implemen
* But each listener has an asynchronous component that needs to be closed
* no matter how the user leaves the application!
*/
- private static final Map<Long,BaseStreamListener> streamListeners = new HashMap<Long,BaseStreamListener>();
+ private static final Map<Long, StreamListener> streamListeners = new HashMap<Long, StreamListener>();
// Spring Beans
@Autowired
@@ -360,7 +359,7 @@ public class FLVRecorderService implemen
Object streamToClose = scopeApplicationAdapter.getBroadcastStream(
conn.getScope(), broadcastId);
- BaseStreamListener listenerAdapter = streamListeners.get(flvRecordingMetaDataId);
+ StreamListener listenerAdapter = streamListeners.get(flvRecordingMetaDataId);
log.debug("Stream Closing :: " + flvRecordingMetaDataId);