OpenVisualCloud · kirithika7 · Jan 9, 2019 · Jan 17, 2019 · Dec 11, 2018 · Dec 18, 2018
diff --git a/Config/Sample.cfg b/Config/Sample.cfg
@@ -76,16 +76,19 @@ SearchAreaHeight                : 7                     # Number of search posit
 ConstrainedIntra                : 0                     # Enable the use of Constrained Intra which results in sending two PPSs (0: OFF, 1: ON)
 
 # ====================== Rate Control ===============================
-RateControlMode                 : 0                     # Rate control mode (0: OFF(CQP), 1: VBR)
+RateControlMode                 : 0                     # Rate control mode (0: OFF(CQP), 1: VBR, 2: CRF)
 TargetBitRate                   : 7000000               # Target Bit Rate (in bits per second)
 vbvMaxrate                      : 0                     # VBV MaxRate (in bits per second)
 vbvBufsize                      : 0                     # VBV Bufsize (in bits per second)
 vbvBufInit                      : 90                    # Sets how full the VBV buffer to be - [0 - 100]
 hrdFlag                 	    : 0                     # hrdflag (When hrdFlag is set to 1 it requires vbvMaxrate and vbvBufsize to be greater than 0)(0: disable , 1: enable)
+lowLevelVbv                     : 0                     # Enables lowLevelVBV Algorithm (When lowLevelVbv is set to 1 it requires vbvMaxrate and vbvBufsize to be greater than 0)(0: OFF, 1: ON)
 MaxQpAllowed                    : 48                    # maximum allowed QP when rate control is on - [0-51]
 MinQpAllowed                    : 10                    # minimum allowed QP when rate control is on - [0-51]
 LookAheadDistance               : 17                    # Enable Look Ahead [0-250]
 SceneChangeDetection            : 1                     # Enable Scene Change Detection (0: OFF, 1: ON)
+ConstantRateFactor              : 28                    # CRF value allowed for rate control use - [0-51]
+
 
 # ====================== Adaptive QP Params ===============================
 BitRateReduction                : 1                     # BitRate Reduction (only applicable when Tune is set to 0) (0= OFF, 1=ON )

diff --git a/Docs/svt-hevc_encoder_user_guide.md b/Docs/svt-hevc_encoder_user_guide.md
@@ -296,12 +296,14 @@ The encoder parameters present in the Sample.cfg file are listed in this table b
 | **SearchAreaWidth** | -search-w | [1 - 256] | Depends on input resolution | Motion vector search area width |
 | **SearchAreaHeight** | -search-h | [1 - 256] | Depends on input resolution | Motion vector search area height |
 | **ConstrainedIntra** | -constrd-intra | [0,1] | 0 | Allow the use of Constrained Intra, when enabled, this features yields to sending two PPSs in the HEVC Elementary streams <br>0 = OFF, 1 = ON |
-| **RateControlMode** | -rc | [0,1] | 0 | 0 : CQP , 1 : VBR |
+| **RateControlMode** | -rc | [0 - 2] | 0 | 0 : CQP , 1 : VBR , 2 : CRF |
+| **ConstantRateFactor** | -crf | [0 - 51] | 28 | CRF value allowed for rate control use, only apllicable when RateControlMode is set to 2 |
 | **TargetBitRate** | -tbr | Any Number | 7000000 | Target bitrate in bits / second. Only used when RateControlMode is set to 1 |
 | **vbvMaxrate** | -vbv-maxrate | Any Number | 0 | VBVMaxrate in bits / second. Only used when RateControlMode is set to 1 |
 | **vbvBufsize** | -vbv-bufsize | Any Number | 0 | VBV BufferSize in bits / second. Only used when RateControlMode is set to 1 |
