Merge branch 'master' of https://github.com/OpenVisualCloud/SVT-HEVC

# Conflicts:
#	Source/Lib/Codec/EbCodingLoop.c
#	Source/Lib/Codec/EbEncDecProcess.c
#	Source/Lib/Codec/EbEntropyCoding.h
#	Source/Lib/Codec/EbPacketizationProcess.c
#	Source/Lib/Codec/EbPictureControlSet.c
#	Source/Lib/Codec/EbSei.c

.travis.yml

@@ -1,54 +1,189 @@
 language: c
+cache: ccache
+os:
+  - linux
+  - osx
 dist: xenial
-
+osx_image: xcode10.2
+compiler:
+  - clang
+  - gcc
 addons:
   apt:
     packages:
-     - cmake
-     - yasm
+      - cmake
+      - yasm
+      - valgrind
+      - libgstreamer-plugins-base1.0-dev
+      - libgstreamer1.0-dev
+      - llvm
+      - clang
   homebrew:
     packages:
+      - ccache
       - yasm
-
-jobs:
+notifications:
+  webhooks:
+    - https://coveralls.io/webhook
+env:
+  - build_type=release
+stages:
+  - name: style
+  - name: test
+  - name: Coveralls And Valgrind
+    if: type != pull_request
+before_install:
+  - "sudo chown -R travis: $HOME/.ccache"
+  - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig PATH="/usr/local/opt/ccache/libexec:$PATH"
+  - wget -nc https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1-Resources/master/video.tar.gz || wget -nc http://randomderp.com/video.tar.gz
+  - tar xf video.tar.gz
+  - mkdir -p $TRAVIS_BUILD_DIR/Build/linux/$build_type
+install:
+  - pip install --user cpp-coveralls
+  - export PATH=/Users/travis/Library/Python/2.7/bin:${PATH}
+  - if [ $TRAVIS_OS_NAME = osx ]; then ulimit -n 512; fi
+  #- if [ $TRAVIS_OS_NAME = osx ]; then brew install --HEAD valgrind; fi
+script:
+  - &base_script |
+    cd $TRAVIS_BUILD_DIR/Build/linux/$build_type
+    cmake $TRAVIS_BUILD_DIR -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=$build_type ${CMAKE_EFLAGS[@]}
+    cmake -j $(if [ $TRAVIS_OS_NAME = osx ]; then sysctl -n hw.ncpu; else nproc; fi) --build . &&
+    sudo cmake --build . --target install && cd $TRAVIS_BUILD_DIR
+  - SvtHevcEncApp -encMode 9 -i akiyo_cif.y4m -b test1.h265
+before_cache:
+  - "sudo chown -R travis: $HOME/.ccache"
+matrix:
+  fast_finish: true
+  allow_failures:
+    - name: Style check
+    - name: Binary Identical?
+    - os: osx
+    - name: Valgrind
+    - env: COVERALLS_PARALLEL=true build_type=debug CMAKE_EFLAGS="-DCOVERAGE=ON"
+  exclude:
+    - os: osx
+      compiler: gcc # gcc = clang in macOS, unecessary duplicate
   include:
