stability and bug fixes

Author: chehefen

kinesis-video-native-build/min-install-script

@@ -89,7 +89,6 @@ cmake CMakeLists.txt
 make producer
 make start
 make kinesis_video_gstreamer_sample_app
-make kinesis_video_gstreamer_sample_rtsp_app
 # copy the kvssink plugin into the library folder
 cp libproducer* "$LIB_DESTINATION_FOLDER_PATH"
 

kinesis-video-native-build/windows-install.bat

@@ -163,8 +163,6 @@ msbuild start.vcxproj  /p:Configuration=Release /p:Platform=%BUILD_BITNESS_TYPE%
 if ERRORLEVEL 1 goto :showerror
 msbuild kinesis_video_gstreamer_sample_app.vcxproj  /p:Configuration=Release /p:Platform=%BUILD_BITNESS_TYPE% /m
 if ERRORLEVEL 1 goto :showerror
-msbuild kinesis_video_gstreamer_sample_rtsp_app.vcxproj  /p:Configuration=Release /p:Platform=%BUILD_BITNESS_TYPE% /m
-if ERRORLEVEL 1 goto :showerror
 msbuild gstkvssink.vcxproj /p:Configuration=Release /p:Platform=%BUILD_BITNESS_TYPE% /m
 if ERRORLEVEL 1 goto :showerror
 msbuild kvs_producer_plugin_demo.vcxproj /p:Configuration=Release /p:Platform=%BUILD_BITNESS_TYPE% /m

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

