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

openvidu-java-client: fix Recording initialization from JSON

pull/621/head
pabloFuente 2021-04-13 13:52:50 +02:00
parent 1b23996479
commit 6eca1f1e71
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openvidu-java-client/src/main/java/io/openvidu/java/client/Recording.java
View File

@ -120,22 +120,7 @@ public class Recording {
} }
this.status = Recording.Status.valueOf(json.get("status").getAsString()); this.status = Recording.Status.valueOf(json.get("status").getAsString());
boolean hasAudio = json.get("hasAudio").getAsBoolean(); this.recordingProperties = RecordingProperties.fromJson(json);
boolean hasVideo = json.get("hasVideo").getAsBoolean();
OutputMode outputMode = OutputMode.valueOf(json.get("outputMode").getAsString());
RecordingProperties.Builder builder = new RecordingProperties.Builder().name(json.get("name").getAsString())
.outputMode(outputMode).hasAudio(hasAudio).hasVideo(hasVideo);
if ((OutputMode.COMPOSED.equals(outputMode) || OutputMode.COMPOSED_QUICK_START.equals(outputMode))
&& hasVideo) {
builder.resolution(json.get("resolution").getAsString());
builder.recordingLayout(RecordingLayout.valueOf(json.get("recordingLayout").getAsString()));
JsonElement customLayout = json.get("customLayout");
if (customLayout != null) {
builder.customLayout(customLayout.getAsString());
}
}
this.recordingProperties = builder.build();
} }
/** /**

6
openvidu-java-client/src/main/java/io/openvidu/java/client/RecordingProperties.java
View File

@ -450,7 +450,11 @@ public class RecordingProperties {
} }
} }
if (json.has("mediaNode")) { if (json.has("mediaNode")) {
builder.mediaNode(json.get("mediaNode").getAsString()); if (json.get("mediaNode").isJsonObject()) {
builder.mediaNode(json.get("mediaNode").getAsJsonObject().get("id").getAsString());
} else if (json.get("mediaNode").isJsonPrimitive()) {
builder.mediaNode(json.get("mediaNode").getAsString());
}
} }
return builder.build(); return builder.build();
} }