mirror of https://github.com/OpenVidu/openvidu.git
openvidu-java-client: resolution and layout only if "hasVideo"
pabloFuente
parent
b6a200170f
commit
89af604433
|
|
@ -75,11 +75,9 @@ public class OpenVidu {
|
|||
protected final static String API_RECORDINGS_STOP = "/stop";
|
||||
|
||||
/**
|
||||
* @param urlOpenViduServer
|
||||
* Public accessible IP where your instance of OpenVidu Server is up
|
||||
* an running
|
||||
* @param secret
|
||||
* Secret used on OpenVidu Server initialization
|
||||
* @param urlOpenViduServer Public accessible IP where your instance of OpenVidu
|
||||
* Server is up an running
|
||||
* @param secret Secret used on OpenVidu Server initialization
|
||||
*/
|
||||
public OpenVidu(String urlOpenViduServer, String secret) {
|
||||
|
||||
|
|
@ -136,18 +134,17 @@ public class OpenVidu {
|
|||
/**
|
||||
* Creates an OpenVidu session
|
||||
*
|
||||
* @param properties
|
||||
* The specific configuration for this session
|
||||
* @param properties The specific configuration for this session
|
||||
*
|
||||
* @return The created session
|
||||
*
|
||||
* @throws OpenViduJavaClientException
|
||||
* @throws OpenViduHttpException
|
||||
* Value returned from
|
||||
* @throws OpenViduHttpException Value returned from
|
||||
* {@link io.openvidu.java.client.OpenViduHttpException#getStatus()}
|
||||
* <ul>
|
||||
* <li><code>409</code>: you are trying to assign an already-in-use
|
||||
* custom sessionId to the session. See
|
||||
* <li><code>409</code>: you are trying to
|
||||
* assign an already-in-use custom sessionId
|
||||
* to the session. See
|
||||
* {@link io.openvidu.java.client.SessionProperties#customSessionId()}</li>
|
||||
* </ul>
|
||||
*/
|
||||
|
|
@ -161,28 +158,27 @@ public class OpenVidu {
|
|||
/**
|
||||
* Starts the recording of a {@link io.openvidu.java.client.Session}
|
||||
*
|
||||
* @param sessionId
|
||||
* The sessionId of the session you want to start recording
|
||||
* @param properties
|
||||
* The configuration for this recording
|
||||
* @param sessionId The sessionId of the session you want to start recording
|
||||
* @param properties The configuration for this recording
|
||||
*
|
||||
* @return The new created session
|
||||
*
|
||||
* @throws OpenViduJavaClientException
|
||||
* @throws OpenViduHttpException
|
||||
* Value returned from
|
||||
* @throws OpenViduHttpException Value returned from
|
||||
* {@link io.openvidu.java.client.OpenViduHttpException#getStatus()}
|
||||
* <ul>
|
||||
* <li><code>404</code>: no session exists for the passed
|
||||
* <i>sessionId</i></li>
|
||||
* <li><code>400</code>: the session has no connected
|
||||
* participants</li>
|
||||
* <li><code>409</code>: the session is not configured for using
|
||||
* {@link io.openvidu.java.client.MediaMode#ROUTED} or it is already
|
||||
* being recorded</li>
|
||||
* <li><code>501</code>: OpenVidu Server recording module is
|
||||
* disabled (<i>openvidu.recording</i> property set to
|
||||
* <i>false</i>)</li>
|
||||
* <li><code>404</code>: no session exists
|
||||
* for the passed <i>sessionId</i></li>
|
||||
* <li><code>400</code>: the session has no
|
||||
* connected participants</li>
|
||||
* <li><code>409</code>: the session is not
|
||||
* configured for using
|
||||
* {@link io.openvidu.java.client.MediaMode#ROUTED}
|
||||
* or it is already being recorded</li>
|
||||
* <li><code>501</code>: OpenVidu Server
|
||||
* recording module is disabled
|
||||
* (<i>openvidu.recording</i> property set
|
||||
* to <i>false</i>)</li>
|
||||
* </ul>
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
|
|
@ -198,7 +194,7 @@ public class OpenVidu {
|
|||
json.put("hasAudio", properties.hasAudio());
|
||||
json.put("hasVideo", properties.hasVideo());
|
||||
|
||||
if (Recording.OutputMode.COMPOSED.equals(properties.outputMode())) {
|
||||
if (Recording.OutputMode.COMPOSED.equals(properties.outputMode()) && properties.hasVideo()) {
|
||||
json.put("resolution", properties.resolution());
|
||||
json.put("recordingLayout",
|
||||
(properties.recordingLayout() != null) ? properties.recordingLayout().name() : "");
|
||||
|
|
@ -247,34 +243,34 @@ public class OpenVidu {
|
|||
/**
|
||||
* Starts the recording of a {@link io.openvidu.java.client.Session}
|
||||
*
|
||||
* @param sessionId
|
||||
* The sessionId of the session you want to start recording
|
||||
* @param name
|
||||
* The name you want to give to the video file. You can access this
|
||||
* same value in your clients on recording events (recordingStarted,
|
||||
* recordingStopped). <strong>WARNING: this parameter follows an
|
||||
* overwriting policy.</strong> If you name two recordings the same,
|
||||
* the newest MP4 file will overwrite the oldest one
|
||||
* @param sessionId The sessionId of the session you want to start recording
|
||||
* @param name The name you want to give to the video file. You can access
|
||||
* this same value in your clients on recording events
|
||||
* (recordingStarted, recordingStopped). <strong>WARNING: this
|
||||
* parameter follows an overwriting policy.</strong> If you
|
||||
* name two recordings the same, the newest MP4 file will
|
||||
* overwrite the oldest one
|
||||
*
|
||||
* @return The started recording. If this method successfully returns the
|
||||
* Recording object it means that the recording can be stopped with
|
||||
* guarantees
|
||||
*
|
||||
* @throws OpenViduJavaClientException
|
||||
* @throws OpenViduHttpException
|
||||
* Value returned from
|
||||
* @throws OpenViduHttpException Value returned from
|
||||
* {@link io.openvidu.java.client.OpenViduHttpException#getStatus()}
|
||||
* <ul>
|
||||
* <li><code>404</code>: no session exists for the passed
|
||||
* <i>sessionId</i></li>
|
||||
* <li><code>400</code>: the session has no connected
|
||||
* participants</li>
|
||||
* <li><code>409</code>: the session is not configured for using
|
||||
* {@link io.openvidu.java.client.MediaMode#ROUTED} or it is already
|
||||
* being recorded</li>
|
||||
* <li><code>501</code>: OpenVidu Server recording module is
|
||||
* disabled (<i>openvidu.recording</i> property set to
|
||||
* <i>false</i>)</li>
|
||||
* <li><code>404</code>: no session exists
|
||||
* for the passed <i>sessionId</i></li>
|
||||
* <li><code>400</code>: the session has no
|
||||
* connected participants</li>
|
||||
* <li><code>409</code>: the session is not
|
||||
* configured for using
|
||||
* {@link io.openvidu.java.client.MediaMode#ROUTED}
|
||||
* or it is already being recorded</li>
|
||||
* <li><code>501</code>: OpenVidu Server
|
||||
* recording module is disabled
|
||||
* (<i>openvidu.recording</i> property set
|
||||
* to <i>false</i>)</li>
|
||||
* </ul>
|
||||
*/
|
||||
public Recording startRecording(String sessionId, String name)
|
||||
|
|
@ -288,28 +284,28 @@ public class OpenVidu {
|
|||
/**
|
||||
* Starts the recording of a {@link io.openvidu.java.client.Session}
|
||||
*
|
||||
* @param sessionId
|
||||
* The sessionId of the session you want to start recording
|
||||
* @param sessionId The sessionId of the session you want to start recording
|
||||
*
|
||||
* @return The started recording. If this method successfully returns the
|
||||
* Recording object it means that the recording can be stopped with
|
||||
* guarantees
|
||||
*
|
||||
* @throws OpenViduJavaClientException
|
||||
* @throws OpenViduHttpException
|
||||
* Value returned from
|
||||
* @throws OpenViduHttpException Value returned from
|
||||
* {@link io.openvidu.java.client.OpenViduHttpException#getStatus()}
|
||||
* <ul>
|
||||
* <li><code>404</code>: no session exists for the passed
|
||||
* <i>sessionId</i></li>
|
||||
* <li><code>400</code>: the session has no connected
|
||||
* participants</li>
|
||||
* <li><code>409</code>: the session is not configured for using
|
||||
* {@link io.openvidu.java.client.MediaMode#ROUTED} or it is already
|
||||
* being recorded</li>
|
||||
* <li><code>501</code>: OpenVidu Server recording module is
|
||||
* disabled (<i>openvidu.recording</i> property set to
|
||||
* <i>false</i>)</li>
|
||||
* <li><code>404</code>: no session exists
|
||||
* for the passed <i>sessionId</i></li>
|
||||
* <li><code>400</code>: the session has no
|
||||
* connected participants</li>
|
||||
* <li><code>409</code>: the session is not
|
||||
* configured for using
|
||||
* {@link io.openvidu.java.client.MediaMode#ROUTED}
|
||||
* or it is already being recorded</li>
|
||||
* <li><code>501</code>: OpenVidu Server
|
||||
* recording module is disabled
|
||||
* (<i>openvidu.recording</i> property set
|
||||
* to <i>false</i>)</li>
|
||||
* </ul>
|
||||
*/
|
||||
public Recording startRecording(String sessionId) throws OpenViduJavaClientException, OpenViduHttpException {
|
||||
|
|
@ -319,20 +315,20 @@ public class OpenVidu {
|
|||
/**
|
||||
* Stops the recording of a {@link io.openvidu.java.client.Session}
|
||||
*
|
||||
* @param recordingId
|
||||
* The id property of the recording you want to stop
|
||||
* @param recordingId The id property of the recording you want to stop
|
||||
*
|
||||
* @return The stopped recording
|
||||
*
|
||||
* @throws OpenViduJavaClientException
|
||||
* @throws OpenViduHttpException
|
||||
* Value returned from
|
||||
* @throws OpenViduHttpException Value returned from
|
||||
* {@link io.openvidu.java.client.OpenViduHttpException#getStatus()}
|
||||
* <ul>
|
||||
* <li><code>404</code>: no recording exists for the passed
|
||||
* <i>recordingId</i></li>
|
||||
* <li><code>406</code>: recording has <i>starting</i> status. Wait
|
||||
* until <i>started</i> status before stopping the recording</li>
|
||||
* <li><code>404</code>: no recording exists
|
||||
* for the passed <i>recordingId</i></li>
|
||||
* <li><code>406</code>: recording has
|
||||
* <i>starting</i> status. Wait until
|
||||
* <i>started</i> status before stopping the
|
||||
* recording</li>
|
||||
* </ul>
|
||||
*/
|
||||
public Recording stopRecording(String recordingId) throws OpenViduJavaClientException, OpenViduHttpException {
|
||||
|
|
@ -368,16 +364,14 @@ public class OpenVidu {
|
|||
/**
|
||||
* Gets an existing recording
|
||||
*
|
||||
* @param recordingId
|
||||
* The id property of the recording you want to retrieve
|
||||
* @param recordingId The id property of the recording you want to retrieve
|
||||
*
|
||||
* @throws OpenViduJavaClientException
|
||||
* @throws OpenViduHttpException
|
||||
* Value returned from
|
||||
* @throws OpenViduHttpException Value returned from
|
||||
* {@link io.openvidu.java.client.OpenViduHttpException#getStatus()}
|
||||
* <ul>
|
||||
* <li><code>404</code>: no recording exists for the passed
|
||||
* <i>recordingId</i></li>
|
||||
* <li><code>404</code>: no recording exists
|
||||
* for the passed <i>recordingId</i></li>
|
||||
* </ul>
|
||||
*/
|
||||
public Recording getRecording(String recordingId) throws OpenViduJavaClientException, OpenViduHttpException {
|
||||
|
|
@ -442,18 +436,17 @@ public class OpenVidu {
|
|||
* {@link io.openvidu.java.client.Recording.Status#stopped} or
|
||||
* {@link io.openvidu.java.client.Recording.Status#available}
|
||||
*
|
||||
* @param recordingId
|
||||
* The id property of the recording you want to delete
|
||||
* @param recordingId The id property of the recording you want to delete
|
||||
*
|
||||
* @throws OpenViduJavaClientException
|
||||
* @throws OpenViduHttpException
|
||||
* Value returned from
|
||||
* @throws OpenViduHttpException Value returned from
|
||||
* {@link io.openvidu.java.client.OpenViduHttpException#getStatus()}
|
||||
* <ul>
|
||||
* <li><code>404</code>: no recording exists for the passed
|
||||
* <i>recordingId</i></li>
|
||||
* <li><code>409</code>: the recording has <i>started</i> status.
|
||||
* Stop it before deletion</li>
|
||||
* <li><code>404</code>: no recording exists
|
||||
* for the passed <i>recordingId</i></li>
|
||||
* <li><code>409</code>: the recording has
|
||||
* <i>started</i> status. Stop it before
|
||||
* deletion</li>
|
||||
* </ul>
|
||||
*/
|
||||
public void deleteRecording(String recordingId) throws OpenViduJavaClientException, OpenViduHttpException {
|
||||
|
|
|
|||
|
|
@ -94,11 +94,13 @@ public class Recording {
|
|||
this.url = (String) json.get("url");
|
||||
this.status = Recording.Status.valueOf((String) json.get("status"));
|
||||
|
||||
boolean hasAudio = (boolean) json.get("hasAudio");
|
||||
boolean hasVideo = (boolean) json.get("hasVideo");
|
||||
|
||||
OutputMode outputMode = OutputMode.valueOf((String) json.get("outputMode"));
|
||||
RecordingProperties.Builder builder = new RecordingProperties.Builder().name((String) json.get("name"))
|
||||
.outputMode(outputMode).hasAudio((boolean) json.get("hasAudio"))
|
||||
.hasVideo((boolean) json.get("hasVideo"));
|
||||
if (OutputMode.COMPOSED.equals(outputMode)) {
|
||||
.outputMode(outputMode).hasAudio(hasAudio).hasVideo(hasVideo);
|
||||
if (OutputMode.COMPOSED.equals(outputMode) && hasVideo) {
|
||||
builder.resolution((String) json.get("resolution"));
|
||||
builder.recordingLayout(RecordingLayout.valueOf((String) json.get("recordingLayout")));
|
||||
String customLayout = (String) json.get("customLayout");
|
||||
|
|
|
|||
Loading…
Reference in New Issue