-| **vbvBufInit** | -vbv-init | [0 - 100] | 90 | Sets the initial percentage size that the VBV buffer is filled to |
-| **hrdFlag** | -hrd | [0,1] | 0 | Sets the HRD (Hypothetical Reference Decoder) Flag in the encoded stream, 0 = OFF, 1 = ON When<br/>hrdFlag is set to 1, vbvMaxrate and vbvBufsize must be greater than 0 |
+| **vbvBufInit** | -vbv-init | [0 - 100] | 90 | Sets how full the VBV buffer to be|
+| **hrdFlag** | -hrd | [0,1] | 0 | HRD Flag, 0 = OFF, 1 = ON |When hrdFlag is set to 1 it requires vbvMaxrate and vbvBufsize to be greater than 0 |
+| **lowLevelVbv** | -low-level-vbv | [0,1] | 0 | Enable lowLevelVBV algorithm. it requires vbvMaxrate and vbvBufsize to be greater than 0 0 = OFF, 1 = ON  |
 | **MaxQpAllowed** | -max-qp | [0 - 51] | 48 | Maximum QP value allowed for rate control use. Only used when RateControlMode is set to 1. Has to be >= MinQpAllowed |
 | **MinQpAllowed** | -min-qp | [0 - 50] | 10 | Minimum QP value allowed for rate control use. Only used when RateControlMode is set to 1. Has to be < MaxQpAllowed |
 | **LookAheadDistance** | -lad | [0 - 250] | Depending on BRC mode | When RateControlMode is set to 1 it&#39;s best to set this parameter to be equal to the Intra period value (such is the default set by the encoder).  When CQP is chosen, then a (2 \* minigopsize +1) look ahead is recommended. |
@@ -449,6 +451,21 @@ Similarly, in order to enable VBV and run a 2-stream 8kp50 simultaneous encode o
 
 >taskset 0xFFFFFFF0000000FFFFFFF0000000 ./SvtHevcEncApp -encMode 11 -w 3840 -h 2160 -bit-depth 10 -compressed-ten-bit-format 1 -i in.yuv  -rc 1 –tbr 10000000 -vbv-maxrate 10000000  -vbv-bufsize 10000000 -fps 50  -b out3.bin   -n 5000 –nb 500  &amp;
 
+<br>
+Similarly, in order to enable VBV and run a 2-stream 8kp50 simultaneous encode on a Xeon Platinum 8180 system the following command lines should be used:
+
+#### *Running Windows\* Server 2016:*
+
+>start /node 0 SvtHevcEncApp.exe -encMode 12 -tune 0 -w 3840 -h 2160 -bit-depth 10 -compressed-ten-bit-format 1 -i in.yuv  -rc 1 –tbr 10000000 -vbv-maxrate 10000000  -vbv-bufsize 20000000 -fps 50  -b out1.bin   -n 5000 –nb 500
+
+>start /node 1 SvtHevcEncApp.exe -encMode 12 -tune 0  -w 3840 -h 2160 -bit-depth 10 -compressed-ten-bit-format 1 -i in.yuv  -rc 1 –tbr 10000000 -vbv-maxrate 10000000 -vbv-bufsize 20000000 -fps 50  -b out3.bin   -n 5000 –nb 500
+
+#### *Running Ubuntu\* 18.04:*
+
+>taskset 0x0000000FFFFFFF0000000FFFFFFF ./SvtHevcEncApp -encMode 12 -tune 0  -w 3840 -h 2160 -bit-depth 10 -compressed-ten-bit-format 1 -i in.yuv  -rc 1 –tbr 10000000 -vbv-maxrate 10000000  -vbv-bufsize 10000000 -fps 50  -b out3.bin   -n 5000 –nb 500 &amp;
+
+>taskset 0xFFFFFFF0000000FFFFFFF0000000 ./SvtHevcEncApp -encMode 12 -tune 0  -w 3840 -h 2160 -bit-depth 10 -compressed-ten-bit-format 1 -i in.yuv  -rc 1 –tbr 10000000 -vbv-maxrate 10000000  -vbv-bufsize 10000000 -fps 50  -b out3.bin   -n 5000 –nb 500  &amp;
+
 <br>
 Where 0x0000000FFFFFFF0000000FFFFFFF and 0xFFFFFFF0000000FFFFFFF0000000 are masks for sockets 0 and 1 respectively on a dual 8180 system.
 

