Stability and bug fixes.

Author: chehefen

README.md

@@ -45,6 +45,9 @@ This library is licensed under the Amazon Software License.
 ----
 ### Release notes
 
+#### Release 1.7.7 (22th Feb 2019)
+* Stability and bug fixes.
+
 #### Release 1.7.6 (21th Feb 2019)
 * Audio integration for Kinesis Video Stream. Now Kinesis Video Streams Producer SDK CPP supports ingesting video and audio.
 

docker_native_scripts/raspberry-pi-docker/Dockerfile

@@ -3,9 +3,6 @@ FROM resin/rpi-raspbian:stretch
 RUN apt-get update && apt-get install -y \
 	git \
 	curl \
-	ca-certificates-java \
-	openjdk-8-jre \
-	openjdk-8-jdk \
 	pkg-config \
 	cmake \
 	vim \
@@ -17,8 +14,6 @@ RUN apt-get update && apt-get install -y \
 	python \
 	bzip2
 
-ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-armhf/
-
 WORKDIR /opt/
 RUN curl -OL https://github.com/raspberrypi/firmware/archive/1.20180417.tar.gz
 RUN tar xvf 1.20180417.tar.gz

install-instructions-linux.md

@@ -303,7 +303,7 @@ if your camera supports outputting h264 encoded stream directly, then you can us
 gst-launch-1.0 -v v4l2src device=/dev/video0 ! h264parse ! video/x-h264,stream-format=avc,alignment=au ! kvssink name=sink stream-name="my-stream-name" access-key="YourAccessKey" secret-key="YourSecretKey" alsasrc device=hw:1,0 ! audioconvert ! avenc_aac ! queue ! sink.
 ```
 
-if you get errors like `WARNING: erroneous pipeline: no element "alsasrc"`, make sure that **libasound2-dev** was installed and run the **install-script** again.
+if you get errors like `WARNING: erroneous pipeline: no element "alsasrc"`, make sure that **libasound2-dev** was installed, then delete `<YourSdkFolderPath>/kinesis-video-native-build/downloads/local/lib/libgstvideo-1.0.so` to trigger rebuilding gst-plugin-base and run the **install-script** again.
 
 ##### Running the GStreamer webcam sample application
 The sample application `kinesis_video_gstreamer_sample_app` in the `kinesis-video-native-build` directory uses GStreamer pipeline to get video data from the camera. Launch it with a stream name and it will start streaming from the camera. The user can also supply a streaming resolution (width and height) through command line arguments.
@@ -509,3 +509,6 @@ make clean
 make
 make install
 ```
+
+##### When `kinesis_video_gstreamer_audio_video_sample_app` failed with: `WARNING: erroneous pipeline: no element "alsasrc"`
+if you get errors like `WARNING: erroneous pipeline: no element "alsasrc"`, make sure that **libasound2-dev** was installed, then delete `<YourSdkFolderPath>/kinesis-video-native-build/downloads/local/lib/libgstvideo-1.0.so` to trigger rebuilding gst-plugin-base and run the **install-script** again.

kinesis-video-pic/src/client/src/Stream.cpp

