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

recording: block on connect() before calling record() 

The Kurento RecorderEndpoint.record() method expects that all elements
have been successfully connected. However if connect() is called non-
blocking, then it might happen that record() is called in parallel, when
the connections haven't been done yet.
pull/651/head
Juan Navarro 2021-08-30 18:53:01 +02:00
parent 4f21203618
commit 3e42a6ef23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,6 +269,7 @@ public class SingleStreamRecordingService extends RecordingService {
} }
connectAccordingToProfile(kurentoParticipant.getPublisher(), recorder, profile); connectAccordingToProfile(kurentoParticipant.getPublisher(), recorder, profile);
wrapper.getRecorder().record(); wrapper.getRecorder().record();
} finally { } finally {
@ -404,16 +405,18 @@ public class SingleStreamRecordingService extends RecordingService {
private void connectAccordingToProfile(PublisherEndpoint publisherEndpoint, RecorderEndpoint recorder, private void connectAccordingToProfile(PublisherEndpoint publisherEndpoint, RecorderEndpoint recorder,
MediaProfileSpecType profile) { MediaProfileSpecType profile) {
// Perform blocking connections, to ensure that elements are
// already connected when `RecorderEndpoint.record()` is called.
switch (profile) { switch (profile) {
case WEBM: case WEBM:
publisherEndpoint.connect(recorder, MediaType.AUDIO, false); publisherEndpoint.connect(recorder, MediaType.AUDIO, true);
publisherEndpoint.connect(recorder, MediaType.VIDEO, false); publisherEndpoint.connect(recorder, MediaType.VIDEO, true);
break; break;
case WEBM_AUDIO_ONLY: case WEBM_AUDIO_ONLY:
publisherEndpoint.connect(recorder, MediaType.AUDIO, false); publisherEndpoint.connect(recorder, MediaType.AUDIO, true);
break; break;
case WEBM_VIDEO_ONLY: case WEBM_VIDEO_ONLY:
publisherEndpoint.connect(recorder, MediaType.VIDEO, false); publisherEndpoint.connect(recorder, MediaType.VIDEO, true);
break; break;
default: default:
throw new UnsupportedOperationException("Unsupported profile when single stream recording: " + profile); throw new UnsupportedOperationException("Unsupported profile when single stream recording: " + profile);