-   # General Linux build job
-   - name: Build
-     script:
-     - cd Build/linux
-     - ./build.sh release
-   # General macOS build job
-   - name: macOS build
-     os: osx
-     script:
-     - cd Build/linux
-     - ./build.sh release    
-   # Coveralls test job
-   - name: Test & Coveralls
-     before_install:
-     - pip install --user cpp-coveralls
-     script:
-     - cd Build/linux
-     - ./build.sh release
-     after_success:
-     - coveralls
-
+  # valgrind --tool=memcheck --leak-check=yes --show-reachable=yes ./SvtHevcEncApp -help
+  # Coding style check
+    - name: Style check
+      stage: style
+      addons: skip
+      before_install: skip
+      install: skip
+      script:
+        - git grep -InP --heading "\t|\r| $" -- .  && IS_FAIL=true || true
+        - git grep -I -l -z "" -- . | while IFS= read -r -d '' i; do
+              if [ -n "$(tail -c 1 "$i")" ]; then
+                  echo "No newline at end of $i";
+                  IS_FAIL=true;
+              fi;
+          done
+        - git remote rm upstream 2> /dev/null || true
+        - git remote add upstream https://github.com/OpenVisualCloud/SVT-HEVC.git
+        - git fetch -q upstream master
+        - for i in $(git rev-list HEAD ^upstream/master); do
+              echo "Checking commit message of $i";
+              msg="$(git log --format=%B -n 1 $i)";
+              if [ -n "$(echo "$msg" | awk "NR==2")" ]; then
+                  echo "Malformed commit message in $i, second line must be empty";
+                  IS_FAIL=true;
+              fi;
+              if echo "$msg" | head -1 | grep -q '\.$'; then
+                  echo "Malformed commit message in $i, trailing period in subject line";
+                  IS_FAIL=true;
+              fi;
+          done
+        - test -z "$IS_FAIL"
    # FFmpeg interation build
-   - name: FFmpeg patch
-     script:
-     # Build and install SVT-HEVC
-     - cd $TRAVIS_BUILD_DIR
-     - cd Build
-     - cmake ..
-     - make -j$(nproc)
-     - sudo make install
-     # Apply SVT-HEVC plugin and enable libsvthevc to FFmpeg
-     - git clone https://github.com/FFmpeg/FFmpeg ffmpeg
-     - cd ffmpeg
-     - git checkout release/4.1
-     - git apply $TRAVIS_BUILD_DIR/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
-     - git apply $TRAVIS_BUILD_DIR/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch
-     - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib
-     - export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig
-     - ./configure --enable-libsvthevc
-     - make --quiet -j$(nproc)
+    - name: FFmpeg patch
+      stage: test
+      compiler: gcc
+      env: build_type=release
+      script:
+        # Build and install SVT-HEVC
+        - *base_script
+        # Apply SVT-HEVC plugin and enable libsvthevc to FFmpeg
+        - git clone https://github.com/FFmpeg/FFmpeg --branch release/4.1 --depth=1 ffmpeg && cd ffmpeg
+        - git am $TRAVIS_BUILD_DIR/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
+        - git am $TRAVIS_BUILD_DIR/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch
+        - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig
+        - "sudo chown -R travis: $HOME/.ccache"
+        - ./configure --enable-libsvthevc || less ffbuild/config.log
+        - make --quiet -j$(nproc) && sudo make install
+    # GStreamer interation build
+    - name: GStreamer patch
+      stage: test
+      compiler: gcc
+      env: build_type=release
+      script:
+        # Build and install SVT-HEVC
+        - *base_script
+        # Build GST-SVT-HEVC plugin
+        - cd $TRAVIS_BUILD_DIR/gstreamer-plugin
+        - "sudo chown -R travis: $HOME/.ccache"
+        - cmake .
+        - make --quiet -j$(nproc)
+        - sudo make install
+    # Tests if .h265 files are identical on binary level
+    - name: Binary Identical?
+      stage: test
+      script:
+        - mv -t $HOME akiyo_cif.y4m
+        - *base_script
+        - cd $HOME
+        - SvtHevcEncApp -encMode 9 -i akiyo_cif.y4m -n 120 -b test-pr-m9.h265
+        - SvtHevcEncApp -encMode 0 -i akiyo_cif.y4m -n 3 -b test-pr-m0.h265
+        - rm -rf $TRAVIS_BUILD_DIR
+        - git clone --depth 1 https://github.com/OpenVisualCloud/SVT-HEVC.git $TRAVIS_BUILD_DIR && cd $TRAVIS_BUILD_DIR
+        - *base_script
+        - mkdir -p $TRAVIS_BUILD_DIR/Build/linux/$build_type
+        - cd $HOME
+        - SvtHevcEncApp -encMode 9 -i akiyo_cif.y4m -n 120 -b test-master-m9.h265
+        - SvtHevcEncApp -encMode 0 -i akiyo_cif.y4m -n 3 -b test-master-m0.h265
+        - diff test-pr-m9.h265 test-master-m9.h265
+        - diff test-pr-m0.h265 test-master-m0.h265
+    - name: Coveralls Linux+gcc
+      stage: Coveralls And Valgrind
+      os: linux
+      compiler: gcc
+      env: COVERALLS_PARALLEL=true build_type=debug CMAKE_EFLAGS="-DCOVERAGE=ON"
+      script:
+        - *base_script
+        - &coveralls_script |
+          SvtHevcEncApp -encMode 9 -i akiyo_cif.y4m -b test1.h265
+          git clone https://github.com/FFmpeg/FFmpeg ffmpeg --depth=1 --branch release/4.1
+          cd ffmpeg
+          git am $TRAVIS_BUILD_DIR/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch &&
+          git am $TRAVIS_BUILD_DIR/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch
+          sudo chown -R travis: $HOME/.ccache
+          ./configure --enable-libsvthevc || cat ffbuild/config.log
+          make -s -j$(if [ $TRAVIS_OS_NAME = osx ]; then sysctl -n hw.ncpu; else nproc; fi) >/dev/null &&
+          sudo make install
+          cd $TRAVIS_BUILD_DIR
+          ffmpeg -i akiyo_cif.y4m -c:v libsvt_hevc test.h265
+          SvtHevcEncApp -i stdin -w 352 -h 288 -fps 30 -n 150 -b test2.h265 < akiyo_cif.y4m
+      after_script: &after_coveralls_script |
+        if [ $CC = "clang" ] && [ $TRAVIS_OS_NAME = linux ]; then
+          GCOV_FILE=llvm-cov GCOV_OPTIONS='gcov -pl'
+        else
+          GCOV_FILE=gcov GCOV_OPTIONS='\-lp'
+        fi
+        coveralls --root $TRAVIS_BUILD_DIR -i Source -E ".*CMakeFiles.*" -E ".*ffmpeg.*" --gcov $GCOV_FILE --gcov-options "$GCOV_OPTIONS"
+    - name: Coveralls osx+clang
+      stage: Coveralls And Valgrind
+      os: osx
+      compiler: clang
+      env: COVERALLS_PARALLEL=true build_type=debug CMAKE_EFLAGS="-DCOVERAGE=ON"
+      script:
+        - *base_script
+        - *coveralls_script
+      after_script: *after_coveralls_script
+    - name: Valgrind
+      stage: Coveralls And Valgrind
+      compiler: gcc
+      os: linux
+      env: build_type=debug
+      script:
+        - *base_script
+        - valgrind -- SvtHevcEncApp -encMode 9 -i akiyo_cif.y4m -n 150 -b test1.h265