diff --git a/Source/API/EbApi.h b/Source/API/EbApi.h
@@ -422,6 +422,11 @@ typedef struct EB_H265_ENC_CONFIGURATION
      *
      * Default is 10. */
     uint32_t                minQpAllowed;
+    /* CRF value allowed for rate control use, only apllicable when rate
+     * control mode is set to 2.
+     *
+     * Default is 28. */
+    uint32_t                crf;
 
 
     // bitstream options
@@ -545,7 +550,13 @@ typedef struct EB_H265_ENC_CONFIGURATION
 
     /* Active channel count. */
     uint32_t                activeChannelCount;
-
+	/* Enables lowLevelVBV Algorithm
+    *
+	* 0 = disable.
+	* 1 = enable.
+	*
+	* Default is 0. */
+    uint8_t                 lowLevelVbv;
 
     // Threads management
 

diff --git a/Source/App/CMakeLists.txt b/Source/App/CMakeLists.txt
@@ -38,12 +38,12 @@ target_link_libraries(SvtHevcEncApp
     SvtHevcEnc)
 
 if(UNIX)
-    target_link_libraries(SvtHevcEncApp
-        pthread)
-    if(NOT APPLE)
-        target_link_libraries(SvtHevcEncApp
-            rt)
-    endif()
+	target_link_libraries(SvtHevcEncApp
+        pthread m)
+  if(NOT APPLE)
+      target_link_libraries(SvtHevcEncApp
+          rt)
+  endif()
 endif()
 
 install(TARGETS SvtHevcEncApp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/Source/App/EbAppConfig.c b/Source/App/EbAppConfig.c
@@ -86,9 +86,11 @@
 #define NALU_FILE_TOKEN                 "-nalu-file"
 #define RATE_CONTROL_ENABLE_TOKEN       "-rc"
 #define TARGET_BIT_RATE_TOKEN           "-tbr"
+#define CRF_TOKEN                       "-crf"
 #define VBV_MAX_RATE_TOKEN              "-vbv-maxrate"
 #define VBV_BUFFER_SIZE_TOKEN           "-vbv-bufsize"
 #define VBV_BUFFER_INIT_TOKEN           "-vbv-init"
+#define ENABLE_LOW_LEVEL_VBV_TOKEN      "-low-level-vbv"
 #define HRD_TOKEN                       "-hrd"
 #define MAX_QP_TOKEN                    "-max-qp"
 #define MIN_QP_TOKEN                    "-min-qp"
@@ -192,6 +194,7 @@ static void SetFrameRate                        (const char *value, EbConfig_t *
         cfg->frameRate = cfg->frameRate << 16;
     }
 }
+
 static void SetFrameRateNumerator               (const char *value, EbConfig_t *cfg) {cfg->frameRateNumerator               = strtoul(value, NULL, 0);};
 static void SetFrameRateDenominator             (const char *value, EbConfig_t *cfg) {cfg->frameRateDenominator             = strtoul(value, NULL, 0);};
 static void SetEncoderBitDepth                  (const char *value, EbConfig_t *cfg) {cfg->encoderBitDepth                  = strtoul(value, NULL, 0);}
@@ -204,6 +207,7 @@ static void SetCfgIntraRefreshType              (const char *value, EbConfig_t *
 static void SetHierarchicalLevels               (const char *value, EbConfig_t *cfg) {cfg->hierarchicalLevels               = strtol(value, NULL, 0); };
 static void SetCfgPredStructure                 (const char *value, EbConfig_t *cfg) {cfg->predStructure                    = strtol(value, NULL, 0); };
 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); };
 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); };
