c53da26 release notes updated for v1.3.1

ca7263a fix negotiation error caused by camera with fractional fps
configure omxh264enc's key frame interval and turn off inline SPS/PPS header
ce52eb9 command line args for demo app requires stream_name at the end
897ace1 Docker RTSP demo - Readme instructions
92cc0b8 Running RTSP demo producer  within Docker container
 readme update for command line args to have stream_name at the end
 bfa020b Adding H265 parsing and adaptation support to the generator
cfb6f6a install bison before flex because of dependency issue revealed in amazon linux
12822f7 add cmake path & h264 frames

Author: chehefen

README.md

@@ -229,6 +229,10 @@ AWS_ACCESS_KEY_ID=<ACCESS_KEY> AWS_SECRET_ACCESS_KEY=<SECRET_KEY> ./kinesis_vide
 
 ```
 
+##### Run the demo application from Docker
+
+Refer the **README.md** file in the  *docker_native_scripts* folder for running the build and RTSP demo app within Docker container.
+
 #### Running C++ Unit tests
 
 The executable for **unit tests** will be built in `./start` inside the `kinesis-video-native-build` directory. Launch it and it will run the unit test and kick off dummy frame streaming.
@@ -264,6 +268,21 @@ Ubuntu bulds link against the system versions of the open source component libra
 ``` 
    to rebuild and re-link the project only.
 
+##### Library not found error when running the demo application
+If any error similar to the following shows that the library path is not properly set:
+
+```
+ liblog4cplus-1.2.so.5: cannot open shared object file: No such file or directory
+
+```
+To resolve this issue, export the LD_LIBRARY_PATH=`<full path to your sdk cpp directory`>/kinesis-video-native-build/downloads/local/lib. If you have downloaded the CPP SDK in `/opt/awssdk` directory then you can set
+	the LD_LIBRARY_PATH as below:
+
+```
+export LD_LIBRARY_PATH=/opt/awssdk/amazon-kinesis-video-streams-producer-sdk-cpp/kinesis-video-native-build/downloads/local/lib:$LD_LIBRARY_PATH
+
+```
+
 ##### Raspberry PI failure to load the camera device.
 
 To check this is the case run `ls /dev/video*` - it should be file not found. The remedy is to run the following:
@@ -322,6 +341,10 @@ make install
 
 
 ## Release Notes
+
+#### Release 1.3.1 (5th April 2018)
+* Fixed video source negotiation error caused by camera with fractional fps 
+* Docker suport for RTSP streaming
 #### Release 1.3.0 (15th March 2018)
 * Fixed producer intermittent termination issue for some edge cases involving re-streaming on error.
 #### Release 1.2.3 (1st March 2018)

docker_native_scripts/Dockerfile

