Author: sebawagner
Date: Sun Apr 15 08:41:51 2012
New Revision: 1326275
URL: http://svn.apache.org/viewvc?rev=1326275&view=rev
Log:
OPENMEETINGS-165 Fix Interview Converter to use same mechanism, fix duplicated
recording of FLV streams in interview.
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/BaseStreamWriter.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamAudioWriter.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamVideoWriter.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java?rev=1326275&r1=1326274&r2=1326275&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/converter/FlvInterviewConverter.java
Sun Apr 15 08:41:51 2012
@@ -216,8 +216,7 @@ public class FlvInterviewConverter exten
for (FlvRecordingMetaData flvRecordingMetaData :
metaDataList) {
// FLV to 24 FPS Sequence AVI
- String inputFlv = streamFolderName + "AV_"
- +
flvRecordingMetaData.getStreamName() + ".flv";
+ String inputFlv = streamFolderName +
flvRecordingMetaData.getStreamName() + ".flv";
File inputFlvFile = new File(inputFlv);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/BaseStreamWriter.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/BaseStreamWriter.java?rev=1326275&r1=1326274&r2=1326275&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/BaseStreamWriter.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/BaseStreamWriter.java
Sun Apr 15 08:41:51 2012
@@ -45,19 +45,16 @@ public abstract class BaseStreamWriter i
protected String streamName = "";
- protected boolean isInterview;
private final BlockingQueue<CachedEvent> queue = new
LinkedBlockingQueue<CachedEvent>();
public BaseStreamWriter(String streamName, IScope scope,
- Long flvRecordingMetaDataId, boolean isScreenData,
- boolean isInterview) {
+ Long flvRecordingMetaDataId, boolean isScreenData) {
this.startedSessionTimeDate = new Date();
this.isScreenData = isScreenData;
this.streamName = streamName;
this.flvRecordingMetaDataId = flvRecordingMetaDataId;
this.scope = scope;
- this.isInterview = isInterview;
try {
init();
} catch (IOException ex) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamAudioWriter.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamAudioWriter.java?rev=1326275&r1=1326274&r2=1326275&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamAudioWriter.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamAudioWriter.java
Sun Apr 15 08:41:51 2012
@@ -36,16 +36,19 @@ public class StreamAudioWriter extends B
// Autowire is not possible
protected final FlvRecordingMetaDeltaDaoImpl flvRecordingMetaDeltaDao;
protected final FlvRecordingMetaDataDaoImpl flvRecordingMetaDataDao;
+
+ private boolean isInterview = false;
public StreamAudioWriter(String streamName, IScope scope,
Long flvRecordingMetaDataId, boolean isScreenData,
boolean isInterview,
FlvRecordingMetaDeltaDaoImpl flvRecordingMetaDeltaDao,
FlvRecordingMetaDataDaoImpl flvRecordingMetaDataDao) {
- super(streamName, scope, flvRecordingMetaDataId, isScreenData,
isInterview);
+ super(streamName, scope, flvRecordingMetaDataId, isScreenData);
this.flvRecordingMetaDeltaDao = flvRecordingMetaDeltaDao;
this.flvRecordingMetaDataDao = flvRecordingMetaDataDao;
+ this.isInterview = isInterview;
FlvRecordingMetaData flvRecordingMetaData =
flvRecordingMetaDataDao.
getFlvRecordingMetaDataById(flvRecordingMetaDataId);
@@ -59,7 +62,7 @@ public class StreamAudioWriter extends B
try {
// We only care about audio at this moment
- if (streampacket.getDataType() == 8) {
+ if (this.isInterview || streampacket.getDataType() ==
8) {
if (streampacket.getTimestamp() <= 0) {
log.warn("Negative TimeStamp");
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamVideoWriter.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamVideoWriter.java?rev=1326275&r1=1326274&r2=1326275&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamVideoWriter.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/flvrecord/listener/async/StreamVideoWriter.java
Sun Apr 15 08:41:51 2012
@@ -31,7 +31,7 @@ public class StreamVideoWriter extends B
boolean isInterview,
FlvRecordingMetaDataDaoImpl flvRecordingMetaDataDao) {
- super(streamName, scope, flvRecordingMetaDataId, isScreenData,
isInterview);
+ super(streamName, scope, flvRecordingMetaDataId, isScreenData);
this.flvRecordingMetaDataDao = flvRecordingMetaDataDao;
@@ -96,13 +96,13 @@ public class StreamVideoWriter extends B
tag.setTimestamp(timeStamp);
tag.setBody(data);
- if (this.isInterview) {
- if (timeStamp <= 500) {
- // We will cut the first 0.5 seconds
- // The First seconds seem to break the
Recording Video often
- return;
- }
- }
+// if (this.isInterview) {
+// if (timeStamp <= 500) {
+// // We will cut the first 0.5 seconds
+// // The First seconds seem to break the
Recording Video often
+// return;
+// }
+// }
writer.writeTag(tag);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java?rev=1326275&r1=1326274&r2=1326275&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java
Sun Apr 15 08:41:51 2012
@@ -341,19 +341,6 @@ public class FLVRecorderService implemen
log.debug("### isScreenData " + isScreenData);
log.debug("### isInterview " + isInterview);
- if (isInterview) {
-
- StreamVideoListener
streamScreenListener = new StreamVideoListener("AV_"
-
+ streamName,
conn.getScope(),
-
flvRecordingMetaDataId, isScreenData, isInterview,
-
flvRecordingMetaDataDao);
-
-
streamListeners.put(flvRecordingMetaDataId, streamScreenListener);
-
- // Additionally record the Video Signal
-
stream.addStreamListener(streamScreenListener);
- }
-
StreamAudioListener streamAudioListener = new
StreamAudioListener(streamName,
conn.getScope(),
flvRecordingMetaDataId, isScreenData,
isInterview,
flvRecordingMetaDeltaDao, flvRecordingMetaDataDao);