@@ -228,6 +232,7 @@ static void SetVbvMaxrate                       (const char *value, EbConfig_t *
 static void SetVbvBufsize                       (const char *value, EbConfig_t *cfg) { cfg->vbvBufsize						= strtoul(value, NULL, 0);};
 static void SetVbvBufInit                       (const char *value, EbConfig_t *cfg) { cfg->vbvBufInit						= strtoul(value, NULL, 0);};
 static void SetHrdFlag                          (const char *value, EbConfig_t *cfg) { cfg->hrdFlag							= strtoul(value, NULL, 0);};
+static void SetLowLevelVbv                      (const char *value, EbConfig_t *cfg) { cfg->lowLevelVbv                     = (EB_BOOL)strtol(value, NULL, 0); };
 static void SetVideoUsabilityInfo               (const char *value, EbConfig_t *cfg) {cfg->videoUsabilityInfo               = strtol(value,  NULL, 0);};
 static void SetHighDynamicRangeInput            (const char *value, EbConfig_t *cfg) {cfg->highDynamicRangeInput            = strtol(value,  NULL, 0);};
 static void SetAccessUnitDelimiter              (const char *value, EbConfig_t *cfg) {cfg->accessUnitDelimiter              = strtol(value,  NULL, 0);};
@@ -348,6 +353,7 @@ config_entry_t config_entry[] = {
     { SINGLE_INPUT, VBV_BUFFER_SIZE_TOKEN, "vbvBufsize", SetVbvBufsize },
     { SINGLE_INPUT, HRD_TOKEN, "hrd", SetHrdFlag },
     { SINGLE_INPUT, VBV_BUFFER_INIT_TOKEN, "vbvBufInit", SetVbvBufInit},
+    { SINGLE_INPUT, ENABLE_LOW_LEVEL_VBV_TOKEN,"lowLevelVbv",SetLowLevelVbv},
 
 
     // Deblock Filter
@@ -368,7 +374,8 @@ config_entry_t config_entry[] = {
     { SINGLE_INPUT, CONSTRAINED_INTRA_ENABLE_TOKEN, "ConstrainedIntra", SetEnableConstrainedIntra },
 
     // Rate Control
-	{ SINGLE_INPUT, RATE_CONTROL_ENABLE_TOKEN, "RateControlMode", SetRateControlMode },
+    { SINGLE_INPUT, CRF_TOKEN, "CRF", SetCfgCrf },
+    { SINGLE_INPUT, RATE_CONTROL_ENABLE_TOKEN, "RateControlMode", SetRateControlMode },
     { SINGLE_INPUT, TARGET_BIT_RATE_TOKEN, "TargetBitRate", SetTargetBitRate },
     { SINGLE_INPUT, MAX_QP_TOKEN, "MaxQpAllowed", SetMaxQpAllowed },
     { SINGLE_INPUT, MIN_QP_TOKEN, "MinQpAllowed", SetMinQpAllowed },
@@ -570,6 +577,8 @@ void EbConfigCtor(EbConfig_t *configPtr)
     configPtr->vbvBufsize                           = 0;
     configPtr->vbvBufInit                           = 90;
     configPtr->hrdFlag                              = 0;
+    configPtr->crf                                  = 28;
+    configPtr->lowLevelVbv                          = 0;
 
     // Testing
     configPtr->testUserData                         = 0;

diff --git a/Source/App/EbAppConfig.h b/Source/App/EbAppConfig.h
@@ -321,6 +321,7 @@ typedef struct EbConfig_s
     uint32_t                 targetBitRate;
     uint32_t                 maxQpAllowed;
     uint32_t                 minQpAllowed;
+    uint32_t                 crf;
     uint32_t                 vbvMaxRate;
     uint32_t                 vbvBufsize;
     uint64_t                 vbvBufInit;
@@ -348,6 +349,7 @@ typedef struct EbConfig_s
     EB_BOOL                switchThreadsToRtPriority;
     EB_BOOL                fpsInVps;
     uint32_t                 hrdFlag;
+    EB_BOOL                  lowLevelVbv;
     EB_BOOL                unrestrictedMotionVector;
 
     /****************************************

diff --git a/Source/App/EbAppContext.c b/Source/App/EbAppContext.c
@@ -187,9 +187,11 @@ EB_ERRORTYPE CopyConfigurationParameters(
     callbackData->ebEncParameters.maxQpAllowed = config->maxQpAllowed;
     callbackData->ebEncParameters.minQpAllowed = config->minQpAllowed;
     callbackData->ebEncParameters.qp = config->qp;
+    callbackData->ebEncParameters.crf = config->crf;
     callbackData->ebEncParameters.vbvMaxrate = config->vbvMaxRate;
     callbackData->ebEncParameters.vbvBufsize = config->vbvBufsize;
     callbackData->ebEncParameters.vbvBufInit = config->vbvBufInit;
+    callbackData->ebEncParameters.lowLevelVbv = config->lowLevelVbv;
     callbackData->ebEncParameters.useQpFile = (EB_BOOL)config->useQpFile;
     callbackData->ebEncParameters.tileColumnCount = (EB_BOOL)config->tileColumnCount;
     callbackData->ebEncParameters.tileRowCount = (EB_BOOL)config->tileRowCount;

diff --git a/Source/Lib/C_DEFAULT/CMakeLists.txt b/Source/Lib/C_DEFAULT/CMakeLists.txt
@@ -19,7 +19,8 @@ set(C_DEFAULT_SOURCE
     EbIntraPrediction_C.c
     EbMcp_C.c
     EbMeSadCalculation_C.c
-    EbPackUnPack_C.c
+    EbMeSatdCalculation_C.c
+	  EbPackUnPack_C.c
     EbPictureOperators_C.c
     EbSampleAdaptiveOffset_C.c
     EbTransforms_C.c)
@@ -38,6 +39,7 @@ add_library(HEVC_C_DEFAULT OBJECT
     EbIntraPrediction_C.h
     EbMcp_C.h
     EbMeSadCalculation_C.h
+    EbMeSatdCalculation_C.h
     EbPackUnPack_C.h
     EbPictureOperators_C.h
     EbSampleAdaptiveOffset_C.h

diff --git a/Source/Lib/C_DEFAULT/EbMeSatdCalculation_C.c b/Source/Lib/C_DEFAULT/EbMeSatdCalculation_C.c
@@ -0,0 +1,80 @@
+/*
+* Copyright(c) 2018 Intel Corporation
+* SPDX - License - Identifier: BSD - 2 - Clause - Patent
+*/
+
+#include "EbMeSatdCalculation_C.h"
+
+#define BITS_PER_SUM (8 * sizeof(EB_U16))
+
+static inline EB_U32 abs2(EB_U32 a)
+{
+	EB_U32 s = ((a >> (BITS_PER_SUM - 1)) & (((EB_U32)1 << BITS_PER_SUM) + 1)) * ((EB_U32)-1);
+
+	return (a + s) ^ s;
+}
+
+#define HADAMARD4(d0, d1, d2, d3, s0, s1, s2, s3) { \
+        EB_U32 t0 = s0 + s1; \
+        EB_U32 t1 = s0 - s1; \
+        EB_U32 t2 = s2 + s3; \
+        EB_U32 t3 = s2 - s3; \
+        d0 = t0 + t2; \
+        d2 = t0 - t2; \
+        d1 = t1 + t3; \
+        d3 = t1 - t3; \
+}
+
+/*******************************************
+Calcualte SATD for 8x4 sublcoks.
+*******************************************/
+EB_U32 SatdCalculation_8x4(
+	EB_U8   *src,
+	EB_U32   srcStride,
+	EB_U8   *ref,
+	EB_U32   refStride)
+{
+	EB_U32 tmp[4][4];
+	EB_U32 a0, a1, a2, a3;
+	EB_U32 sum = 0;
+
+	for (EB_U64 i = 0; i < 4; i++, src += srcStride, ref += refStride)
+	{
+		a0 = (src[0] - ref[0]) + ((EB_U32)(src[4] - ref[4]) << BITS_PER_SUM);
+		a1 = (src[1] - ref[1]) + ((EB_U32)(src[5] - ref[5]) << BITS_PER_SUM);
+		a2 = (src[2] - ref[2]) + ((EB_U32)(src[6] - ref[6]) << BITS_PER_SUM);
+		a3 = (src[3] - ref[3]) + ((EB_U32)(src[7] - ref[7]) << BITS_PER_SUM);
+		HADAMARD4(tmp[i][0], tmp[i][1], tmp[i][2], tmp[i][3], a0, a1, a2, a3);
+	}
+
+	for (EB_U64 i = 0; i < 4; i++)
+	{
+		HADAMARD4(a0, a1, a2, a3, tmp[0][i], tmp[1][i], tmp[2][i], tmp[3][i]);
+		sum += abs2(a0) + abs2(a1) + abs2(a2) + abs2(a3);
+	}
+
+	return (((EB_U16)sum) + (sum >> BITS_PER_SUM)) >> 1;
+}
+
+/*******************************************
+Calcualte SATD for 16x16 sublcoks.
+*******************************************/
+EB_U32 SatdCalculation_16x16(
+	EB_U8   *src,
+	EB_U32   srcStride,
+	EB_U8   *ref,
+	EB_U32   refStride)
+{
+	EB_U32 satd = 0;
+
+	for (EB_U64 row = 0; row < 16; row += 4)
+	{
+		for (EB_U64 col = 0; col < 16; col += 8)
+		{
+			satd += SatdCalculation_8x4(src + row * srcStride + col, srcStride,
+				ref + row * refStride + col, refStride);
+		}
+	}
+
+	return satd;
+}
diff --git a/Source/Lib/C_DEFAULT/EbMeSatdCalculation_C.h b/Source/Lib/C_DEFAULT/EbMeSatdCalculation_C.h
@@ -0,0 +1,23 @@
+/*
+* Copyright(c) 2018 Intel Corporation
+* SPDX - License - Identifier: BSD - 2 - Clause - Patent
+*/
+
+#ifndef EbMeSatdCalculation_C_h
+#define EbMeSatdCalculation_C_h
+
+#include "EbDefinitions.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EB_U32 SatdCalculation_16x16(
+    EB_U8   *src,
+    EB_U32   srcStride,
+    EB_U8   *ref,
+    EB_U32   refStride);
+
+#ifdef __cplusplus
+}
+#endif        
+#endif // EbMeSadCalculation_C_h
diff --git a/Source/Lib/Codec/CMakeLists.txt b/Source/Lib/Codec/CMakeLists.txt
@@ -38,6 +38,7 @@ set(Codec_Source
     EbMotionEstimationResults.c
     EbPacketizationProcess.c
     EbPacketizationReorderQueue.c
+    EbPerFramePrediction.c
     EbPictureAnalysisProcess.c
     EbPictureAnalysisResults.c
     EbPictureBufferDesc.c
@@ -154,6 +155,7 @@ add_library(SvtHevcEnc
     EbPacketizationProcess.h
     EbPacketizationReorderQueue.h
     EbPackUnPack.h
+    EbPerFramePrediction.h
     EbPictureAnalysisProcess.h
     EbPictureAnalysisResults.h
     EbPictureBufferDesc.h
@@ -191,6 +193,7 @@ add_library(SvtHevcEnc
 
 if(UNIX)
     set(LIBS "-lpthread")
+    set(LIBS "${LIBS} -lm")
     # Set version number for SONAME.
     set_target_properties(SvtHevcEnc
         PROPERTIES SOVERSION ${SVT_HEVC_SOVERSION})