@@ -1469,13 +1469,13 @@ STATUS streamFormatChanged(PKinesisVideoStream pKinesisVideoStream, UINT32 codec
     STATUS retStatus = STATUS_SUCCESS;
     PKinesisVideoClient pKinesisVideoClient = NULL;
     BOOL streamLocked = FALSE;
-    PTrackInfo pTrackInfo = NULL;
-    UINT32 i;
 
-    CHK(pKinesisVideoStream != NULL, STATUS_NULL_ARG);
-    // These checks are borrowed from MKV. TODO: Consolidate these at some stage.
-    CHK(codecPrivateDataSize <= MKV_MAX_CODEC_PRIVATE_LEN, STATUS_MKV_INVALID_CODEC_PRIVATE_LENGTH);
-    CHK(codecPrivateDataSize == 0 || codecPrivateData != NULL, STATUS_MKV_CODEC_PRIVATE_NULL);
+    CHK(pKinesisVideoStream != NULL && pKinesisVideoStream->pKinesisVideoClient != NULL, STATUS_NULL_ARG);
+    pKinesisVideoClient = pKinesisVideoStream->pKinesisVideoClient;
+
+    // Lock the stream
+    pKinesisVideoClient->clientCallbacks.lockMutexFn(pKinesisVideoClient->clientCallbacks.customData, pKinesisVideoStream->base.lock);
+    streamLocked = TRUE;
 
     // Ensure we are not in a streaming state
     CHK_STATUS(acceptStateMachineState(pKinesisVideoStream->base.pStateMachine,
@@ -1487,31 +1487,7 @@ STATUS streamFormatChanged(PKinesisVideoStream pKinesisVideoStream, UINT32 codec
                                             STREAM_STATE_GET_TOKEN |
                                             STREAM_STATE_STOPPED));
 
-    pKinesisVideoClient = pKinesisVideoStream->pKinesisVideoClient;
-
-    // Lock the stream
-    pKinesisVideoClient->clientCallbacks.lockMutexFn(pKinesisVideoClient->clientCallbacks.customData, pKinesisVideoStream->base.lock);
-    streamLocked = TRUE;
-
-    // Free the existing allocation if any.
-    for(i = 0; i < pKinesisVideoStream->streamInfo.streamCaps.trackInfoCount; ++i) {
-        if (pKinesisVideoStream->streamInfo.streamCaps.trackInfoList[i].trackId == trackId) {
-            pTrackInfo = &pKinesisVideoStream->streamInfo.streamCaps.trackInfoList[i];
-            break;
-        }
-    }
-
-    CHK(pTrackInfo != NULL, STATUS_MKV_TRACK_INFO_NOT_FOUND);
-
-    pTrackInfo->codecPrivateDataSize = codecPrivateDataSize;
-    pTrackInfo->codecPrivateData = codecPrivateData;
-
-    // Need to free and re-create the packager
-    if (pKinesisVideoStream->pMkvGenerator != NULL) {
-        freeMkvGenerator(pKinesisVideoStream->pMkvGenerator);
-    }
-
-    CHK_STATUS(createPackager(pKinesisVideoStream, &pKinesisVideoStream->pMkvGenerator));
+    CHK_STATUS(mkvgenSetCodecPrivateData(pKinesisVideoStream->pMkvGenerator, trackId, codecPrivateDataSize, codecPrivateData));
 
     // Unlock the stream (even though it will be unlocked in the cleanup
     pKinesisVideoClient->clientCallbacks.unlockMutexFn(pKinesisVideoClient->clientCallbacks.customData, pKinesisVideoStream->base.lock);

kinesis-video-pic/src/client/tst/StreamApiFunctionalityTest.cpp

@@ -1111,8 +1111,7 @@ TEST_F(StreamApiFunctionalityTest, putFrame_StreamDataAvailable)
 
 TEST_F(StreamApiFunctionalityTest, putFrame_SubmitAckWithTimecodeZero)
 {
-    UINT32 i, remaining;
-    UINT32 frameSize = 100000;
+    UINT32 i, frameSize = 100000;
     PBYTE pData = (PBYTE) MEMALLOC(frameSize);
     UINT64 timestamp;
     Frame frame;
@@ -1165,7 +1164,7 @@ TEST_F(StreamApiFunctionalityTest, putFrame_SubmitAckWithTimecodeZero)
  */
 TEST_F(StreamApiFunctionalityTest, submitAck_shouldBeInWindowPutStreamResultAfterAllPutFrame)
 {
-    UINT32 i, remaining, filledSize;
+    UINT32 i, filledSize;
     UINT32 frameSize = 100000;
     PBYTE getDataBuffer = (PBYTE) MEMALLOC(frameSize * 4);
     PBYTE pData = (PBYTE) MEMALLOC(frameSize);

kinesis-video-pic/src/client/tst/StreamApiTest.cpp

@@ -460,3 +460,84 @@ TEST_F(StreamApiTest, kinesisVideoStreamFormatChanged_Valid)
 
     MEMFREE(pBuffer);
 }
+
+TEST_F(StreamApiTest, kinesisVideoStreamFormatChanged_Multitrack_free)
+{
+    UINT32 cpdSize = 1;
+    PBYTE pCpd = (PBYTE) MEMALLOC(cpdSize);
+    UINT32 cpd2Size = MKV_MAX_CODEC_PRIVATE_LEN;
+    PBYTE pCpd2 = (PBYTE) MEMALLOC(cpd2Size);
+
+    PTrackInfo trackInfos = (PTrackInfo) MEMALLOC(2 * SIZEOF(TrackInfo));
+
+    // Set the on-the-stack CPD to some values
+    MEMSET(pCpd, 0xab, cpdSize);
+    MEMSET(pCpd2, 0x55, cpd2Size);
+
+    trackInfos[0].trackId = TEST_TRACKID;
+    trackInfos[0].trackType = MKV_TRACK_INFO_TYPE_VIDEO;
+    trackInfos[0].codecPrivateDataSize = cpdSize;
+    trackInfos[0].codecPrivateData = pCpd;
+    STRCPY(trackInfos[0].codecId, (PCHAR) "TestCodec1");
+    STRCPY(trackInfos[0].trackName, (PCHAR) "TestTrack1");
+    trackInfos[0].trackCustomData.trackVideoConfig.videoWidth = 1280;
+    trackInfos[0].trackCustomData.trackVideoConfig.videoHeight = 720;
+
+    trackInfos[1].trackId = TEST_TRACKID + 1;
+    trackInfos[1].trackType = MKV_TRACK_INFO_TYPE_AUDIO;
+    trackInfos[1].codecPrivateDataSize = cpd2Size;
+    trackInfos[1].codecPrivateData = pCpd2;
+    STRCPY(trackInfos[1].codecId, (PCHAR) "TestCodec2");
+    STRCPY(trackInfos[1].trackName, (PCHAR) "TestTrack2");
+    trackInfos[1].trackCustomData.trackAudioConfig.channelConfig = 5;
+    trackInfos[1].trackCustomData.trackAudioConfig.samplingFrequency = 44000;
+
+    mStreamInfo.streamCaps.trackInfoCount = 2;
+    mStreamInfo.streamCaps.trackInfoList = trackInfos;
+
+    mStreamInfo.streamCaps.nalAdaptationFlags = NAL_ADAPTATION_ANNEXB_CPD_NALS;
+
+    // Create a stream
+    CreateStream();
+
+    // Free the codecs which were used in the stream creation track infos
+    MEMFREE(pCpd);
+    MEMFREE(pCpd2);
+    MEMFREE(trackInfos);
+
+    // Set the CPD for track 1
+    cpdSize = 3000;
+    pCpd = (PBYTE) MEMALLOC(cpdSize);
+    MEMSET(pCpd, 1, cpdSize);
+    EXPECT_EQ(STATUS_SUCCESS, kinesisVideoStreamFormatChanged(mStreamHandle, cpdSize, pCpd, TEST_TRACKID));
+
+    // Free the CPD
+    MEMFREE(pCpd);
+
+    // Set the CPD for track 2
+    cpdSize = 5000;
+    pCpd = (PBYTE) MEMALLOC(cpdSize);
+    MEMSET(pCpd, 2, cpdSize);
+    EXPECT_EQ(STATUS_SUCCESS, kinesisVideoStreamFormatChanged(mStreamHandle, cpdSize, pCpd, TEST_TRACKID + 1));
+
+    // Free the cpd
+    MEMFREE(pCpd);
+
+    // Set the CPD for track 1
+    cpdSize = 300;
+    pCpd = (PBYTE) MEMALLOC(cpdSize);
+    MEMSET(pCpd, 3, cpdSize);
+    EXPECT_EQ(STATUS_SUCCESS, kinesisVideoStreamFormatChanged(mStreamHandle, cpdSize, pCpd, TEST_TRACKID));
+
+    // Free the CPD
+    MEMFREE(pCpd);
+
+    // Set the CPD for track 2
+    cpdSize = 50;
+    pCpd = (PBYTE) MEMALLOC(cpdSize);
+    MEMSET(pCpd, 4, cpdSize);
+    EXPECT_EQ(STATUS_SUCCESS, kinesisVideoStreamFormatChanged(mStreamHandle, cpdSize, pCpd, TEST_TRACKID + 1));
+
+    // Free the cpd
+    MEMFREE(pCpd);
+}

kinesis-video-pic/src/mkvgen/include/com/amazonaws/kinesis/video/mkvgen/Include.h

@@ -475,6 +475,18 @@ PUBLIC_API STATUS mkvgenGetMkvOverheadSize(PMkvGenerator, MKV_STREAM_STATE, PUIN
  */
 PUBLIC_API STATUS mkvgenGetCurrentTimestamps(PMkvGenerator, PUINT64, PUINT64, PUINT64);
 
+/**
+ * Sets the Codec Private Data for a particular track
+ *
+ * @PMkvGenerator - The generator object
+ * UINT64 - IN - Track ID to set the Codec Private Data for
+ * UINT32 - IN - Codec Private Data size
+ * PBYTE - IN - Codec private Data bytes
+ *
+ * @return - STATUS code of the execution
+ */
+PUBLIC_API STATUS mkvgenSetCodecPrivateData(PMkvGenerator, UINT64, UINT32, PBYTE);
+
 #pragma pack(pop, include)
 
 #ifdef  __cplusplus

kinesis-video-pic/src/mkvgen/src/Include_i.h

@@ -548,6 +548,22 @@ UINT64 getTimeAdapter(UINT64);
  */
 STATUS getSamplingFreqAndChannelFromAacCpd(PBYTE, UINT32, PDOUBLE, PUINT16);
 
+/**
+ * Adapt Codec Private Data for the given track
+ *
+ * @PStreamMkvGenerator - IN - The MKV generator
+ * @MKV_TRACK_INFO_TYPE - IN - The track info type
+ * @PCHAR - IN - Codec ID string
+ * @UINT32 - IN - Input CPD size
+ * @PBYTE - IN - Input CPD bytes
+ * @PUINT32 - OUT - Output adapted CPD size
+ * @PBYTE* - OUT - Output adapted CPD bytes
+ * @PTrackCustomData - OUT - Track custom data to fill in
+ *
+ * @return Status of the operation
+ */
+STATUS mkvgenAdaptCodecPrivateData(PStreamMkvGenerator, MKV_TRACK_INFO_TYPE, PCHAR, UINT32, PBYTE, PUINT32, PBYTE*, PTrackCustomData);
+
 #pragma pack(pop, include_i)
 
 #ifdef  __cplusplus