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

Merge pull request #722 from OpenVidu/kurento-6.18 

Change to new API methods for Kurento release 6.18.0
pull/731/head
Carlos Ruiz Ballesteros 2022-05-31 17:46:17 +02:00 committed by GitHub
parent a8fd0f8cf7 3425e601bf
commit f2f37ab42d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,8 +77,8 @@ public class KurentoParticipantEndpointConfig {
log.info(msg); log.info(msg);
}); });
finalEndpoint.addIceComponentStateChangeListener(event -> { finalEndpoint.addIceComponentStateChangedListener(event -> {
String msg = "KMS event [IceComponentStateChange]: -> endpoint: " + endpoint.getEndpointName() + " (" String msg = "KMS event [IceComponentStateChanged]: -> 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.getTimestampMillis(); + event.getTimestampMillis();
@ -90,8 +90,8 @@ public class KurentoParticipantEndpointConfig {
log.info(msg); log.info(msg);
}); });
finalEndpoint.addDataChannelOpenListener(event -> { finalEndpoint.addDataChannelOpenedListener(event -> {
String msg = "KMS event [DataChannelOpenEvent]: -> endpoint: " + endpoint.getEndpointName() + " (" String msg = "KMS event [DataChannelOpenedEvent]: -> endpoint: " + endpoint.getEndpointName() + " ("
+ typeOfEndpoint + ") | channelId: " + event.getChannelId() + " | timestamp: " + typeOfEndpoint + ") | channelId: " + event.getChannelId() + " | timestamp: "
+ event.getTimestampMillis(); + event.getTimestampMillis();
KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(), KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
@ -102,8 +102,8 @@ public class KurentoParticipantEndpointConfig {
log.info(msg); log.info(msg);
}); });
finalEndpoint.addDataChannelCloseListener(event -> { finalEndpoint.addDataChannelClosedListener(event -> {
String msg = "KMS event [DataChannelCloseEvent]: -> endpoint: " + endpoint.getEndpointName() + " (" String msg = "KMS event [DataChannelClosedEvent]: -> endpoint: " + endpoint.getEndpointName() + " ("
+ typeOfEndpoint + ") | channelId: " + event.getChannelId() + " | timestamp: " + typeOfEndpoint + ") | channelId: " + event.getChannelId() + " | timestamp: "
+ event.getTimestampMillis(); + event.getTimestampMillis();
KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(), KmsEvent kmsEvent = new KmsEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
@ -180,8 +180,8 @@ public class KurentoParticipantEndpointConfig {
// Endpoint events // Endpoint events
final Endpoint finalEndpoint = endpoint.getEndpoint(); final Endpoint finalEndpoint = endpoint.getEndpoint();
finalEndpoint.addMediaFlowInStateChangeListener(event -> { finalEndpoint.addMediaFlowInStateChangedListener(event -> {
String msg = "KMS event [MediaFlowInStateChange] -> endpoint: " + endpoint.getEndpointName() + " (" String msg = "KMS event [MediaFlowInStateChanged] -> endpoint: " + endpoint.getEndpointName() + " ("
+ typeOfEndpoint + ") | state: " + event.getState() + " | pad: " + event.getPadName() + typeOfEndpoint + ") | state: " + event.getState() + " | pad: " + event.getPadName()
+ " | mediaType: " + event.getMediaType() + " | timestamp: " + event.getTimestampMillis(); + " | mediaType: " + event.getMediaType() + " | timestamp: " + event.getTimestampMillis();
KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner(), endpoint.getEndpointName(), KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
@ -192,8 +192,8 @@ public class KurentoParticipantEndpointConfig {
log.info(msg); log.info(msg);
}); });
finalEndpoint.addMediaFlowOutStateChangeListener(event -> { finalEndpoint.addMediaFlowOutStateChangedListener(event -> {
String msg = "KMS event [MediaFlowOutStateChange] -> endpoint: " + endpoint.getEndpointName() + " (" String msg = "KMS event [MediaFlowOutStateChanged] -> endpoint: " + endpoint.getEndpointName() + " ("
+ typeOfEndpoint + ") | state: " + event.getState() + " | pad: " + event.getPadName() + typeOfEndpoint + ") | state: " + event.getState() + " | pad: " + event.getPadName()
+ " | mediaType: " + event.getMediaType() + " | timestamp: " + event.getTimestampMillis(); + " | mediaType: " + event.getMediaType() + " | timestamp: " + event.getTimestampMillis();
KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner(), endpoint.getEndpointName(), KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),
@ -216,8 +216,8 @@ public class KurentoParticipantEndpointConfig {
log.error(msg); log.error(msg);
}); });
finalEndpoint.addMediaTranscodingStateChangeListener(event -> { finalEndpoint.addMediaTranscodingStateChangedListener(event -> {
String msg = "KMS event [MediaTranscodingStateChange]: -> endpoint: " + endpoint.getEndpointName() + " (" String msg = "KMS event [MediaTranscodingStateChanged]: -> endpoint: " + endpoint.getEndpointName() + " ("
+ typeOfEndpoint + ") | state: " + event.getState().name() + " | mediaType: " + event.getMediaType() + typeOfEndpoint + ") | state: " + event.getState().name() + " | mediaType: " + event.getMediaType()
+ " | binName: " + event.getBinName() + " | timestamp: " + event.getTimestampMillis(); + " | binName: " + event.getBinName() + " | timestamp: " + event.getTimestampMillis();
KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner(), endpoint.getEndpointName(), KmsEvent kmsEvent = new KmsMediaEvent(event, endpoint.getOwner(), endpoint.getEndpointName(),

4
openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/MediaEndpoint.java
View File

@ -556,11 +556,11 @@ public abstract class MediaEndpoint {
* the remote User Agent as a notification using the messaging capabilities of * the remote User Agent as a notification using the messaging capabilities of
* the {@link Participant}. * the {@link Participant}.
* *
* @see WebRtcEndpoint#addOnIceCandidateListener(org.kurento.client.EventListener) * @see WebRtcEndpoint#addIceCandidateFoundListener(org.kurento.client.EventListener)
* @see Participant#sendIceCandidate(String, IceCandidate) * @see Participant#sendIceCandidate(String, IceCandidate)
* @throws OpenViduException if thrown, unable to register the listener * @throws OpenViduException if thrown, unable to register the listener
*/ */
protected void registerOnIceCandidateEventListener(String senderPublicId) throws OpenViduException { protected void registerIceCandidateFoundEventListener(String senderPublicId) throws OpenViduException {
if (!this.isWeb()) { if (!this.isWeb()) {
return; return;
} }

4
openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/PublisherEndpoint.java
View File

@ -84,7 +84,7 @@ public class PublisherEndpoint extends MediaEndpoint {
* This lock protects the following method with read lock: * This lock protects the following method with read lock:
* KurentoParticipant#receiveMediaFrom. It uses tryLock, immediately failing if * KurentoParticipant#receiveMediaFrom. It uses tryLock, immediately failing if
* written locked * written locked
* *
* Lock is written-locked upon KurentoParticipant#releasePublisherEndpoint and * Lock is written-locked upon KurentoParticipant#releasePublisherEndpoint and
* KurentoParticipant#cancelReceivingMedia * KurentoParticipant#cancelReceivingMedia
*/ */
@ -189,7 +189,7 @@ public class PublisherEndpoint extends MediaEndpoint {
*/ */
public synchronized String publish(String sdpOffer, boolean doLoopback) { public synchronized String publish(String sdpOffer, boolean doLoopback) {
String sdpResponse = processOffer(sdpOffer); String sdpResponse = processOffer(sdpOffer);
registerOnIceCandidateEventListener(this.getOwner().getParticipantPublicId()); registerIceCandidateFoundEventListener(this.getOwner().getParticipantPublicId());
if (doLoopback) { if (doLoopback) {
connect(this.getEndpoint(), false); connect(this.getEndpoint(), false);
} else { } else {

4
openvidu-server/src/main/java/io/openvidu/server/kurento/endpoint/SubscriberEndpoint.java
View File

@ -48,7 +48,7 @@ public class SubscriberEndpoint extends MediaEndpoint {
} }
public synchronized String prepareSubscription(PublisherEndpoint publisher) { public synchronized String prepareSubscription(PublisherEndpoint publisher) {
registerOnIceCandidateEventListener(publisher.getOwner().getParticipantPublicId()); registerIceCandidateFoundEventListener(publisher.getOwner().getParticipantPublicId());
publisher.connect(this.getEndpoint(), true); publisher.connect(this.getEndpoint(), true);
this.createdAt = System.currentTimeMillis(); this.createdAt = System.currentTimeMillis();
this.publisherStreamId = publisher.getStreamId(); this.publisherStreamId = publisher.getStreamId();
@ -65,7 +65,7 @@ public class SubscriberEndpoint extends MediaEndpoint {
public synchronized String subscribe(String sdpString, PublisherEndpoint publisher) { public synchronized String subscribe(String sdpString, PublisherEndpoint publisher) {
if (this.publisherStreamId == null) { if (this.publisherStreamId == null) {
// Client initiated negotiation // Client initiated negotiation
registerOnIceCandidateEventListener(publisher.getOwner().getParticipantPublicId()); registerIceCandidateFoundEventListener(publisher.getOwner().getParticipantPublicId());
this.createdAt = System.currentTimeMillis(); this.createdAt = System.currentTimeMillis();
String realSdpAnswer = processOffer(sdpString); String realSdpAnswer = processOffer(sdpString);
gatherCandidates(); gatherCandidates();

2
pom.xml
View File

@ -42,7 +42,7 @@
</developers> </developers>
<properties> <properties>
<version.kurento>6.16.5</version.kurento> <version.kurento>6.18.0-SNAPSHOT</version.kurento>
<version.spring-boot>2.3.12.RELEASE</version.spring-boot> <version.spring-boot>2.3.12.RELEASE</version.spring-boot>
<version.junit>4.13.1</version.junit> <version.junit>4.13.1</version.junit>
<version.junit.jupiter>5.8.1</version.junit.jupiter> <version.junit.jupiter>5.8.1</version.junit.jupiter>