* update to openh264 2.0.0

* update to libcluon 0.0.121

Signed-off-by: Christian Berger <christian.berger@gu.se>

CMakeLists.txt

@@ -20,7 +20,7 @@ project(opendlv-video-h264-encoder)
 ################################################################################
 # Defining the relevant versions of OpenDLV Standard Message Set and libcluon.
 set(OPENDLV_STANDARD_MESSAGE_SET opendlv-standard-message-set-v0.9.6.odvd)
-set(CLUON_COMPLETE cluon-complete-v0.0.117.hpp)
+set(CLUON_COMPLETE cluon-complete-v0.0.121.hpp)
 
 ################################################################################
 # Set the search path for .cmake files.

Dockerfile.amd64

@@ -27,7 +27,7 @@ RUN apt-get update -y && \
         nasm \
         wget
 RUN cd tmp && \
-    git clone --depth 1 --branch v1.8.0 https://github.com/cisco/openh264.git && \
+    git clone --depth 1 --branch v2.0.0 https://github.com/cisco/openh264.git && \
     cd openh264 && mkdir b && cd b \
     make -j2 -f ../Makefile libraries && make -f ../Makefile install
 ADD . /opt/sources
@@ -36,16 +36,16 @@ RUN mkdir build && \
     cd build && \
     cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=/tmp .. && \
     make && make install
-RUN cd /tmp && wget http://ciscobinary.openh264.org/libopenh264-1.8.0-linux64.4.so.bz2
+RUN cd /tmp && wget http://ciscobinary.openh264.org/libopenh264-2.0.0-linux64.5.so.bz2
 
 # Part to deploy opendlv-video-h264-encoder.
 FROM ubuntu:18.04
 MAINTAINER Christian Berger "christian.berger@gu.se"
 
 WORKDIR /usr/lib/x86_64-linux-gnu
-COPY --from=builder /tmp/libopenh264-1.8.0-linux64.4.so.bz2 .
-RUN bunzip2 libopenh264-1.8.0-linux64.4.so.bz2 && \
-    ln -sf libopenh264-1.8.0-linux64.4.so libopenh264.so.4
+COPY --from=builder /tmp/libopenh264-2.0.0-linux64.5.so.bz2 .
+RUN bunzip2 libopenh264-2.0.0-linux64.5.so.bz2 && \
+    ln -sf libopenh264-2.0.0-linux64.5.so libopenh264.so.4
 
 WORKDIR /usr/bin
 COPY --from=builder /tmp/bin/opendlv-video-h264-encoder .

README.md

@@ -46,7 +46,7 @@ version: '2' # Must be present exactly once at the beginning of the docker-compo
 services:    # Must be present exactly once at the beginning of the docker-compose.yml file
     video-h264-encoder-amd64:
         build:
-            context: https://github.com/chalmers-revere/opendlv-video-h264-encoder.git#v0.0.2
+            context: https://github.com/chalmers-revere/opendlv-video-h264-encoder.git#v0.0.3
             dockerfile: Dockerfile.amd64
         restart: on-failure
         network_mode: "host"
@@ -70,26 +70,26 @@ The parameters to the application are:
 * `--height=H`: Height of the image in the shared memory area
 * `--bitrate=B`: desired bitrate (default: 100,000)
 * `--gop=G`: desired length of group of pictures (default: 10)
-* `-- bitrate-max`: optional: maximum bitrate (default: 5,000,000, min: 100,000 max: 5,000,000)
-* `-- gop`: optional: length of group of pictures (default = 10)
-* `-- rc-mode`: optional: rate control mode (default: RC_QUALITY_MODE (0), min: 0, max: 4)
-* `-- ecomplexity`: optional: complexity mode (default: LOW_COMPLEXITY (0), min: 0, max: 2)
-* `-- sps-pps`: optional: SPS/PPS strategy (default: CONSTANT_ID (0), min: 0, max: 3)
-* `-- num-ref-frame`: optional: number of reference frame used (default: 1, 0: auto, >0 reference frames)
-* `-- ssei`: optional: toggle ssei (default: 0)
-* `-- prefix-nal`: optional: toggle prefix NAL adding control (default: 0)
-* `-- entropy-coding`: optional: toggle entropy encoding (default: CAVLC (0))
-* `-- frame-skip`: optional: toggle fram-skipping to keep the bitrate within limits (default: 1)
-* `-- qp-max`: optional: Quantization Parameter max (default: 42, min: 0 max: 51)
-* `-- qp-min`: optional: Quantization Parameter min (default: 12, min: 0 max: 51)
-* `-- long-term-ref`: optional: toggle long term reference control (default: 0)
-* `-- loop-filter`: optional: deblocking loop filter (default: 0, 0: on, 1: off, 2: on except for slice boundaries)
-* `-- denoise`: optional: toggle denoise control (default: 0)
-* `-- background-detection`: optional: toggle background detection control (default: 1)
-* `-- adaptive-quant`: optional: toggle adaptive quantization control (default: 1)
-* `-- frame-cropping`: optional: toggle frame cropping (default: 1)
-* `-- scene-change-detect`: optional: toggle scene change detection control (default: 1)
-* `-- threads`: optional: number of threads (default: 1, O: auto, >1: number of theads, max 4)
+* `--bitrate-max`: optional: maximum bitrate (default: 5,000,000, min: 100,000 max: 5,000,000)
+* `--gop`: optional: length of group of pictures (default = 10)
+* `--rc-mode`: optional: rate control mode (default: RC_QUALITY_MODE (0), min: 0, max: 4)
+* `--ecomplexity`: optional: complexity mode (default: LOW_COMPLEXITY (0), min: 0, max: 2)
+* `--sps-pps`: optional: SPS/PPS strategy (default: CONSTANT_ID (0), min: 0, max: 3)
+* `--num-ref-frame`: optional: number of reference frame used (default: 1, 0: auto, >0 reference frames)
+* `--ssei`: optional: toggle ssei (default: 0)
+* `--prefix-nal`: optional: toggle prefix NAL adding control (default: 0)
+* `--entropy-coding`: optional: toggle entropy encoding (default: CAVLC (0))
+* `--frame-skip`: optional: toggle fram-skipping to keep the bitrate within limits (default: 1)
+* `--qp-max`: optional: Quantization Parameter max (default: 42, min: 0 max: 51)
+* `--qp-min`: optional: Quantization Parameter min (default: 12, min: 0 max: 51)
+* `--long-term-ref`: optional: toggle long term reference control (default: 0)
+* `--loop-filter`: optional: deblocking loop filter (default: 0, 0: on, 1: off, 2: on except for slice boundaries)
+* `--denoise`: optional: toggle denoise control (default: 0)
+* `--background-detection`: optional: toggle background detection control (default: 1)
+* `--adaptive-quant`: optional: toggle adaptive quantization control (default: 1)
+* `--frame-cropping`: optional: toggle frame cropping (default: 1)
+* `--scene-change-detect`: optional: toggle scene change detection control (default: 1)
+* `--threads`: optional: number of threads (default: 1, O: auto, >1: number of theads, max 4)
 
 
 ## License