Merge master into develop (#1352)

README.md

@@ -301,6 +301,10 @@ All Public APIs are documented in our [Include.h](https://github.com/awslabs/ama
 
 Refer to [related](#related) for more about WebRTC and KVS.
 
+## Development
+
+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.
+
 ## Outbound hostname and port requirements
 * KVS endpoint : TCP 443 (ex: kinesisvideo.us-west-2.amazonaws.com)
 * HTTPS channel endpoint : TCP 443 (ex: r-2c136a55.kinesisvideo.us-west-2.amazonaws.com)

samples/Samples.h

@@ -49,7 +49,6 @@ extern "C" {
 #define MASTER_DATA_CHANNEL_MESSAGE "This message is from the KVS Master"
 #define VIEWER_DATA_CHANNEL_MESSAGE "This message is from the KVS Viewer"
 
-
 /* Uncomment the following line in order to enable IoT credentials checks in the provided samples */
 //#define IOT_CORE_ENABLE_CREDENTIALS  1
 

samples/kvsWebRTCClientViewer.c

@@ -3,6 +3,7 @@
 extern PSampleConfiguration gSampleConfiguration;
 
 #ifdef ENABLE_DATA_CHANNEL
+
 // onMessage callback for a message received by the viewer on a data channel
 VOID dataChannelOnMessageCallback(UINT64 customData, PRtcDataChannel pDataChannel, BOOL isBinary, PBYTE pMessage, UINT32 pMessageLen)
 {

src/source/Signaling/LwsApiCalls.c

@@ -173,6 +173,7 @@ INT32 lwsHttpCallbackRoutine(struct lws* wsi, enum lws_callback_reasons reason,
                             pLwsCallInfo->callInfo.callResult = SERVICE_CALL_SIGNATURE_NOT_YET_CURRENT;
                         }
                     }
+
                 } else {
                     DLOGV("Received client http read response:  %s", pLwsCallInfo->callInfo.responseData);
                 }