CMakeLists.txt

@@ -53,7 +53,13 @@ if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
 endif()
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-set(CMAKE_C_STANDARD 99)
+if(CMAKE_VERSION VERSION_LESS "3.1")
+    if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
+        set(CMAKE_C_FLAGS "--std=gnu99 ${CMAKE_C_FLAGS}")
+    endif()
+else()
+    set(CMAKE_C_STANDARD 99)
+endif()
 set(CAN_USE_ASSEMBLER TRUE)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
@@ -91,7 +97,7 @@ if(MSVC)
     set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /O2")
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Od")
 else()
-    option(NATIVE "Build for native performance (march=native)" ON)
+    option(NATIVE "Build for native performance (march=native)")
     list(INSERT flags_to_test 0 -Wall)
     #for Mingw64 support, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65782
     if(MINGW)

Source/API/EbApi.h

@@ -324,11 +324,9 @@ typedef struct EB_H265_ENC_CONFIGURATION
      * Default is null.*/
     uint8_t                 useQpFile;
 
-#if 1//TILES
     uint8_t                 tileColumnCount;
     uint8_t                 tileRowCount;
     uint8_t                 tileSliceMode;
-#endif
 
     // Deblock Filter
 

Source/App/EbAppConfig.c

@@ -37,11 +37,9 @@
 #define BASE_LAYER_SWITCH_MODE_TOKEN    "-base-layer-switch-mode" // no Eval
 #define QP_TOKEN                        "-q"
 #define USE_QP_FILE_TOKEN               "-use-q-file"
