ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

openvidu-server: use RaiseBaseEvent method getTimestampMillis

pull/255/head
pabloFuente 2019-03-21 15:43:33 +01:00
parent f230057e2f
commit 43ca0d23b3
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openvidu-server/src/main/java/io/openvidu/server/kurento/core/KurentoParticipantEndpointConfig.java
View File

@ -42,7 +42,7 @@ public class KurentoParticipantEndpointConfig {
endpoint.getWebEndpoint().addMediaFlowInStateChangeListener(event -> { endpoint.getWebEndpoint().addMediaFlowInStateChangeListener(event -> {
String msg = "KMS event [MediaFlowInStateChange] -> endpoint: " + endpoint.getEndpointName() + " (" String msg = "KMS event [MediaFlowInStateChange] -> endpoint: " + endpoint.getEndpointName() + " ("
+ typeOfEndpoint + ") | state: " + event.getState() + " | pad: " + event.getPadName() + typeOfEndpoint + ") | state: " + event.getState() + " | pad: " + event.getPadName()
+ " | mediaType: " + event.getMediaType() + " | timestamp: " + event.getTimestamp(); + " | mediaType: " + event.getMediaType() + " | timestamp: " + event.getTimestampMillis();
KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner(), endpoint.getEndpointName(), KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
event.getMediaType(), endpoint.createdAt()); event.getMediaType(), endpoint.createdAt());
endpoint.kmsEvents.add(kmsEvent); endpoint.kmsEvents.add(kmsEvent);
@ -54,7 +54,7 @@ public class KurentoParticipantEndpointConfig {
endpoint.getWebEndpoint().addMediaFlowOutStateChangeListener(event -> { endpoint.getWebEndpoint().addMediaFlowOutStateChangeListener(event -> {
String msg = "KMS event [MediaFlowOutStateChange] -> endpoint: " + endpoint.getEndpointName() + " (" String msg = "KMS event [MediaFlowOutStateChange] -> endpoint: " + endpoint.getEndpointName() + " ("
+ typeOfEndpoint + ") | state: " + event.getState() + " | pad: " + event.getPadName() + typeOfEndpoint + ") | state: " + event.getState() + " | pad: " + event.getPadName()
+ " | mediaType: " + event.getMediaType() + " | timestamp: " + event.getTimestamp(); + " | mediaType: " + event.getMediaType() + " | timestamp: " + event.getTimestampMillis();
KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner(), endpoint.getEndpointName(), KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
event.getMediaType(), endpoint.createdAt()); event.getMediaType(), endpoint.createdAt());
endpoint.kmsEvents.add(kmsEvent); endpoint.kmsEvents.add(kmsEvent);
@ -65,7 +65,7 @@ public class KurentoParticipantEndpointConfig {
endpoint.getWebEndpoint().addIceGatheringDoneListener(event -> { endpoint.getWebEndpoint().addIceGatheringDoneListener(event -> {
String msg = "KMS event [IceGatheringDone] -> endpoint: " + endpoint.getEndpointName() + " (" String msg = "KMS event [IceGatheringDone] -> endpoint: " + endpoint.getEndpointName() + " ("
+ typeOfEndpoint + ") | timestamp: " + event.getTimestamp(); + typeOfEndpoint + ") | timestamp: " + event.getTimestampMillis();
KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(), KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
endpoint.createdAt()); endpoint.createdAt());
endpoint.kmsEvents.add(kmsEvent); endpoint.kmsEvents.add(kmsEvent);
@ -77,7 +77,7 @@ public class KurentoParticipantEndpointConfig {
endpoint.getWebEndpoint().addConnectionStateChangedListener(event -> { endpoint.getWebEndpoint().addConnectionStateChangedListener(event -> {
String msg = "KMS event [ConnectionStateChanged]: -> endpoint: " + endpoint.getEndpointName() + " (" String msg = "KMS event [ConnectionStateChanged]: -> endpoint: " + endpoint.getEndpointName() + " ("
+ typeOfEndpoint + ") | oldState: " + event.getOldState() + " | newState: " + event.getNewState() + typeOfEndpoint + ") | oldState: " + event.getOldState() + " | newState: " + event.getNewState()
+ " | timestamp: " + event.getTimestamp(); + " | timestamp: " + event.getTimestampMillis();
KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(), KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
endpoint.createdAt()); endpoint.createdAt());
endpoint.kmsEvents.add(kmsEvent); endpoint.kmsEvents.add(kmsEvent);
@ -91,7 +91,7 @@ public class KurentoParticipantEndpointConfig {
endpoint.selectedRemoteIceCandidate = event.getCandidatePair().getRemoteCandidate(); endpoint.selectedRemoteIceCandidate = event.getCandidatePair().getRemoteCandidate();
String msg = "KMS event [NewCandidatePairSelected]: -> endpoint: " + endpoint.getEndpointName() + " (" String msg = "KMS event [NewCandidatePairSelected]: -> endpoint: " + endpoint.getEndpointName() + " ("
+ typeOfEndpoint + ") | local: " + endpoint.selectedLocalIceCandidate + " | remote: " + typeOfEndpoint + ") | local: " + endpoint.selectedLocalIceCandidate + " | remote: "
+ endpoint.selectedRemoteIceCandidate + " | timestamp: " + event.getTimestamp(); + endpoint.selectedRemoteIceCandidate + " | timestamp: " + event.getTimestampMillis();
KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(), KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
endpoint.createdAt()); endpoint.createdAt());
endpoint.kmsEvents.add(kmsEvent); endpoint.kmsEvents.add(kmsEvent);
@ -103,7 +103,7 @@ public class KurentoParticipantEndpointConfig {
endpoint.getEndpoint().addMediaTranscodingStateChangeListener(event -> { endpoint.getEndpoint().addMediaTranscodingStateChangeListener(event -> {
String msg = "KMS event [MediaTranscodingStateChange]: -> endpoint: " + endpoint.getEndpointName() + " (" String msg = "KMS event [MediaTranscodingStateChange]: -> endpoint: " + endpoint.getEndpointName() + " ("
+ typeOfEndpoint + ") | state: " + event.getState().name() + " | mediaType: " + event.getMediaType() + typeOfEndpoint + ") | state: " + event.getState().name() + " | mediaType: " + event.getMediaType()
+ " | binName: " + event.getBinName() + " | timestamp: " + event.getTimestamp(); + " | binName: " + event.getBinName() + " | timestamp: " + event.getTimestampMillis();
KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner(), endpoint.getEndpointName(), KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
event.getMediaType(), endpoint.createdAt()); event.getMediaType(), endpoint.createdAt());
endpoint.kmsEvents.add(kmsEvent); endpoint.kmsEvents.add(kmsEvent);
@ -117,7 +117,7 @@ public class KurentoParticipantEndpointConfig {
String msg = "KMS event [IceComponentStateChange]: -> endpoint: " + endpoint.getEndpointName() + " (" String msg = "KMS event [IceComponentStateChange]: -> endpoint: " + endpoint.getEndpointName() + " ("
+ typeOfEndpoint + ") | state: " + event.getState().name() + " | componentId: " + typeOfEndpoint + ") | state: " + event.getState().name() + " | componentId: "
+ event.getComponentId() + " | streamId: " + event.getStreamId() + " | timestamp: " + event.getComponentId() + " | streamId: " + event.getStreamId() + " | timestamp: "
+ event.getTimestamp(); + event.getTimestampMillis();
KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(), KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
endpoint.createdAt()); endpoint.createdAt());
endpoint.kmsEvents.add(kmsEvent); endpoint.kmsEvents.add(kmsEvent);
@ -130,7 +130,7 @@ public class KurentoParticipantEndpointConfig {
endpoint.getWebEndpoint().addErrorListener(event -> { endpoint.getWebEndpoint().addErrorListener(event -> {
String msg = "KMS event [ERROR]: -> endpoint: " + endpoint.getEndpointName() + " (" + typeOfEndpoint String msg = "KMS event [ERROR]: -> endpoint: " + endpoint.getEndpointName() + " (" + typeOfEndpoint
+ ") | errorCode: " + event.getErrorCode() + " | description: " + event.getDescription() + ") | errorCode: " + event.getErrorCode() + " | description: " + event.getDescription()
+ " | timestamp: " + event.getTimestamp(); + " | timestamp: " + event.getTimestampMillis();
KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(), KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
endpoint.createdAt()); endpoint.createdAt());
endpoint.kmsEvents.add(kmsEvent); endpoint.kmsEvents.add(kmsEvent);

2
openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/KmsEvent.java
View File

@ -36,7 +36,7 @@ public class KmsEvent {
this.event = event; this.event = event;
this.participant = participant; this.participant = participant;
this.endpoint = endpointName; this.endpoint = endpointName;
this.timestamp = System.currentTimeMillis(); // TODO: Change to event.getTimestampMillis() this.timestamp = Long.parseLong(event.getTimestampMillis());
this.msSinceCreation = this.timestamp - createdAt; this.msSinceCreation = this.timestamp - createdAt;
this.removeSourceForJsonCompatibility(); this.removeSourceForJsonCompatibility();

4
openvidu-server/src/main/java/io/openvidu/server/recording/CompositeWrapper.java
View File

@ -70,7 +70,7 @@ public class CompositeWrapper {
this.recorderEndpoint.addRecordingListener(new EventListener<RecordingEvent>() { this.recorderEndpoint.addRecordingListener(new EventListener<RecordingEvent>() {
@Override @Override
public void onEvent(RecordingEvent event) { public void onEvent(RecordingEvent event) {
startTime = System.currentTimeMillis(); startTime = Long.parseLong(event.getTimestampMillis());
log.info("Recording started event for audio-only RecorderEndpoint of Composite in session {}", log.info("Recording started event for audio-only RecorderEndpoint of Composite in session {}",
session.getSessionId()); session.getSessionId());
startLatch.countDown(); startLatch.countDown();
@ -92,7 +92,7 @@ public class CompositeWrapper {
this.recorderEndpoint.addStoppedListener(new EventListener<StoppedEvent>() { this.recorderEndpoint.addStoppedListener(new EventListener<StoppedEvent>() {
@Override @Override
public void onEvent(StoppedEvent event) { public void onEvent(StoppedEvent event) {
endTime = System.currentTimeMillis(); endTime = Long.parseLong(event.getTimestampMillis());
log.info("Recording stopped event for audio-only RecorderEndpoint of Composite in session {}", log.info("Recording stopped event for audio-only RecorderEndpoint of Composite in session {}",
session.getSessionId()); session.getSessionId());
recorderEndpoint.release(); recorderEndpoint.release();

4
openvidu-server/src/main/java/io/openvidu/server/recording/service/SingleStreamRecordingService.java
View File

@ -199,7 +199,7 @@ public class SingleStreamRecordingService extends RecordingService {
@Override @Override
public void onEvent(RecordingEvent event) { public void onEvent(RecordingEvent event) {
recorders.get(session.getSessionId()).get(participant.getPublisherStreamId()) recorders.get(session.getSessionId()).get(participant.getPublisherStreamId())
.setStartTime(System.currentTimeMillis()); .setStartTime(Long.parseLong(event.getTimestampMillis()));
log.info("Recording started event for stream {}", participant.getPublisherStreamId()); log.info("Recording started event for stream {}", participant.getPublisherStreamId());
globalStartLatch.countDown(); globalStartLatch.countDown();
} }
@ -232,7 +232,7 @@ public class SingleStreamRecordingService extends RecordingService {
finalWrapper.getRecorder().addStoppedListener(new EventListener<StoppedEvent>() { finalWrapper.getRecorder().addStoppedListener(new EventListener<StoppedEvent>() {
@Override @Override
public void onEvent(StoppedEvent event) { public void onEvent(StoppedEvent event) {
finalWrapper.setEndTime(System.currentTimeMillis()); finalWrapper.setEndTime(Long.parseLong(event.getTimestampMillis()));
generateIndividualMetadataFile(finalWrapper); generateIndividualMetadataFile(finalWrapper);
log.info("Recording stopped event for stream {}", streamId); log.info("Recording stopped event for stream {}", streamId);
finalWrapper.getRecorder().release(); finalWrapper.getRecorder().release();