Skip to content

Commit a83ae42

Browse files
authored
Merge master into develop (#1352)
1 parent ab082b0 commit a83ae42

File tree

4 files changed

+6
-1
lines changed

4 files changed

+6
-1
lines changed

README.md

+4
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,10 @@ All Public APIs are documented in our [Include.h](https://github.com/awslabs/ama
301301

302302
Refer to [related](#related) for more about WebRTC and KVS.
303303

304+
## Development
305+
306+
If you would like to contribute to the development of this project, please base your pull requests off of the `origin/develop` branch, and to the `origin/develop` branch. Commits from `develop` will be merged into master periodically as a part of each release cycle.
307+
304308
## Outbound hostname and port requirements
305309
* KVS endpoint : TCP 443 (ex: kinesisvideo.us-west-2.amazonaws.com)
306310
* HTTPS channel endpoint : TCP 443 (ex: r-2c136a55.kinesisvideo.us-west-2.amazonaws.com)

samples/Samples.h

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ extern "C" {
4949
#define MASTER_DATA_CHANNEL_MESSAGE "This message is from the KVS Master"
5050
#define VIEWER_DATA_CHANNEL_MESSAGE "This message is from the KVS Viewer"
5151

52-
5352
/* Uncomment the following line in order to enable IoT credentials checks in the provided samples */
5453
//#define IOT_CORE_ENABLE_CREDENTIALS 1
5554

samples/kvsWebRTCClientViewer.c

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
extern PSampleConfiguration gSampleConfiguration;
44

55
#ifdef ENABLE_DATA_CHANNEL
6+
67
// onMessage callback for a message received by the viewer on a data channel
78
VOID dataChannelOnMessageCallback(UINT64 customData, PRtcDataChannel pDataChannel, BOOL isBinary, PBYTE pMessage, UINT32 pMessageLen)
89
{

src/source/Signaling/LwsApiCalls.c

+1
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ INT32 lwsHttpCallbackRoutine(struct lws* wsi, enum lws_callback_reasons reason,
173173
pLwsCallInfo->callInfo.callResult = SERVICE_CALL_SIGNATURE_NOT_YET_CURRENT;
174174
}
175175
}
176+
176177
} else {
177178
DLOGV("Received client http read response: %s", pLwsCallInfo->callInfo.responseData);
178179
}

0 commit comments

Comments
 (0)