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.4 (14th Feb 2019)
+* Stability and bug fixes.
+
 #### Release 1.7.3 (12th Feb 2019)
 * Enforce non-zero TrackUid and SegmentUUID.
 

kinesis-video-gst-demo/kinesis_video_gstreamer_audio_video_sample_app.cpp

@@ -441,6 +441,7 @@ static GstFlowReturn on_new_sample(GstElement *sink, CustomData *data) {
 
     dropFrame =  GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_CORRUPTED) ||
                  GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DECODE_ONLY) ||
+                 (GST_BUFFER_FLAGS(buffer) == GST_BUFFER_FLAG_DISCONT) ||
                  (!GST_BUFFER_PTS_IS_VALID(buffer)); //frame with invalid pts cannot be processed.
     if (dropFrame) {
         if (!GST_BUFFER_PTS_IS_VALID(buffer)) {

kinesis-video-gst-demo/kinesis_video_gstreamer_sample_app.cpp

@@ -348,12 +348,12 @@ static GstFlowReturn on_new_sample(GstElement *sink, CustomData *data) {
     isHeader = GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_HEADER);
     isDroppable = GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_CORRUPTED) ||
                   GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DECODE_ONLY) ||
+                  (GST_BUFFER_FLAGS(buffer) == GST_BUFFER_FLAG_DISCONT) ||
                   // drop if buffer contains header only and has invalid timestamp
                   (isHeader && (!GST_BUFFER_PTS_IS_VALID(buffer) || !GST_BUFFER_DTS_IS_VALID(buffer)));
 
     if (!isDroppable) {
         buffer_size = gst_buffer_get_size(buffer);
-
         // resize data buffer if not enough storage
         if (buffer_size > data->frame_data_size) {
             delete [] data->frame_data;

kinesis-video-gstreamer-plugin/plugin-src/gstkvssink.cpp

@@ -1097,9 +1097,9 @@ gst_kvs_sink_handle_buffer (GstCollectPads * pads,
         goto CleanUp;
     }
 
-    //LOG_DEBUG("flags" << GST_BUFFER_FLAGS(buf));
     isDroppable =   GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_CORRUPTED) ||
                     GST_BUFFER_FLAG_IS_SET(buf, GST_BUFFER_FLAG_DECODE_ONLY) ||
+                    (GST_BUFFER_FLAGS(buf) == GST_BUFFER_FLAG_DISCONT) ||
                     (!GST_BUFFER_PTS_IS_VALID(buf)); //frame with invalid pts cannot be processed.
 
     if (isDroppable) {

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

@@ -202,18 +202,12 @@ STATUS createStream(PKinesisVideoClient pKinesisVideoClient, PStreamInfo pStream
     pCurPnt += MKV_SEGMENT_UUID_LEN;
 
     // Copy the structures in their entirety
+    // NOTE: This will copy the raw pointers, however, we will only use it in the duration of the call.
     MEMCPY(pCurPnt, pStreamInfo->streamCaps.trackInfoList, trackInfoSize);
     pKinesisVideoStream->streamInfo.streamCaps.trackInfoList = (PTrackInfo) pCurPnt;
+
     // Move pCurPnt to the end of pKinesisVideoStream->streamInfo.streamCaps.trackInfoList
     pCurPnt = (PBYTE) (pKinesisVideoStream->streamInfo.streamCaps.trackInfoList + pKinesisVideoStream->streamInfo.streamCaps.trackInfoCount);
-    for(i = 0; i < pKinesisVideoStream->streamInfo.streamCaps.trackInfoCount; ++i) {
-        PTrackInfo pTrackInfo = &pKinesisVideoStream->streamInfo.streamCaps.trackInfoList[i];
-        if (pStreamInfo->streamCaps.trackInfoList[i].codecPrivateDataSize != 0 && pStreamInfo->streamCaps.trackInfoList[i].codecPrivateData != NULL) {
-            pTrackInfo->codecPrivateData = (PBYTE) MEMALLOC(pTrackInfo->codecPrivateDataSize);
-            CHK(pTrackInfo->codecPrivateData != NULL, STATUS_NOT_ENOUGH_MEMORY);
-            MEMCPY(pTrackInfo->codecPrivateData, pStreamInfo->streamCaps.trackInfoList[i].codecPrivateData, pTrackInfo->codecPrivateDataSize);
-        }
-    }
 
     // Calculate the max items in the view
     maxViewItems = calculateViewItemCount(&pKinesisVideoStream->streamInfo);
@@ -323,15 +317,6 @@ STATUS freeStream(PKinesisVideoStream pKinesisVideoStream)
     // Free the metadata queue
     freeStackQueue(pKinesisVideoStream->pMetadataQueue);
 
-    // Free the codec private data for all tracks
-    for (i = 0; i < pKinesisVideoStream->streamInfo.streamCaps.trackInfoCount; ++i) {
-        if (pKinesisVideoStream->streamInfo.streamCaps.trackInfoList[i].codecPrivateData != NULL) {
-            MEMFREE(pKinesisVideoStream->streamInfo.streamCaps.trackInfoList[i].codecPrivateData);
-            pKinesisVideoStream->streamInfo.streamCaps.trackInfoList[i].codecPrivateData = NULL;
-        }
-        pKinesisVideoStream->streamInfo.streamCaps.trackInfoList[i].codecPrivateDataSize = 0;
-    }
-
     // Free the eosTracker and eofrTracker data if any
     freeMetadataTracker(&pKinesisVideoStream->eosTracker);
     freeMetadataTracker(&pKinesisVideoStream->metadataTracker);
@@ -542,6 +527,7 @@ STATUS putFrame(PKinesisVideoStream pKinesisVideoStream, PFrame pFrame) {
             break;
         }
     }
+
     CHK (trackInfoFound, STATUS_MKV_TRACK_INFO_NOT_FOUND);
 
     // Check if the stream has been stopped
@@ -1482,7 +1468,7 @@ STATUS streamFormatChanged(PKinesisVideoStream pKinesisVideoStream, UINT32 codec
     ENTERS();
     STATUS retStatus = STATUS_SUCCESS;
     PKinesisVideoClient pKinesisVideoClient = NULL;
-    BOOL streamLocked = FALSE, trackInfoFound = FALSE;
+    BOOL streamLocked = FALSE;
     PTrackInfo pTrackInfo = NULL;
     UINT32 i;
 
@@ -1510,30 +1496,15 @@ STATUS streamFormatChanged(PKinesisVideoStream pKinesisVideoStream, UINT32 codec
     // Free the existing allocation if any.
     for(i = 0; i < pKinesisVideoStream->streamInfo.streamCaps.trackInfoCount; ++i) {
         if (pKinesisVideoStream->streamInfo.streamCaps.trackInfoList[i].trackId == trackId) {
-            trackInfoFound = TRUE;
             pTrackInfo = &pKinesisVideoStream->streamInfo.streamCaps.trackInfoList[i];
-            if (pTrackInfo->codecPrivateData != NULL) {
-                MEMFREE(pTrackInfo->codecPrivateData);
-                pTrackInfo->codecPrivateData = NULL;
-                pTrackInfo->codecPrivateDataSize = 0;
-            }
             break;
         }
     }
-    CHK(trackInfoFound, STATUS_MKV_TRACK_INFO_NOT_FOUND);
-
-    // Set the size first
-    // IMPORTANT: The CPD size could be set to 0 to clear any previous CPD.
-    pTrackInfo->codecPrivateDataSize = codecPrivateDataSize;
 
-    // Check if we need to do anything
-    if (codecPrivateDataSize != 0) {
-        pTrackInfo->codecPrivateData = (PBYTE) MEMALLOC(codecPrivateDataSize);
-        CHK(pTrackInfo->codecPrivateData != NULL, STATUS_NOT_ENOUGH_MEMORY);
+    CHK(pTrackInfo != NULL, STATUS_MKV_TRACK_INFO_NOT_FOUND);
 
-        // Copy the bits
-        MEMCPY(pTrackInfo->codecPrivateData, codecPrivateData, codecPrivateDataSize);
-    }
+    pTrackInfo->codecPrivateDataSize = codecPrivateDataSize;
+    pTrackInfo->codecPrivateData = codecPrivateData;
 
     // Need to free and re-create the packager
     if (pKinesisVideoStream->pMkvGenerator != NULL) {

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

@@ -165,9 +165,13 @@ typedef enum {
     MKV_STATE_START_BLOCK,
 } MKV_STREAM_STATE, *PMKV_STREAM_STATE;
 
+/**
+ * Track types taken from the MKV specification
+ */
 typedef enum {
-    MKV_TRACK_INFO_TYPE_VIDEO,
-    MKV_TRACK_INFO_TYPE_AUDIO,
+    MKV_TRACK_INFO_TYPE_VIDEO = (BYTE) 0x01,
+    MKV_TRACK_INFO_TYPE_AUDIO = (BYTE) 0x02,
+    MKV_TRACK_INFO_TYPE_UNKOWN = (BYTE) 0x03,
 } MKV_TRACK_INFO_TYPE, *PMKV_TRACK_INFO_TYPE;
 
 /**

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

@@ -22,26 +22,14 @@ extern "C" {
 // General defines and data structures
 ////////////////////////////////////////////////////
 
-/**
- * MKV track types
- * Default track type for MKV = complex
- */
-#define MKV_DEFAULT_TRACK_TYPE          0x03
-#define MKV_TRACK_TYPE_VIDEO            0x01
-#define MKV_TRACK_TYPE_AUDIO            0x02
-
-/**
- * Content type prefixes
- */
-#define MKV_CONTENT_TYPE_PREFIX_AUDIO       ((PCHAR) "audio/")
-#define MKV_CONTENT_TYPE_PREFIX_VIDEO       ((PCHAR) "video/")
-
 /**
  * Special processing for the types
  */
 #define MKV_H264_CONTENT_TYPE               ((PCHAR) "video/h264")
 #define MKV_H265_CONTENT_TYPE               ((PCHAR) "video/h265")
-#define MKV_X_MKV_CONTENT_TYPE              ((PCHAR) "video/x-matroska")
+#define MKV_X_MKV_VIDEO_CONTENT_TYPE        ((PCHAR) "video/x-matroska")
+#define MKV_X_MKV_AUDIO_CONTENT_TYPE        ((PCHAR) "audio/x-matroska")
+#define MKV_AAC_CONTENT_TYPE                ((PCHAR) "audio/aac")
 #define MKV_FOURCC_CODEC_ID                 ((PCHAR) "V_MS/VFW/FOURCC")
 
 /**
@@ -126,7 +114,7 @@ extern UINT32 gMkvTrackNameBitsSize;
 // Number of bytes to skip to get from begin of TrackEntry to TrackNumber
 #define MKV_TRACK_NUMBER_OFFSET 7
 
-// Number of bytes to skip to get from begin of TrackEntry to TrackNumber
+// Number of bytes to skip to get from begin of TrackEntry to TrackType
 #define MKV_TRACK_TYPE_OFFSET 21
 
 // Number of bytes to skip to get from begin of Audio to SamplingFrequency
@@ -256,6 +244,24 @@ typedef enum {
     MKV_GENERATOR_STATE_TAGS,
 } MKV_GENERATOR_STATE, *PMKV_GENERATOR_STATE;
 
+/**
+ * MKV track type used internally
+ */
+typedef enum {
+    MKV_CONTENT_TYPE_NONE = (UINT64) 0,
+    MKV_CONTENT_TYPE_UNKNOWN = (1 << 0),
+    MKV_CONTENT_TYPE_H264 = (1 << 1),
+    MKV_CONTENT_TYPE_H265 = (1 << 2),
+    MKV_CONTENT_TYPE_X_MKV_VIDEO = (1 << 3),
+    MKV_CONTENT_TYPE_X_MKV_AUDIO = (1 << 4),
+    MKV_CONTENT_TYPE_AAC = (1 << 5),
+} MKV_CONTENT_TYPE, *PMKV_CONTENT_TYPE;
+
+/**
+ * Content type delimiter character
+ */
+#define MKV_CONTENT_TYPE_DELIMITER          ','
+
 /**
  * MkvGenerator internal structure
  */
@@ -279,7 +285,7 @@ typedef struct {
     UINT64 clusterDuration;
 
     // The content type of the stream
-    BYTE trackType;
+    MKV_CONTENT_TYPE contentType;
 
     // Time function entry
     GetCurrentTimeFunc getTimeFn;
@@ -362,13 +368,23 @@ UINT32 mkvgenGetFrameOverhead(PStreamMkvGenerator, MKV_STREAM_STATE);
 STATUS mkvgenValidateFrame(PStreamMkvGenerator, PFrame, PUINT64, PUINT64, PUINT64, PMKV_STREAM_STATE);
 
 /**
- * Returns the MKV track type from the provided content type
+ * Returns the MKV content type from the provided content type string by tokenizing and matching the string
+ *
+ * @PCHAR - content type string to convert
+ *
+ * @return - MKV content type corresponding to the content type string
+ */
+MKV_CONTENT_TYPE mkvgenGetContentTypeFromContentTypeString(PCHAR);
+
+/**
+ * Returns the MKV content type for a given tokenized string
  *
- * @PCHAR - content type to convert
+ * @PCHAR - content type string token to convert
+ * @UINT32 - the length of the token
  *
- * @return - MKV track type corresponding to the content type
+ * @return - MKV content type corresponding to the content type string
  */
-BYTE mkvgenGetTrackTypeFromContentType(PCHAR);
+MKV_CONTENT_TYPE mkvgenGetContentTypeFromContentTypeTokenString(PCHAR, UINT32);
 
 /**
  * EBML encodes a number and stores in the buffer