@@ -1348,7 +1348,7 @@ STATUS waitForAvailability(PKinesisVideoStream pKinesisVideoStream, UINT32 alloc
     ENTERS();
     STATUS retStatus = STATUS_SUCCESS;
     PKinesisVideoClient pKinesisVideoClient = pKinesisVideoStream->pKinesisVideoClient;
-    BOOL streamLocked = TRUE, availability = FALSE;
+    BOOL streamLocked = TRUE, availability = FALSE, bufferAvailabilityLocked = FALSE;
 
     // Quick check if we need to do any awaiting
     CHK(IS_OFFLINE_STREAMING_MODE(pKinesisVideoStream->streamInfo.streamCaps.streamingType), STATUS_SUCCESS);
@@ -1364,11 +1364,23 @@ STATUS waitForAvailability(PKinesisVideoStream pKinesisVideoStream, UINT32 alloc
         pKinesisVideoClient->clientCallbacks.unlockMutexFn(pKinesisVideoClient->clientCallbacks.customData,
                                                            pKinesisVideoStream->base.lock);
         streamLocked = FALSE;
+
+        // Acquire bufferAvailabilityLock before blocking
+        pKinesisVideoClient->clientCallbacks.lockMutexFn(pKinesisVideoClient->clientCallbacks.customData,
+                                                         pKinesisVideoStream->bufferAvailabilityLock);
+        bufferAvailabilityLocked = TRUE;
+
         // Long path which will await for the availability notification or cancellation
         CHK_STATUS(pKinesisVideoClient->clientCallbacks.waitConditionVariableFn(pKinesisVideoClient->clientCallbacks.customData,
                                                                                 pKinesisVideoStream->bufferAvailabilityCondition,
                                                                                 pKinesisVideoStream->bufferAvailabilityLock,
                                                                                 MAX_BLOCKING_PUT_WAIT));
+
+        // Release bufferAvailabilityLock after been signaled.
+        pKinesisVideoClient->clientCallbacks.unlockMutexFn(pKinesisVideoClient->clientCallbacks.customData,
+                                                           pKinesisVideoStream->bufferAvailabilityLock);
+        bufferAvailabilityLocked = FALSE;
+
         // Lock the stream again in order to proceed
         pKinesisVideoClient->clientCallbacks.lockMutexFn(pKinesisVideoClient->clientCallbacks.customData,
                                                          pKinesisVideoStream->base.lock);
@@ -1380,6 +1392,12 @@ STATUS waitForAvailability(PKinesisVideoStream pKinesisVideoStream, UINT32 alloc
 
 CleanUp:
 
+    // Unlock the bufferAvailabilityLock if lockec
+    if (bufferAvailabilityLocked) {
+        pKinesisVideoClient->clientCallbacks.unlockMutexFn(pKinesisVideoClient->clientCallbacks.customData,
+                                                           pKinesisVideoStream->bufferAvailabilityLock);
+    }
+
     // Lock the stream again in order to proceed
     if (!streamLocked) {
         pKinesisVideoClient->clientCallbacks.lockMutexFn(pKinesisVideoClient->clientCallbacks.customData,

kinesis-video-producer-jni/src/include/com/amazonaws/kinesis/video/producer/jni/SyncMutex.h

@@ -100,6 +100,8 @@ class SyncMutex
     // Acquire the mutex and wait on the condition variable.
     void wait(const char* function)
     {
+        MUTEX_LOCK(mMutex);
+
         UINT64 before = 0;
         if (mLogsEnabled)
         {
@@ -116,6 +118,8 @@ class SyncMutex
             UINT64 elapsed_ms = (after - before) / HUNDREDS_OF_NANOS_IN_A_MILLISECOND;
             DLOGI("%s: waited %ldms for %s", function, elapsed_ms, mMutexDescription);
         }
+
+        MUTEX_UNLOCK(mMutex);
     }
 
     // Signal the condition variable, allowing all blocked threads to continue.

kinesis-video-producer/src/Version.cpp

@@ -1,6 +1,6 @@
 #include "Version.h"
 
-#define AWS_SDK_KVS_PRODUCER_VERSION_STRING "1.7.6"
+#define AWS_SDK_KVS_PRODUCER_VERSION_STRING "1.7.7"
 
 #if defined _WIN32 || defined _WIN64
 #include <windows.h>

kinesis-video-producer/tst/ProducerTestFixture.cpp

@@ -49,9 +49,6 @@ STATUS TestStreamCallbackProvider::streamErrorReportHandler(UINT64 custom_data,
     if (STATUS_FAILED(ret)) {
         return ret;
     }
-    if (status == STATUS_ACK_ERR_INVALID_MKV_DATA) {
-        testBase->mkv_error_fragment_ts_ = errored_timecode;
-    }
     testBase->setErrorStatus(status);
 
     return validateCallback(custom_data);
@@ -105,15 +102,6 @@ STATUS TestStreamCallbackProvider::fragmentAckReceivedHandler(UINT64 custom_data
             testBase->buffering_ack_in_sequence_ = false;
         }
 
-        // clear error status if we have successfully recovered
-        if (testBase->getErrorStatus() == STATUS_ACK_ERR_INVALID_MKV_DATA && (fragment_ack->timestamp == testBase->mkv_error_fragment_ts_)) {
-            LOG_DEBUG("Successfully restreamed fragment " << testBase->mkv_error_fragment_ts_ << " that had INVALID_MKV_ERROR.");
-            testBase->setErrorStatus(STATUS_SUCCESS);
-            testBase->mkv_error_fragment_ts_ = TEST_TIMESTAMP_SENTINEL;
-
-        } else if (testBase->getErrorStatus() == STATUS_ACK_ERR_INVALID_MKV_DATA) {
-            LOG_WARN("Did not restream fragment caused invalid mkv. current ack fragment timestamp: " << fragment_ack->timestamp << ", error fragment timestamp: " << testBase->mkv_error_fragment_ts_);
-        }
         testBase->previous_buffering_ack_timestamp_[upload_handle] = fragment_ack->timestamp;
     }
 

kinesis-video-producer/tst/ProducerTestFixture.h

@@ -193,7 +193,6 @@ class ProducerTestBase : public ::testing::Test {
                          total_frame_count_(TEST_TOTAL_FRAME_COUNT),
                          current_pressure_state_(OK),
                          buffering_ack_in_sequence_(true),
-                         mkv_error_fragment_ts_(TEST_TIMESTAMP_SENTINEL),
                          key_frame_interval_(TEST_FPS),
                          token_rotation_seconds_(TEST_STREAMING_TOKEN_DURATION_IN_SECONDS) {
 
@@ -237,8 +236,7 @@ class ProducerTestBase : public ::testing::Test {
     atomic_bool storage_overflow_;
     atomic_bool buffering_ack_in_sequence_;
     atomic_uint error_status_;
-    map<UPLOAD_HANDLE, atomic_llong> previous_buffering_ack_timestamp_;
-    atomic_llong mkv_error_fragment_ts_;
+    map<UPLOAD_HANDLE, uint64_t> previous_buffering_ack_timestamp_;
 
 protected: