Skip to content

Commit 7035278

Browse files
authored
Merge pull request #217 from opentok/v4.7.0-docs-edits
V4.7.0 docs edits
2 parents c0306de + c6e7730 commit 7035278

File tree

7 files changed

+41
-11
lines changed

7 files changed

+41
-11
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[bumpversion]
22
commit = True
33
tag = True
4-
current_version = 4.6.0
4+
current_version = 4.7.0
55
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
66
serialize =
77
{major}.{minor}.{patch}

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014-2021 Vonage.
3+
Copyright (c) 2014-2022 Vonage.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ Reference documentation is available at
587587
## Requirements
588588

589589
You need an OpenTok API key and API secret, which you can obtain by logging into your
590-
[TokBox account](https://tokbox.com/account).
590+
[Vonage Video API account](https://tokbox.com/account).
591591

592592
The OpenTok Java SDK requires JDK 8 or greater to compile. Runtime requires Java SE 8 or greater.
593593
This project is tested on both OpenJDK and Oracle implementations.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88

99
group = 'com.tokbox'
1010
archivesBaseName = 'opentok-server-sdk'
11-
version = '4.6.0'
11+
version = '4.7.0'
1212

1313
sourceCompatibility = "1.8"
1414
targetCompatibility = "1.8"

src/main/java/com/opentok/Hls.java

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,47 @@
88
package com.opentok;
99

1010
/**
11-
* POJO for the 'hls' object node in the 'outputs' section of a Broadcast request's body.
11+
* Represents HLS options for a live streaming broadcast. Pass this object
12+
* into the {@link BroadcastProperties.Builder#hls()} method. It is returned by the
13+
* {@link BroadcastProperties#hls()} method.
1214
*/
1315
public class Hls {
1416

1517
private final boolean dvr;
1618
private final boolean lowLatency;
1719

20+
/**
21+
* Used to create the Hls object.
22+
*/
1823
public static class Builder {
1924
private boolean dvr = false;
2025
private boolean lowLatency = false;
2126

27+
/**
28+
* Whether to enable
29+
* <a href="https://tokbox.com/developer/guides/broadcast/live-streaming/#dvr">DVR functionality</a> —
30+
* rewinding, pausing, and resuming — in players that support it (true), or not (false, the default).
31+
* With DVR enabled, the HLS URL will include a ?DVR query string appended to the end.
32+
*/
2233
public Builder dvr(boolean dvr) {
2334
this.dvr = dvr;
2435
return this;
2536
}
2637

38+
/**
39+
* Whether to enable
40+
* <a href="https://tokbox.com/developer/guides/broadcast/live-streaming/#low-latency">low-latency mode</a>
41+
* for the HLSstream. Some HLS players do not support low-latency mode. This feature is incompatible
42+
* with DVR mode HLS broadcasts.
43+
*/
2744
public Builder lowLatency(boolean lowLatency) {
2845
this.lowLatency = lowLatency;
2946
return this;
3047
}
3148

49+
/**
50+
* Builds the HLS object with the selected settings.
51+
*/
3252
public Hls build() {
3353
return new Hls(this);
3454
}
@@ -41,10 +61,20 @@ protected Hls(Builder builder) {
4161
}
4262
}
4363

64+
/**
65+
* Whether
66+
* <a href="https://tokbox.com/developer/guides/broadcast/live-streaming/#dvr">DVR functionality</a> —
67+
* rewinding, pausing, and resuming — is enabled in players that support it.
68+
*/
4469
public boolean dvr() {
4570
return dvr;
4671
}
4772

73+
/**
74+
* Whether
75+
* <a href="https://tokbox.com/developer/guides/broadcast/live-streaming/#low-latency">low-latency mode</a>
76+
* is enabled for the HLSstream. Some HLS players do not support low-latency mode.
77+
*/
4878
public boolean lowLatency() {
4979
return lowLatency;
5080
}

src/main/java/com/opentok/OpenTok.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* Contains methods for creating OpenTok sessions, generating tokens, and working with archives.
2929
* <p>
3030
* To create a new OpenTok object, call the OpenTok constructor with your OpenTok API key
31-
* and the API secret for your <a href="https://tokbox.com/account">TokBox account</a>. Do not publicly share
31+
* and the API secret for your <a href="https://tokbox.com/account">Vonage Video API account</a>. Do not publicly share
3232
* your API secret. You will use it with the OpenTok constructor (only on your web
3333
* server) to create OpenTok sessions.
3434
* <p>
@@ -58,8 +58,8 @@ public class OpenTok {
5858
/**
5959
* Creates an OpenTok object.
6060
*
61-
* @param apiKey Your OpenTok API key. (See your <a href="https://tokbox.com/account">TokBox account page</a>.)
62-
* @param apiSecret Your OpenTok API secret. (See your <a href="https://tokbox.com/account">TokBox account page</a>.)
61+
* @param apiKey Your OpenTok API key. (See your <a href="https://tokbox.com/account">Vonage Video API account page</a>.)
62+
* @param apiSecret Your OpenTok API secret. (See your <a href="https://tokbox.com/account">Vonage Video API account page</a>.)
6363
*/
6464
public OpenTok(int apiKey, String apiSecret) {
6565
this.apiKey = apiKey;
@@ -107,7 +107,7 @@ private OpenTok(int apiKey, String apiSecret, HttpClient httpClient) {
107107
* }
108108
* </pre>
109109
* <p>
110-
* For testing, you can also generate tokens by logging in to your <a href="https://tokbox.com/account">TokBox account</a>.
110+
* For testing, you can also generate tokens by logging in to your <a href="https://tokbox.com/account">Vonage Video API account</a>.
111111
*
112112
* @param sessionId The session ID corresponding to the session to which the user will connect.
113113
*
@@ -224,7 +224,7 @@ public String generateToken(String sessionId) throws OpenTokException {
224224
*
225225
* You can also create a session using the <a href="http://www.tokbox.com/opentok/api/#session_id_production">OpenTok
226226
* REST API</a> or or by logging in to your
227-
* <a href="https://tokbox.com/account">TokBox account</a>.
227+
* <a href="https://tokbox.com/account">Vonage Video API account</a>.
228228
*
229229
* @param properties This SessionProperties object defines options for the session.
230230
* These include the following:

src/main/java/com/opentok/constants/Version.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
package com.opentok.constants;
99

1010
public class Version {
11-
public static final String VERSION = "4.6.0";
11+
public static final String VERSION = "4.7.0";
1212
}

0 commit comments

Comments
 (0)