Revision: 2831
Author: seba.wagner
Date: Fri Jan 22 09:45:44 2010
Log: Fixes Issue 1097
This should fix the wrong calculated paddings
http://code.google.com/p/openmeetings/source/detail?r=2831
Modified:
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/listener/StreamAudioListener.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/FLVRecorderService.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/listener/StreamAudioListener.java
Thu Jan 21 07:19:17 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/flvrecord/listener/StreamAudioListener.java
Fri Jan 22 09:45:44 2010
@@ -25,6 +25,8 @@
private int startTimeStamp = -1;
+ private long initialDelta = 0;
+
private Integer lastTimeStamp = -1;
private int lastStreamPacketTimeStamp = -1;
@@ -165,11 +167,11 @@
//Calculate the delta between the initial start and the first
audio-packet data
- long delta = new Date().getTime() -
this.startedSessionTimeDate.getTime();
+ this.initialDelta = new Date().getTime() -
this.startedSessionTimeDate.getTime();
FlvRecordingMetaDelta flvRecordingMetaDelta = new
FlvRecordingMetaDelta();
-
flvRecordingMetaDelta.setDeltaTime(delta);
+
flvRecordingMetaDelta.setDeltaTime(this.initialDelta);
flvRecordingMetaDelta.setFlvRecordingMetaDataId(this.flvRecordingMetaDataId);
flvRecordingMetaDelta.setTimeStamp(0);
flvRecordingMetaDelta.setDebugStatus("INIT
AUDIO");
@@ -202,10 +204,10 @@
FlvRecordingMetaDeltaDaoImpl.getInstance().addFlvRecordingMetaDelta(flvRecordingMetaDelta);
//That will be not bigger then long
value
- startTimeStamp = (int)
(streampacket.getTimestamp());
+ this.startTimeStamp = (int)
(streampacket.getTimestamp());
//We have to set that to bypass the
initial delta
- lastTimeStamp = startTimeStamp;
+ //lastTimeStamp = startTimeStamp;
}
@@ -233,7 +235,7 @@
this.lastStreamPacketTimeStamp =
streampacket.getTimestamp();
- timeStamp -= startTimeStamp;
+ timeStamp -= this.startTimeStamp;
timeStamp += this.offset;
@@ -327,7 +329,7 @@
log.debug("lastStreamPacketTimeStamp :: "+this.lastStreamPacketTimeStamp);
log.debug("deltaRecordingTime ::
"+deltaRecordingTime);
- long deltaTimePaddingEnd = deltaRecordingTime -
this.lastTimeStamp;
+ long deltaTimePaddingEnd = deltaRecordingTime - this.lastTimeStamp -
this.initialDelta;
log.debug("deltaTimePaddingEnd ::
"+deltaTimePaddingEnd);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/FLVRecorderService.java
Thu Jan 21 07:19:17 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/FLVRecorderService.java
Fri Jan 22 09:45:44 2010
@@ -292,7 +292,7 @@
stream.addStreamListener(new StreamAudioListener(streamName,
conn.getScope(), flvRecordingMetaDataId, isScreenData));
}
//Just for Debug Purpose
- stream.saveAs(streamName+"_DEBUG", false);
+ //stream.saveAs(streamName+"_DEBUG", false);
} catch (Exception e) {
log.error("Error while saving stream: " + streamName,
e);
}
@@ -366,7 +366,7 @@
}
// Just for Debugging
- stream.stopRecording();
+ //stream.stopRecording();
} catch (Exception err) {
log.error("[stopRecordingShow]",err);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Tue Jan 19 11:54:27 2010
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
Fri Jan 22 09:45:44 2010
@@ -483,11 +483,6 @@
RoomClient currentClient =
this.clientListManager.getClientByStreamId(client.getId());
- log.debug("currentClient :1a: "+currentClient);
- log.debug("currentClient :1b:
"+currentClient.getIsScreenClient());
- log.debug("currentClient :2:
"+currentClient.getStreamPublishName());
- log.debug("currentClient :3:
"+currentClient.getSwfurl());
-
// //In case its a screen sharing we start a new Video for
that
// if (currentClient != null && currentClient.getIsScreenClient() !=
null && currentClient.getIsScreenClient()) {
//
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