@@ -0,0 +1,60 @@
+FROM ubuntu:17.10
+
+RUN apt-get update
+RUN apt-get install -y git && \
+    apt-get install -y vim  && \
+    apt-get install -y curl && \
+    apt-get install -y xz-utils && \
+    apt-get install -y byacc  && \
+    apt-get install -y wget  && \
+    apt-get install -y g++ && \
+    apt-get install -y python2.7 && \
+    apt-get install -y pkg-config && \
+    apt-get install -y cmake && \
+    apt-get install -y maven && \
+    apt-get install -y openjdk-8-jdk && \
+    rm -rf /var/lib/apt/lists/*
+ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64/
+WORKDIR /opt/
+
+# =================  HTTPS Certificate =====================================================================
+
+RUN wget https://www.amazontrust.com/repository/SFSRootCAG2.pem 
+RUN cp  SFSRootCAG2.pem /etc/ssl/cert.pem
+
+# ===== Git Checkout latest Kinesis Video Streams Producer SDK (CPP) =======================================
+
+RUN git clone https://github.com/awslabs/amazon-kinesis-video-streams-producer-sdk-cpp.git
+
+# ================ Build the Producer SDK (CPP) ============================================================
+
+WORKDIR /opt/amazon-kinesis-video-streams-producer-sdk-cpp/kinesis-video-native-build/
+RUN  chmod a+x ./install-script
+RUN ./install-script a 
+COPY start_rtsp_in_docker.sh /opt/amazon-kinesis-video-streams-producer-sdk-cpp/kinesis-video-native-build/
+RUN chmod a+x ./start_rtsp_in_docker.sh
+
+# comment the following step if you would like to customize the docker image build
+ENTRYPOINT ["/opt/amazon-kinesis-video-streams-producer-sdk-cpp/kinesis-video-native-build/start_rtsp_in_docker.sh"]
+
+# ====  How to build docker image and run the container once its built =====================================
+# 
+# ==== 1. build the docker image using the Dockerfile ======================================================
+# ==== Make sure the Dockerfile and start_rtsp_in_docker.sh is present in the current working directory =====
+#
+# $ docker build -t rtspdockertest .
+# 
+# === List the docker images built ==================================================================================
+#
+# $ docker images
+#  REPOSITORY          TAG                 IMAGE ID            CREATED                  SIZE
+# rtspdockertest      latest              54f0d65f69b2        Less than a second ago   2.82GB
+#
+# === Start the container with credentials ===
+# $ docker run -it 54f0d65f69b2 <AWS_ACCESS_KEY_ID> <AWS_SECRET_ACCESS_KEY> <RTSP_URL> <STREAM_NAME>
+# 
+#
+#
+
+
+

docker_native_scripts/README.md

@@ -0,0 +1,36 @@
+### Sample Docker container build and run instructions for Kinesis Video Streams RTSP demo application
+#### 1. Install Docker
+
+Follow instructions to download and start Docker
+
+* [ Docker download instructions ]( https://www.docker.com/community-edition#/download )
+* [Getting started with Docker](https://docs.docker.com/get-started/)
+
+#### 2. Build Docker image
+Download the `Dockerfile` and `start_rtsp_in_docker.sh` into a folder.  Once the Docker is installed and running, you can then build the docker image by using the following command.
+
+```
+  $ docker build -t rtspdockertest .
+```
+* Get the image id from the previous step (once the build is complete) by running the command `docker images` which will display the Docker images built in your system.
+
+```
+  $ docker images
+```
+
+* Use the **IMAGE_ID** from the output of the previous command (e.g `f97f1a633597` ) :
+
+```
+    REPOSITORY          TAG                 IMAGE ID            CREATED                  SIZE
+  rtspdockertest      latest              54f0d65f69b2        Less than a second ago   2.82GB
+
+```
+#### Start the Docker container 
+---
+
+*  Start the Kinesis Video Streams Docker container using the following command:
+```
+   $ docker run -it <IMAGE_ID> <AWS_ACCESS_KEY_ID> <AWS_SECRET_ACCESS_KEY> <RTSP_URL> <STREAM_NAME>
+```
+
+

docker_native_scripts/start_rtsp_in_docker.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+# Demo GStreamer Sample Application for RTSP Streaming to Kinesis Video Streams
+# To be run inside the Docker container 
+
+cd /opt/amazon-kinesis-video-streams-producer-sdk-cpp/kinesis-video-native-build/
+
+# Start the demo rtsp application to send video streams
+export LD_LIBRARY_PATH=/opt/amazon-kinesis-video-streams-producer-sdk-cpp/kinesis-video-native-build/downloads/local/lib:$LD_LIBRARY_PATH
+AWS_ACCESS_KEY_ID=$1 AWS_SECRET_ACCESS_KEY=$2 ./kinesis_video_gstreamer_sample_rtsp_app $3 $4

kinesis-video-gst-demo/.gitignore

@@ -0,0 +1 @@
+.DS_Store

kinesis-video-gst-demo/kinesis_video_gstreamer_sample_app.cpp

@@ -174,30 +174,38 @@ static GstFlowReturn on_new_sample(GstElement *sink, CustomData *data) {
     }
 
     GstBuffer *buffer = gst_sample_get_buffer(sample);
-    size_t buffer_size = gst_buffer_get_size(buffer);
-    uint8_t *frame_data = new uint8_t[buffer_size];
-    gst_buffer_extract(buffer, 0, frame_data, buffer_size);
-
-    bool delta = GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DELTA_UNIT);
-    FRAME_FLAGS kinesis_video_flags;
-    if(!delta) {
-        // Safeguard stream and playback in case of h264 keyframes comes with different PTS and DTS
-        if (data->h264_stream_supported) {
-            buffer->pts = buffer->dts;
-        }
-        kinesis_video_flags = FRAME_FLAG_KEY_FRAME;
-    } else {
-        kinesis_video_flags = FRAME_FLAG_NONE;
-    }
+    bool isDroppable =  GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_CORRUPTED) ||
+                        GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DECODE_ONLY);
+    if (!isDroppable) {
+        bool isHeader = GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_HEADER);
+        // drop if buffer contains header only and has invalid timestamp
+        if (!(isHeader && (!GST_BUFFER_PTS_IS_VALID(buffer) || !GST_BUFFER_DTS_IS_VALID(buffer)))) {
+            size_t buffer_size = gst_buffer_get_size(buffer);
+            uint8_t *frame_data = new uint8_t[buffer_size];
+            gst_buffer_extract(buffer, 0, frame_data, buffer_size);
+
+            bool delta = GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DELTA_UNIT);
+            FRAME_FLAGS kinesis_video_flags;
+            if(!delta) {
+                // Safeguard stream and playback in case of h264 keyframes comes with different PTS and DTS
+                if (data->h264_stream_supported) {
+                    buffer->pts = buffer->dts;
+                }
+                kinesis_video_flags = FRAME_FLAG_KEY_FRAME;
+            } else {
+                kinesis_video_flags = FRAME_FLAG_NONE;
+            }
 
-    if (false == put_frame(data->kinesis_video_stream, frame_data, buffer_size, std::chrono::nanoseconds(buffer->pts),
-                           std::chrono::nanoseconds(buffer->dts), kinesis_video_flags)) {
-        g_printerr("Dropped frame!\n");
+            if (false == put_frame(data->kinesis_video_stream, frame_data, buffer_size, std::chrono::nanoseconds(buffer->pts),
+                                   std::chrono::nanoseconds(buffer->dts), kinesis_video_flags)) {
+                g_printerr("Dropped frame!\n");
+            }
+
+            delete[] frame_data;
+        }
     }
 
-    delete[] frame_data;
     gst_sample_unref(sample);
-
     return GST_FLOW_OK;
 }
 
@@ -206,7 +214,7 @@ static bool format_supported_by_source(GstCaps *src_caps, bool h264_stream, int
     query_caps = gst_caps_new_simple(h264_stream ? "video/x-h264" : "video/x-raw",
                                      "width", G_TYPE_INT, width,
                                      "height", G_TYPE_INT, height,
-                                     "framerate", GST_TYPE_FRACTION, framerate, 1,
+                                     "framerate", GST_TYPE_FRACTION_RANGE, framerate, 1, framerate + 1, 1,
                                      NULL);
     return gst_caps_can_intersect(query_caps, src_caps);
 }
@@ -323,7 +331,8 @@ int gstreamer_init(int argc, char* argv[]) {
 
     if (argc < 2) {
         LOG_ERROR(
-                "Usage: AWS_ACCESS_KEY_ID=SAMPLEKEY AWS_SECRET_ACCESS_KEY=SAMPLESECRET ./kinesis_video_gstreamer_sample_app my-stream-name -w width -h height -f framerate -b bitrateInKBPS");
+                "Usage: AWS_ACCESS_KEY_ID=SAMPLEKEY AWS_SECRET_ACCESS_KEY=SAMPLESECRET ./kinesis_video_gstreamer_sample_app -w width -h height -f framerate -b bitrateInKBPS my-stream-name \n \
+           or AWS_ACCESS_KEY_ID=SAMPLEKEY AWS_SECRET_ACCESS_KEY=SAMPLESECRET ./kinesis_video_gstreamer_sample_app my-stream-name");
         return 1;
     }
 
@@ -455,7 +464,7 @@ int gstreamer_init(int argc, char* argv[]) {
             }
         }
         if (!found_resolution) {
-            g_printerr("Default list of resolutions not supported by video source\n");
+            g_printerr("Default list of resolutions (1920x1080, 1280x720, 640x480) are not supported by video source\n");
             return 1;
         }
     }
@@ -480,7 +489,7 @@ int gstreamer_init(int argc, char* argv[]) {
                                           "format", G_TYPE_STRING, "I420",
                                           "width", G_TYPE_INT, width,
                                           "height", G_TYPE_INT, height,
-                                          "framerate", GST_TYPE_FRACTION, framerate, 1,
+                                          "framerate", GST_TYPE_FRACTION_RANGE, framerate, 1, framerate + 1, 1,
                                           NULL);
     } else {
         source_caps = gst_caps_new_simple("video/x-h264",
@@ -498,7 +507,8 @@ int gstreamer_init(int argc, char* argv[]) {
             g_object_set(G_OBJECT (data.encoder), "allow-frame-reordering", FALSE, "realtime", TRUE, "max-keyframe-interval",
                               45, "bitrate", bitrateInKBPS, NULL);
         } else if (isOnRpi) {
-            g_object_set(G_OBJECT (data.encoder), "control-rate", 1, "target-bitrate", bitrateInKBPS*10000, NULL);
+            g_object_set(G_OBJECT (data.encoder), "control-rate", 1, "target-bitrate", bitrateInKBPS*10000,
+                "periodicity-idr", 45, "inline-header", FALSE, NULL);
         } else {
             g_object_set(G_OBJECT (data.encoder), "bframes", 0, "key-int-max", 45, "bitrate", bitrateInKBPS, NULL);
         }
@@ -511,7 +521,7 @@ int gstreamer_init(int argc, char* argv[]) {
                                              "alignment", G_TYPE_STRING, "au",
                                              "width", G_TYPE_INT, width,
                                              "height", G_TYPE_INT, height,
-                                             "framerate", GST_TYPE_FRACTION, framerate, 1,
+                                             "framerate", GST_TYPE_FRACTION_RANGE, framerate, 1, framerate + 1, 1,
                                              NULL);
     if (!data.h264_stream_supported) {
         gst_caps_set_simple(h264_caps, "profile", G_TYPE_STRING, "baseline",

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

@@ -0,0 +1,4 @@
+*.iml
+build
+outputs
+.idea

kinesis-video-pic/.gitignore

@@ -303,29 +303,3 @@ VOID decrementUsage(PHeap pHeap, UINT32 overallSize) {
     pHeap->heapSize -= overallSize;
     pHeap->numAlloc--;
 }
-
-/**
- * Prints the content of the memory
- */
-VOID printMemory(PVOID pMem, UINT32 size)
-{
-    DLOGE("============================================");
-    DLOGE("Dumping memory: %p, size: %d", pMem, size);
-    DLOGE("++++++++++++++++++++++++++++++++++++++++++++");
-    CHAR buf[256];
-    PCHAR pCur;
-    pCur = buf;
-    PBYTE pByte = (PBYTE) pMem;
-    for(UINT32 i = 0; i < size; i++) {
-        sprintf(pCur, "%02x ", *pByte++);
-        pCur += 3;
-        if ((i + 1) % 16 == 0) {
-            DLOGE("%s", buf);
-            buf[0] = 0;
-            pCur = buf;
-        }
-    }
-    DLOGE("++++++++++++++++++++++++++++++++++++++++++++");
-    DLOGE("Dumping memory done!");
-    DLOGE("============================================");
-}

kinesis-video-pic/src/heap/src/Common.cpp

@@ -78,11 +78,6 @@ DEFINE_INIT_HEAP(commonHeapInit);
  */
 DEFINE_HEAP_CHK(commonHeapDebugCheckAllocator);
 
-/**
- * Prints the content of the memory
- */
-VOID printMemory(PVOID, UINT32);
-
 /**
  * Increment the allocations/count
  */