<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<span style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">From 0bb94979eee99370e5aa494717fe80a9d5701e81 Mon Sep 17 00:00:00 2001</span>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
From: PavanTarun <pavan.tarun@multicorewareinc.com></div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Date: Fri, 28 Mar 2025 05:56:28 +0000</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Subject: [PATCH] Fix build warnings in arm</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
---</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
source/CMakeLists.txt | 1 -</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
source/common/aarch64/loopfilter-prim.cpp | 10 +++++-----</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
source/common/common.h | 1 +</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
source/common/cpu.cpp | 2 ++</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
source/common/param.cpp | 4 ++++</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
source/common/scaler.cpp | 3 ---</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
source/encoder/entropy.cpp | 4 ++--</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
source/encoder/level.cpp | 9 ---------</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
source/encoder/ratecontrol.cpp | 10 +++-------</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
source/encoder/sao.cpp | 5 -----</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
source/encoder/search.cpp | 4 ----</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
source/encoder/slicetype.cpp | 4 ----</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
source/test/pixelharness.cpp | 19 -------------------</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
source/test/pixelharness.h | 2 +-</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
source/x265.cpp | 2 +-</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
15 files changed, 19 insertions(+), 61 deletions(-)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
index 4f5b3ed82..c1473caa5 100755</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
--- a/source/CMakeLists.txt</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+++ b/source/CMakeLists.txt</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -622,7 +622,6 @@ option(WARNINGS_AS_ERRORS "Stop compiles on first warning" OFF)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
if(WARNINGS_AS_ERRORS)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
add_definitions(-Werror)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- add_definitions(-Wno-unused)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
elseif(MSVC)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
add_definitions(/WX)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
endif()</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
diff --git a/source/common/aarch64/loopfilter-prim.cpp b/source/common/aarch64/loopfilter-prim.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
index 320cb8153..54ea561ab 100644</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
--- a/source/common/aarch64/loopfilter-prim.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+++ b/source/common/aarch64/loopfilter-prim.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -279,11 +279,11 @@ void pelFilterLumaStrong_V_neon(pixel *src, intptr_t srcStep, intptr_t offset,</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
// -1 index means value is zero because TBL instructions</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
// zero elements that have out of range indices.</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- const uint8x8_t idx0 = { -1, 0, 1, 2, 3, 4, 5, -1 };</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- const uint8x8_t idx1 = { -1, 1, 2, 3, 4, 5, 6, -1 };</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- const uint8x8_t idx2 = { -1, 2, 3, 4, 5, 6, 7, -1 };</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- const uint8x8_t idx3 = { -1, 3, 4, 5, 6, -1, 3, -1 };</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- const uint8x8_t idx4 = { -1, 4, -1, 1, 2, 3, 4, -1 };</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+ const uint8x8_t idx0 = { 255, 0, 1, 2, 3, 4, 5, 255 };</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+ const uint8x8_t idx1 = { 255, 1, 2, 3, 4, 5, 6, 255 };</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+ const uint8x8_t idx2 = { 255, 2, 3, 4, 5, 6, 7, 255 };</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+ const uint8x8_t idx3 = { 255, 3, 4, 5, 6, 255, 3, 255 };</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+ const uint8x8_t idx4 = { 255, 4, 255, 1, 2, 3, 4, 255 };</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
const int16x8_t neg_shift = { 0, -3, -2, -3, -3, -2, -3, 0 };</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
diff --git a/source/common/common.h b/source/common/common.h</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
index f5e2f63fe..794073577 100644</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
--- a/source/common/common.h</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+++ b/source/common/common.h</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -39,6 +39,7 @@</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
#include <stdint.h></div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
#include <memory.h></div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
#include <assert.h></div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+#include <stdlib.h></div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
#include "x265.h"</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
diff --git a/source/common/cpu.cpp b/source/common/cpu.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
index 35c43deaf..d4a4e63c5 100644</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
--- a/source/common/cpu.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+++ b/source/common/cpu.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -62,7 +62,9 @@ static void sigill_handler(int sig)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
#endif // if X265_ARCH_ARM</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
namespace X265_NS {</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+#if X265_ARCH_X86</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
static bool enable512 = false;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+#endif</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
const cpu_name_t cpu_names[] =</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
{</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
#if X265_ARCH_X86</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
diff --git a/source/common/param.cpp b/source/common/param.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
index 02cface59..759e67216 100755</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
--- a/source/common/param.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+++ b/source/common/param.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -904,12 +904,16 @@ int x265_param_parse(x265_param* p, const char* name, const char* value)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
bool bValueWasNull = !value;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
bool bExtraParams = false;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
char nameBuf[64];</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+#ifdef SVT_HEVC</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
static int count;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+#endif</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
if (!name)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
return X265_PARAM_BAD_NAME;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+#ifdef SVT_HEVC</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
count++;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+#endif</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
// skip -- prefix if provided</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
if (name[0] == '-' && name[1] == '-')</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
name += 2;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
diff --git a/source/common/scaler.cpp b/source/common/scaler.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
index 879654793..4577f4871 100644</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
--- a/source/common/scaler.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+++ b/source/common/scaler.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -511,10 +511,7 @@ int ScalerFilterManager::init(int algorithmFlags, VideoDesc *srcVideoDesc, Video</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
int dstHCrPos;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
int srcVCrPos;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
int dstVCrPos;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- int dst_stride = SCALER_ALIGN(dstW * sizeof(int16_t) + 66, 16);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
m_bitDepth = dstVideoDesc->m_inputDepth;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- if (m_bitDepth == 16)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- dst_stride <<= 1;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
m_algorithmFlags = algorithmFlags;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
lumXInc = (((int64_t)srcW << 16) + (dstW >> 1)) / dstW;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
diff --git a/source/encoder/entropy.cpp b/source/encoder/entropy.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
index ece8d6bc9..c7cc470a3 100644</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
--- a/source/encoder/entropy.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+++ b/source/encoder/entropy.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -1782,7 +1782,7 @@ void Entropy::codePredWeightTable(const Slice& slice)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
else</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
#endif</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
WRITE_FLAG(!!wp[0].wtPresent, "luma_weight_lX_flag");</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- totalSignalledWeightFlags += wp[0].wtPresent;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+ totalSignalledWeightFlags = totalSignalledWeightFlags + wp[0].wtPresent;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
if (bChroma)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -1796,7 +1796,7 @@ void Entropy::codePredWeightTable(const Slice& slice)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
else</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
#endif</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
WRITE_FLAG(!!wp[1].wtPresent, "chroma_weight_lX_flag");</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- totalSignalledWeightFlags += 2 * wp[1].wtPresent;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+ totalSignalledWeightFlags = totalSignalledWeightFlags + 2 * wp[1].wtPresent;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
diff --git a/source/encoder/level.cpp b/source/encoder/level.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
index 34ad23d1f..5f3c4bc22 100644</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
--- a/source/encoder/level.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+++ b/source/encoder/level.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -64,15 +64,6 @@ LevelSpec levels[] =</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
{ MAX_UINT, MAX_UINT64, MAX_UINT, MAX_UINT, MAX_UINT, MAX_UINT, 1, Level::LEVEL8_5, "8.5", 85 },</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
};</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
-static inline int _confirm(x265_param* param, bool bflag, const char* message)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
-{</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- if (!bflag)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- return 0;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
-</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- x265_log(param, X265_LOG_ERROR, "%s\n", message);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- return 1;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
-}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
-</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
/* determine minimum decoder level required to decode the described video */</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
void determineLevel(const x265_param ¶m, VPS& vps)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
{</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
diff --git a/source/encoder/ratecontrol.cpp b/source/encoder/ratecontrol.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
index 6749503b1..6b8b384e4 100644</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
--- a/source/encoder/ratecontrol.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+++ b/source/encoder/ratecontrol.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -664,7 +664,6 @@ bool RateControl::init(const SPS& sps)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
/* read stats */</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
p = statsIn;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- double totalQpAq = 0;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
for (int i = 0; i < m_numEntries; i++)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
{</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
RateControlEntry *rce, *rcePocOrder;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -729,7 +728,6 @@ bool RateControl::init(const SPS& sps)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
return false;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
rce->qScale = rce->newQScale = x265_qp2qScale(qpRc);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- totalQpAq += qpAq;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
rce->qpNoVbv = qNoVbv;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
rce->qpaRc = qpRc;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
rce->qpAq = qpAq;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -1108,7 +1106,7 @@ fail:</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
bool RateControl::initPass2()</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
{</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- uint64_t allConstBits = 0, allCodedBits = 0;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+ uint64_t allConstBits = 0;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
uint64_t allAvailableBits = uint64_t(m_param->rc.bitrate * 1000. * m_numEntries * m_frameDuration);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
int startIndex, endIndex;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
int fps = X265_MIN(m_param->keyframeMax, (int)(m_fps + 0.5));</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -1127,7 +1125,6 @@ bool RateControl::initPass2()</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
for (endIndex = m_start; endIndex < m_numEntries; endIndex++)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
{</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
allConstBits += m_rce2Pass[endIndex].miscBits;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- allCodedBits += m_rce2Pass[endIndex].coeffBits + m_rce2Pass[endIndex].mvBits;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
if (allAvailableBits < allConstBits)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -1225,14 +1222,13 @@ bool RateControl::vbv2Pass(uint64_t allAvailableBits, int endPos, int startPos)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
int t0, t1;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
double qScaleMin = x265_qp2qScale(m_param->rc.qpMin);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
double qScaleMax = x265_qp2qScale(m_param->rc.qpMax);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- int iterations = 0 , adjMin, adjMax;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+ int adjMin, adjMax;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
CHECKED_MALLOC(fills, double, m_numEntries + 1);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
fills++;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
/* adjust overall stream size */</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
do</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
{</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- iterations++;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
prevBits = expectedBits;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
if (expectedBits)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -1907,7 +1903,7 @@ double RateControl::tuneQScaleForGrain(double rcOverflow)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
int newQp = rcOverflow > 1.1 ? curQp + 2 : rcOverflow > 1 ? curQp + 1 : curQp - 1 ;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
double projectedBitrate = int(m_fps + 0.5) * m_qpToEncodedBits[newQp];</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
if (curBitrate > 0 && projectedBitrate > 0)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- q = abs(projectedBitrate - m_bitrate) < abs (curBitrate - m_bitrate) ? x265_qp2qScale(newQp) : m_lastQScaleFor[P_SLICE];</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+ q = std::abs(projectedBitrate - m_bitrate) < std::abs (curBitrate - m_bitrate) ? x265_qp2qScale(newQp) : m_lastQScaleFor[P_SLICE];</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
else</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
q = rcOverflow > 1 ? qScaleAvg * qpstep : rcOverflow < 1 ? qScaleAvg / qpstep : m_lastQScaleFor[P_SLICE];</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
return q;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
diff --git a/source/encoder/sao.cpp b/source/encoder/sao.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
index 329f36ccf..0dee092d7 100644</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
--- a/source/encoder/sao.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+++ b/source/encoder/sao.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -733,7 +733,6 @@ void SAO::calcSaoStatsCTU(int addr, int plane)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
const CUData* cu = m_frame->m_encData->getPicCTU(addr);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
const pixel* fenc0 = m_frame->m_fencPic->getPlaneAddr(plane, addr);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
const pixel* rec0 = reconPic->getPlaneAddr(plane, addr);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- const pixel* fenc;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
const pixel* rec;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
intptr_t stride = plane ? reconPic->m_strideC : reconPic->m_stride;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
uint32_t picWidth = m_param->sourceWidth;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -863,7 +862,6 @@ void SAO::calcSaoStatsCTU(int addr, int plane)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
skipR = 5;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- fenc = fenc0;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
rec = rec0;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
startX = !lpelx;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -873,7 +871,6 @@ void SAO::calcSaoStatsCTU(int addr, int plane)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
endY = (bpely == picHeight) ? ctuHeight - 1 : ctuHeight - skipB + plane_offset;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
if (startY)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
{</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- fenc += stride;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
rec += stride;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -888,7 +885,6 @@ void SAO::calcSaoStatsCTU(int addr, int plane)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
skipB = 4;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
skipR = 5;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- fenc = fenc0;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
rec = rec0;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
startX = !lpelx;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
endX = (rpelx == picWidth) ? ctuWidth - 1 : ctuWidth - skipR + plane_offset;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -898,7 +894,6 @@ void SAO::calcSaoStatsCTU(int addr, int plane)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
if (startY)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
{</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- fenc += stride;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
rec += stride;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
diff --git a/source/encoder/search.cpp b/source/encoder/search.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
index 2a324700d..0522f52cc 100644</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
--- a/source/encoder/search.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+++ b/source/encoder/search.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -276,7 +276,6 @@ void Search::codeCoeffQTChroma(const CUData& cu, uint32_t tuDepth, uint32_t absP</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
return;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- uint32_t tuDepthC = tuDepth;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
uint32_t log2TrSizeC = log2TrSize - m_hChromaShift;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
if (log2TrSizeC < 2)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -285,7 +284,6 @@ void Search::codeCoeffQTChroma(const CUData& cu, uint32_t tuDepth, uint32_t absP</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
if (absPartIdx & 3)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
return;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
log2TrSizeC = 2;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- tuDepthC--;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
uint32_t qtLayer = log2TrSize - 2;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -5717,12 +5715,10 @@ void Search::saveResidualQTData(CUData& cu, ShortYuv& resiYuv, uint32_t absPartI</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
uint32_t log2TrSizeC = log2TrSize - m_hChromaShift;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
uint32_t codeChroma = (m_csp != X265_CSP_I400 && m_frame->m_fencPic->m_picCsp != X265_CSP_I400) ? 1 : 0;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- uint32_t tuDepthC = tuDepth;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
if (log2TrSizeC < 2)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
{</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
X265_CHECK(log2TrSize == 2 && m_csp != X265_CSP_I444 && tuDepth, "invalid tuDepth\n");</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
log2TrSizeC = 2;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- tuDepthC--;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
codeChroma &= !(absPartIdx & 3);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
diff --git a/source/encoder/slicetype.cpp b/source/encoder/slicetype.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
index e94a7eb9c..992d7b687 100644</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
--- a/source/encoder/slicetype.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+++ b/source/encoder/slicetype.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -1473,7 +1473,6 @@ void LookaheadTLD::computePictureStatistics(Frame *curFrame)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
uint64_t picTotVariance = 0;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
uint32_t variance;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- uint64_t blockXY = 0;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
pixel* src = curFrame->m_fencPic->m_picOrg[0];</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
for (int blockY = 0; blockY < maxRow; blockY += 8)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -1489,7 +1488,6 @@ void LookaheadTLD::computePictureStatistics(Frame *curFrame)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
blockOffsetLuma, 0);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
rowVariance += variance;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- blockXY++;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
picTotVariance += (uint16_t)(rowVariance / maxCol);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -1520,7 +1518,6 @@ void LookaheadTLD::computePictureStatistics(Frame *curFrame)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
blockOffsetChroma, 1);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
rowVariance += variance;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- blockXY++;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
picTotVariance += (uint16_t)(rowVariance / maxColChroma);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -1544,7 +1541,6 @@ void LookaheadTLD::computePictureStatistics(Frame *curFrame)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
blockOffsetChroma, 2);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
rowVariance += variance;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- blockXY++;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
picTotVariance += (uint16_t)(rowVariance / maxColChroma);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
diff --git a/source/test/pixelharness.cpp b/source/test/pixelharness.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
index 10f66cda1..2c9b5200c 100644</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
--- a/source/test/pixelharness.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+++ b/source/test/pixelharness.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -998,8 +998,6 @@ bool PixelHarness::check_pixel_add_ps_aligned(pixel_add_ps_t ref, pixel_add_ps_t</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
bool PixelHarness::check_pixel_var(var_t ref, var_t opt)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
{</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- int j = 0;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
-</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
intptr_t stride = STRIDE;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
for (int i = 0; i < ITERS; i++)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -1011,7 +1009,6 @@ bool PixelHarness::check_pixel_var(var_t ref, var_t opt)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
return false;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
reportfail();</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- j += INCR;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
return true;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -1350,8 +1347,6 @@ bool PixelHarness::check_saoCuStatsE1_t(saoCuStatsE1_t ref, saoCuStatsE1_t opt)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
int8_t _upBuff1_ref[MAX_CU_SIZE + 2], *upBuff1_ref = _upBuff1_ref + 1;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
int8_t _upBuff1_vec[MAX_CU_SIZE + 2], *upBuff1_vec = _upBuff1_vec + 1;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- int j = 0;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
-</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
for (int i = 0; i < ITERS; i++)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
{</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
// initialize input data to random, the dynamic range wrong but good to verify our asm code</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -1377,7 +1372,6 @@ bool PixelHarness::check_saoCuStatsE1_t(saoCuStatsE1_t ref, saoCuStatsE1_t opt)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
return false;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
reportfail();</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- j += INCR;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
return true;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -1397,7 +1391,6 @@ bool PixelHarness::check_saoCuStatsE2_t(saoCuStatsE2_t ref, saoCuStatsE2_t opt)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
int8_t _upBuff1_vec[MAX_CU_SIZE + 2], *upBuff1_vec = _upBuff1_vec + 1;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
int8_t _upBufft_vec[MAX_CU_SIZE + 2], *upBufft_vec = _upBufft_vec + 1;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- int j = 0;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
// NOTE: verify more times since our asm is NOT exact match to C, the output of upBuff* will be DIFFERENT</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
for (int i = 0; i < ITERS * 10; i++)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -1428,7 +1421,6 @@ bool PixelHarness::check_saoCuStatsE2_t(saoCuStatsE2_t ref, saoCuStatsE2_t opt)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
return false;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
reportfail();</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- j += INCR;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
return true;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -1446,8 +1438,6 @@ bool PixelHarness::check_saoCuStatsE3_t(saoCuStatsE3_t ref, saoCuStatsE3_t opt)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
int8_t _upBuff1_ref[MAX_CU_SIZE + 2], *upBuff1_ref = _upBuff1_ref + 1;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
int8_t _upBuff1_vec[MAX_CU_SIZE + 2], *upBuff1_vec = _upBuff1_vec + 1;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- int j = 0;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
-</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
// (const pixel *fenc, const pixel *rec, intptr_t stride, int8_t *upBuff1, int endX, int endY, int32_t *stats, int32_t *count)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
for (int i = 0; i < ITERS; i++)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
{</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -1476,7 +1466,6 @@ bool PixelHarness::check_saoCuStatsE3_t(saoCuStatsE3_t ref, saoCuStatsE3_t opt)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
return false;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
reportfail();</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- j += INCR;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
return true;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -1729,7 +1718,6 @@ bool PixelHarness::check_scanPosLast(scanPosLast_t ref, scanPosLast_t opt)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
uint16_t ref_coeffSign[MLS_GRP_NUM], opt_coeffSign[MLS_GRP_NUM]; // bit mask map for non-zero coeff sign</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
uint16_t ref_coeffFlag[MLS_GRP_NUM], opt_coeffFlag[MLS_GRP_NUM]; // bit mask map for non-zero coeff</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- int totalCoeffs = 0;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
for (int i = 0; i < 32 * 32; i++)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
{</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
ref_src[i] = rand() & SHORT_MAX;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -1741,7 +1729,6 @@ bool PixelHarness::check_scanPosLast(scanPosLast_t ref, scanPosLast_t opt)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
// more negtive</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
if ((rand() % 10) < 8)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
ref_src[i] *= -1;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- totalCoeffs += (ref_src[i] != 0);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
// extra test area all of 0x1234</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -1865,7 +1852,6 @@ bool PixelHarness::check_costCoeffNxN(costCoeffNxN_t ref, costCoeffNxN_t opt)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
memset(ref_absCoeff, 0xCD, sizeof(ref_absCoeff));</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
memset(opt_absCoeff, 0xCD, sizeof(opt_absCoeff));</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- int totalCoeffs = 0;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
for (int i = 0; i < 32 * 32; i++)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
{</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
ref_src[i] = rand() & SHORT_MAX;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -1877,7 +1863,6 @@ bool PixelHarness::check_costCoeffNxN(costCoeffNxN_t ref, costCoeffNxN_t opt)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
// more negtive</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
if ((rand() % 10) < 8)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
ref_src[i] *= -1;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- totalCoeffs += (ref_src[i] != 0);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
// extra test area all of 0x1234</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -2230,7 +2215,6 @@ bool PixelHarness::check_pelFilterChroma_V(pelFilterChroma_t ref, pelFilterChrom</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
bool PixelHarness::check_integral_initv(integralv_t ref, integralv_t opt)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
{</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
intptr_t srcStep = 64;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- int j = 0;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
uint32_t dst_ref[BUFFSIZE] = { 0 };</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
uint32_t dst_opt[BUFFSIZE] = { 0 };</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -2261,7 +2245,6 @@ bool PixelHarness::check_integral_initv(integralv_t ref, integralv_t opt)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
return false;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
reportfail()</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- j += INCR;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
return true;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -2272,7 +2255,6 @@ bool PixelHarness::check_integral_inith(integralh_t ref, integralh_t opt)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
* to check correctness for two cases: stride multiple of 16 and stride not a multiple of 16; fine for High bit depth</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
* where data movement in AVX2 is 8 elements at a time */</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
intptr_t srcStep[2] = { 56, 64 };</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- int j = 0;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
uint32_t dst_ref[BUFFSIZE] = { 0 };</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
uint32_t dst_opt[BUFFSIZE] = { 0 };</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -2291,7 +2273,6 @@ bool PixelHarness::check_integral_inith(integralh_t ref, integralh_t opt)</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
return false;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
reportfail()</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- j += INCR;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
}</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
return true;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
diff --git a/source/test/pixelharness.h b/source/test/pixelharness.h</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
index ee43cbeae..5dd354029 100644</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
--- a/source/test/pixelharness.h</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+++ b/source/test/pixelharness.h</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -109,7 +109,7 @@ protected:</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
bool check_addAvg_aligned(addAvg_t, addAvg_t);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
bool check_saoCuOrgE0_t(saoCuOrgE0_t ref, saoCuOrgE0_t opt);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
bool check_saoCuOrgE1_t(saoCuOrgE1_t ref, saoCuOrgE1_t opt);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- bool check_saoCuOrgE2_t(saoCuOrgE2_t ref[], saoCuOrgE2_t opt[]);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+ bool check_saoCuOrgE2_t(saoCuOrgE2_t ref[2], saoCuOrgE2_t opt[2]);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
bool check_saoCuOrgE3_t(saoCuOrgE3_t ref, saoCuOrgE3_t opt);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
bool check_saoCuOrgE3_32_t(saoCuOrgE3_t ref, saoCuOrgE3_t opt);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
bool check_saoCuOrgB0_t(saoCuOrgB0_t ref, saoCuOrgB0_t opt);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
diff --git a/source/x265.cpp b/source/x265.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
index d1a362070..1617ef414 100644</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
--- a/source/x265.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+++ b/source/x265.cpp</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
@@ -208,7 +208,7 @@ static bool parseAbrConfig(FILE* abrConfig, CLIOptions cliopt[], uint8_t numEnco</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
{</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
argv[argc] = strPool;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
strPool += strlen(token) + 1;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
- strPoolSize -= (int)strlen(token) + 1;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
+ strPoolSize = strPoolSize - (int)strlen(token) + 1;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
strcpy(argv[argc], token);</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
token = strtok(NULL, " ");</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
argc++;</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
--</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
2.43.0</div>
<div class="elementToProof" style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
<br>
</div>
<div style="font-family: Corbel, Skia, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
</body>
</html>