Merge pull request #88 from mixer/v_9_14

9.14 rev. adding new best endpoint for ingest selection.

Added Docker Build
Added call to new Best v2 endpoint
Added more verbose logging and error handling
Added use of linter
Increase the length of vendor name and version

Author: NathanielvonSprecken-MS

.dockerignore

@@ -0,0 +1,2 @@
+.git
+**/.git

.gitignore

@@ -1,5 +1,6 @@
-build
 .vscode/*
 !.vscode/settings.json
 *.orig
 .vs/*
+publish
+build-output

Dockerfile

@@ -0,0 +1,46 @@
+FROM debian:9
+
+RUN apt-get update -y
+RUN apt-get install wget -y
+RUN apt-get install -y cmake
+RUN apt-get install git -y
+RUN apt-get install build-essential -y
+RUN apt-get install libssl-dev -y
+RUN apt-get install libcurl4-openssl-dev -y
+RUN apt-get upgrade ca-certificates -y
+
+RUN apt-get install -y jq curl
+
+RUN useradd ftl-user
+
+RUN mkdir -p /opt/ftl-sdk/vid
+
+RUN chown -R ftl-user:ftl-user /opt/ftl-sdk
+
+WORKDIR /opt/ftl-sdk/vid
+
+ARG VIDEO_URL=https://videotestmedia.blob.core.windows.net/ftl/sintel.h264
+RUN wget ${VIDEO_URL}
+ARG AUDIO_URL=https://videotestmedia.blob.core.windows.net/ftl/sintel.opus
+RUN wget ${AUDIO_URL}
+
+COPY --chown=ftl-user:ftl-user ./CMakeLists.txt /opt/ftl-sdk/CMakeLists.txt
+COPY --chown=ftl-user:ftl-user ./libcurl /opt/ftl-sdk/libcurl
+COPY --chown=ftl-user:ftl-user ./libjansson /opt/ftl-sdk/libjansson
+COPY --chown=ftl-user:ftl-user ./libftl /opt/ftl-sdk/libftl
+COPY --chown=ftl-user:ftl-user ./Doxyfile /opt/ftl-sdk/Doxyfile
+COPY --chown=ftl-user:ftl-user ./ftl_app /opt/ftl-sdk/ftl_app
+COPY --chown=ftl-user:ftl-user ./get-video /opt/ftl-sdk/get-video
+COPY --chown=ftl-user:ftl-user ./get-audio /opt/ftl-sdk/get-audio
+COPY --chown=ftl-user:ftl-user ./scripts /opt/ftl-sdk/scripts
+
+USER ftl-user
+
+WORKDIR /opt/ftl-sdk
+
+RUN ./scripts/build
+
+COPY --chown=ftl-user:ftl-user ./start-stream /opt/ftl-sdk/start-stream
+
+ENTRYPOINT ["./start-stream"]
+

build.bat

@@ -85,10 +85,10 @@ int main(int argc, char **argv)
   int verbose = 0;
 
   opterr = 0;
-
+  
   charon_install_ctrlc_handler();
-
-
+  
+  
   if (FTL_VERSION_MAINTENANCE != 0)
   {
     printf("FTLSDK - version %d.%d.%d\n", FTL_VERSION_MAJOR, FTL_VERSION_MINOR, FTL_VERSION_MAINTENANCE);
@@ -158,7 +158,7 @@ int main(int argc, char **argv)
 
     if (!init_video(&h264_handle, video_input))
     {
-      printf("Faild to open video file\n");
+      printf("Failed to open video file\n");
       return -1;
     }
   }
@@ -225,14 +225,14 @@ int main(int argc, char **argv)
   if (speedtest_duration)
   {
     printf("Running Speed test: sending %d kbps for %d ms", speedtest_kbps, speedtest_duration);
-  speed_test_t results;
-  if ((status_code = ftl_ingest_speed_test_ex(&handle, speedtest_kbps, speedtest_duration, &results)) == FTL_SUCCESS) {
-    printf("Speed test completed: Peak kbps %d, initial rtt %d, final rtt %d, %3.2f lost packets\n", 
+    speed_test_t results;
+    if ((status_code = ftl_ingest_speed_test_ex(&handle, speedtest_kbps, speedtest_duration, &results)) == FTL_SUCCESS) {
+      printf("Speed test completed: Peak kbps %d, initial rtt %d, final rtt %d, %3.2f lost packets\n", 
       results.peak_kbps, results.starting_rtt, results.ending_rtt, (float)results.lost_pkts * 100.f / (float)results.pkts_sent);
-  }
-  else {
-    printf("Speed test failed with: %s\n", ftl_status_code_to_string(status_code));
-  }
+    }
+    else {
+      printf("Speed test failed with: %s\n", ftl_status_code_to_string(status_code));
+    }
 
     goto cleanup;
   }

ftl_app/main.c

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -ue
+
+OUTPUT=$1
+
+curl 'https://www.dropbox.com/s/s2r6lggopt9ftw5/sintel.opus' \
+     -H 'authority: www.dropbox.com' \
+     -H 'cache-control: max-age=0' \
+     -H 'upgrade-insecure-requests: 1' \
+     -H 'user-agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.139 Safari/537.36' \
+     -H 'accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8' \
+     -H 'accept-encoding: gzip, deflate, br' \
+     -H 'accept-language: en-US,en;q=0.9' \
+     -H 'cookie: __Host-ss=UsByWdIPus; locale=en; gvc=MjU4NzQxNzA3MDE4MjU3MDIzNDY0Nzc2NjAxNDg5MTU4MTg0MjYz; seen-sl-signup-modal=VHJ1ZQ%3D%3D; t=0-Hq7tZ1TDyj-aBNiWYv8YQl; __Host-js_csrf=0-Hq7tZ1TDyj-aBNiWYv8YQl; seen-sl-download-modal=VHJ1ZQ%3D%3D' \
+     --compressed > $OUTPUT
+

get-audio

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -ue
+
+OUTPUT=$1
+
+curl 'https://www.dropbox.com/s/ruijibs0lgjnq51/sintel.h264' \
+     -H 'authority: www.dropbox.com' \
+     -H 'cache-control: max-age=0' \
+     -H 'upgrade-insecure-requests: 1' \
+     -H 'user-agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.139 Safari/537.36' \
+     -H 'accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8' \
+     -H 'accept-encoding: gzip, deflate, br' \
+     -H 'accept-language: en-US,en;q=0.9' \
+     -H 'cookie: __Host-ss=UsByWdIPus; locale=en; gvc=MjU4NzQxNzA3MDE4MjU3MDIzNDY0Nzc2NjAxNDg5MTU4MTg0MjYz; seen-sl-signup-modal=VHJ1ZQ%3D%3D; t=0-Hq7tZ1TDyj-aBNiWYv8YQl; __Host-js_csrf=0-Hq7tZ1TDyj-aBNiWYv8YQl; seen-sl-download-modal=VHJ1ZQ%3D%3D' \
+     --compressed > $OUTPUT

get-video

@@ -12,7 +12,7 @@ static int _lookup_ingest_ip(const char *ingest_location, char *ingest_ip);
 char error_message[1000];
 FTL_API const int FTL_VERSION_MAJOR = 0;
 FTL_API const int FTL_VERSION_MINOR = 9;
-FTL_API const int FTL_VERSION_MAINTENANCE = 13;
+FTL_API const int FTL_VERSION_MAINTENANCE = 14;
 
 // Initializes all sublibraries used by FTL
 FTL_API ftl_status_t ftl_init() {
@@ -408,6 +408,8 @@ FTL_API char* ftl_status_code_to_string(ftl_status_t status) {
     return "the ingest socket was closed";
   case FTL_INGEST_SOCKET_TIMEOUT:
     return "the ingest socket was hit a timeout.";
+  case FTL_INGEST_SERVER_TERMINATE:
+    return "The server has terminated the stream.";
   case FTL_UNKNOWN_ERROR_CODE:
   default:
     /* Unknown FTL error */

libftl/ftl-sdk.c

@@ -92,6 +92,7 @@ typedef enum {
   FTL_SPEED_TEST_ABORTED,
   FTL_INGEST_SOCKET_CLOSED,
   FTL_INGEST_SOCKET_TIMEOUT,
+  FTL_INGEST_SERVER_TERMINATE,
 } ftl_status_t;
 
 typedef enum {

libftl/ftl.h

@@ -274,7 +274,7 @@ ftl_status_t _set_ingest_hostname(ftl_stream_configuration_private_t *ftl) {
 #endif
     ftl->ingest_hostname = _strdup(ftl->param_ingest_hostname);
   } while (0);
-
+  
   return ret_status;
 }