-#if 1//TILES
 #define TILE_ROW_COUNT_TOKEN            "-tile_row_cnt"
 #define TILE_COL_COUNT_TOKEN            "-tile_col_cnt"
 #define TILE_SLICE_MODE_TOKEN           "-tile_slice_mode"
-#endif
 #define TUNE_TOKEN                      "-tune"
 #define FRAME_RATE_TOKEN                "-fps"
 #define FRAME_RATE_NUMERATOR_TOKEN      "-fps-num"
@@ -206,11 +204,9 @@ static void SetCfgPredStructure                 (const char *value, EbConfig_t *
 static void SetCfgQp                            (const char *value, EbConfig_t *cfg) {cfg->qp                               = strtoul(value, NULL, 0);};
 static void SetCfgCrf                           (const char *value, EbConfig_t *cfg) {cfg->crf                              = strtoul(value, NULL, 0); };
 static void SetCfgUseQpFile                     (const char *value, EbConfig_t *cfg) {cfg->useQpFile                        = (EB_BOOL)strtol(value, NULL, 0); };
-#if 1//TILES
 static void SetCfgTileColumnCount               (const char *value, EbConfig_t *cfg) { cfg->tileColumnCount                 = (EB_BOOL)strtol(value, NULL, 0); };
 static void SetCfgTileRowCount                  (const char *value, EbConfig_t *cfg) { cfg->tileRowCount                    = (EB_BOOL)strtol(value, NULL, 0); };
 static void SetCfgTileSliceMode                 (const char *value, EbConfig_t *cfg) { cfg->tileSliceMode                   = (EB_BOOL)strtol(value, NULL, 0); };
-#endif
 static void SetDisableDlfFlag                   (const char *value, EbConfig_t *cfg) {cfg->disableDlfFlag                   = (EB_BOOL)strtoul(value, NULL, 0);};
 static void SetEnableSaoFlag                    (const char *value, EbConfig_t *cfg) {cfg->enableSaoFlag                    = (EB_BOOL)strtoul(value, NULL, 0);};
 static void SetEnableHmeFlag                    (const char *value, EbConfig_t *cfg) {cfg->enableHmeFlag                    = (EB_BOOL)strtoul(value, NULL, 0);};
@@ -305,11 +301,9 @@ config_entry_t config_entry[] = {
     { SINGLE_INPUT, USE_QP_FILE_TOKEN, "UseQpFile", SetCfgUseQpFile },
     { SINGLE_INPUT, QP_FILE_TOKEN, "QpFile", SetCfgQpFile },
 
-#if 1//TILES
      { SINGLE_INPUT, TILE_ROW_COUNT_TOKEN, "TileRowCount", SetCfgTileRowCount },
      { SINGLE_INPUT, TILE_COL_COUNT_TOKEN, "TileColumnCount", SetCfgTileColumnCount },
      { SINGLE_INPUT, TILE_SLICE_MODE_TOKEN, "TileSliceMode", SetCfgTileSliceMode },
-#endif
 
     // Encoding Presets
     { SINGLE_INPUT, ENCMODE_TOKEN, "EncoderMode", SetencMode },
@@ -468,11 +462,9 @@ void EbConfigCtor(EbConfig_t *configPtr)
     configPtr->useQpFile                                = EB_FALSE;
     configPtr->qpFile                                   = NULL;
 
-#if 1//TILES
     configPtr->tileColumnCount                          = 1;
     configPtr->tileRowCount                             = 1;
     configPtr->tileSliceMode                            = 0;
-#endif
     configPtr->sceneChangeDetection                 = 1;
     configPtr->rateControlMode                      = 0;
     configPtr->lookAheadDistance                    = (uint32_t)~0;
@@ -972,7 +964,6 @@ static EB_ERRORTYPE VerifySettings(EbConfig_t *config, uint32_t channelNumber)
         return_error = EB_ErrorBadParameter;
     }
 
-#if 1//TILES
 
 #define MAX_LCU_SIZE                                64
 
@@ -1021,7 +1012,6 @@ static EB_ERRORTYPE VerifySettings(EbConfig_t *config, uint32_t channelNumber)
         }
 
     }   
-#endif
 
     if (config->separateFields > 1) {
         fprintf(config->errorLogFile, "SVT [Error]: Instance %u: Invalid SeperateFields Input\n", channelNumber + 1);

Source/App/EbAppConfig.h

@@ -242,11 +242,9 @@ typedef struct EbConfig_s
     unsigned char           y4m_buf[9];
 
     EB_BOOL                useQpFile;
-#if 1//TILES
     uint8_t                 tileColumnCount;
     uint8_t                 tileRowCount;
     uint8_t                 tileSliceMode;
-#endif
     int32_t                 frameRate;
     int32_t                 frameRateNumerator;
     int32_t                 frameRateDenominator;

Source/App/EbAppContext.c

@@ -189,11 +189,9 @@ EB_ERRORTYPE CopyConfigurationParameters(
     callbackData->ebEncParameters.vbvEndFrameAdjust = config->vbvEndFrameAdjust;
     callbackData->ebEncParameters.lowLevelVbv = config->lowLevelVbv;
     callbackData->ebEncParameters.useQpFile = (EB_BOOL)config->useQpFile;
-#if 1//TILES
     callbackData->ebEncParameters.tileColumnCount = (EB_BOOL)config->tileColumnCount;
     callbackData->ebEncParameters.tileRowCount = (EB_BOOL)config->tileRowCount;
     callbackData->ebEncParameters.tileSliceMode = (EB_BOOL)config->tileSliceMode;
-#endif
     callbackData->ebEncParameters.disableDlfFlag = (EB_BOOL)config->disableDlfFlag;
     callbackData->ebEncParameters.enableSaoFlag = (EB_BOOL)config->enableSaoFlag;
     callbackData->ebEncParameters.hrdFlag = (EB_BOOL)config->hrdFlag;

Source/Lib/ASM_AVX2/EbComputeSAD_AVX2.h

@@ -28,6 +28,13 @@ EB_U32 Compute32xMSad_AVX2_INTRIN(
 	EB_U32  height,                         // input parameter, block height (M)
 	EB_U32  width);                         // input parameter, block width (N)    
 
+EB_U32 Compute40xMSad_AVX2_INTRIN(
+	EB_U8  *src,                            // input parameter, source samples Ptr
+	EB_U32  srcStride,                      // input parameter, source stride
+	EB_U8  *ref,                            // input parameter, reference samples Ptr
+	EB_U32  refStride,                      // input parameter, reference stride  
+	EB_U32  height,                         // input parameter, block height (M)
+	EB_U32  width);                         // input parameter, block width (N)    
 
 EB_U32 Compute48xMSad_AVX2_INTRIN(
 	EB_U8  *src,                            // input parameter, source samples Ptr
@@ -37,6 +44,14 @@ EB_U32 Compute48xMSad_AVX2_INTRIN(
 	EB_U32  height,                         // input parameter, block height (M)
 	EB_U32  width);                         // input parameter, block width (N)    
 
+EB_U32 Compute56xMSad_AVX2_INTRIN(
+	EB_U8  *src,                            // input parameter, source samples Ptr
+	EB_U32  srcStride,                      // input parameter, source stride
+	EB_U8  *ref,                            // input parameter, reference samples Ptr
+	EB_U32  refStride,                      // input parameter, reference stride  
+	EB_U32  height,                         // input parameter, block height (M)
+	EB_U32  width);                         // input parameter, block width (N)    
+
 EB_U32 Compute64xMSad_AVX2_INTRIN(
 	EB_U8  *src,                            // input parameter, source samples Ptr
 	EB_U32  srcStride,                      // input parameter, source stride