[x265] [PATCH 2 of 3] analysis-save/load: Validate conformance window offsets
Aruna Matheswaran
aruna at multicorewareinc.com
Tue Jan 7 09:54:59 CET 2020
# HG changeset patch
# User Aruna Matheswaran <aruna at multicorewareinc.com>
# Date 1578337264 -19800
# Tue Jan 07 00:31:04 2020 +0530
# Node ID 2cfecdc974ac5e1748dc5844ef475dbff4e30d0e
# Parent 4d870dd7c314334b27413de922d08d9c01d5860b
analysis-save/load: Validate conformance window offsets
diff -r 4d870dd7c314 -r 2cfecdc974ac source/CMakeLists.txt
--- a/source/CMakeLists.txt Mon Dec 16 17:55:07 2019 +0530
+++ b/source/CMakeLists.txt Tue Jan 07 00:31:04 2020 +0530
@@ -29,7 +29,7 @@
option(STATIC_LINK_CRT "Statically link C runtime for release builds" OFF)
mark_as_advanced(FPROFILE_USE FPROFILE_GENERATE NATIVE_BUILD)
# X265_BUILD must be incremented each time the public API is changed
-set(X265_BUILD 185)
+set(X265_BUILD 186)
configure_file("${PROJECT_SOURCE_DIR}/x265.def.in"
"${PROJECT_BINARY_DIR}/x265.def")
configure_file("${PROJECT_SOURCE_DIR}/x265_config.h.in"
diff -r 4d870dd7c314 -r 2cfecdc974ac source/common/param.cpp
--- a/source/common/param.cpp Mon Dec 16 17:55:07 2019 +0530
+++ b/source/common/param.cpp Tue Jan 07 00:31:04 2020 +0530
@@ -312,6 +312,10 @@
param->log2MaxPocLsb = 8;
param->maxSlices = 1;
+ /*Conformance window*/
+ param->confWinRightOffset = 0;
+ param->confWinBottomOffset = 0;
+
param->bEmitVUITimingInfo = 1;
param->bEmitVUIHRDInfo = 1;
param->bOptQpPPS = 0;
@@ -1779,6 +1783,8 @@
param->bSingleSeiNal = 0;
x265_log(param, X265_LOG_WARNING, "None of the SEI messages are enabled. Disabling Single SEI NAL\n");
}
+ CHECK(param->confWinRightOffset < 0, "Conformance Window Right Offset must be 0 or greater");
+ CHECK(param->confWinBottomOffset < 0, "Conformance Window Bottom Offset must be 0 or greater");
return check_failed;
}
@@ -2193,6 +2199,7 @@
BOOL(p->bEnableSceneCutAwareQp, "scenecut-aware-qp");
if (p->bEnableSceneCutAwareQp)
s += sprintf(s, " scenecut-window=%d max-qp-delta=%d", p->scenecutWindow, p->maxQpDelta);
+ s += sprintf(s, "conformance-window-offsets right=%d bottom=%d", p->confWinRightOffset, p->confWinBottomOffset);
#undef BOOL
return buf;
}
@@ -2542,6 +2549,8 @@
dst->maxQpDelta = src->maxQpDelta;
dst->bField = src->bField;
+ dst->confWinRightOffset = src->confWinRightOffset;
+ dst->confWinBottomOffset = src->confWinBottomOffset;
#ifdef SVT_HEVC
memcpy(dst->svtHevcParam, src->svtHevcParam, sizeof(EB_H265_ENC_CONFIGURATION));
#endif
diff -r 4d870dd7c314 -r 2cfecdc974ac source/encoder/api.cpp
--- a/source/encoder/api.cpp Mon Dec 16 17:55:07 2019 +0530
+++ b/source/encoder/api.cpp Tue Jan 07 00:31:04 2020 +0530
@@ -176,6 +176,8 @@
// may change params for auto-detect, etc
encoder->configure(param);
+ if (encoder->m_aborted)
+ goto fail;
// may change rate control and CPB params
if (!enforceLevel(*param, encoder->m_vps))
goto fail;
diff -r 4d870dd7c314 -r 2cfecdc974ac source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp Mon Dec 16 17:55:07 2019 +0530
+++ b/source/encoder/encoder.cpp Tue Jan 07 00:31:04 2020 +0530
@@ -81,6 +81,7 @@
#define MVTHRESHOLD (10*10)
#define PU_2Nx2N 1
#define MAX_CHROMA_QP_OFFSET 12
+#define CONF_OFFSET_BYTES (2 * sizeof(int))
static const char* defaultAnalysisFileName = "x265_analysis.dat";
using namespace X265_NS;
@@ -474,15 +475,6 @@
m_aborted = true;
}
}
- if (m_param->analysisLoad && m_param->bUseAnalysisFile)
- {
- m_analysisFileIn = x265_fopen(m_param->analysisLoad, "rb");
- if (!m_analysisFileIn)
- {
- x265_log_file(NULL, X265_LOG_ERROR, "Analysis load: failed to open file %s\n", m_param->analysisLoad);
- m_aborted = true;
- }
- }
if (m_param->analysisMultiPassRefine || m_param->analysisMultiPassDistortion)
{
@@ -1751,11 +1743,11 @@
if (m_param->analysisLoad)
{
/* reads analysis data for the frame and allocates memory based on slicetype */
- static int paramBytes = 0;
+ static int paramBytes = CONF_OFFSET_BYTES;
if (!inFrame->m_poc && m_param->bAnalysisType != HEVC_INFO)
{
- x265_analysis_data analysisData = inputPic->analysisData;
- paramBytes = validateAnalysisData(&analysisData, 0);
+ x265_analysis_validate saveParam = inputPic->analysisData.saveParam;
+ paramBytes += validateAnalysisData(&saveParam, 0);
if (paramBytes == -1)
{
m_aborted = true;
@@ -3775,20 +3767,66 @@
m_conformanceWindow.topOffset = 0;
m_conformanceWindow.bottomOffset = 0;
m_conformanceWindow.leftOffset = 0;
+
+ uint32_t padsize = 0;
+ if (m_param->analysisLoad && m_param->bUseAnalysisFile)
+ {
+ m_analysisFileIn = x265_fopen(m_param->analysisLoad, "rb");
+ if (!m_analysisFileIn)
+ {
+ x265_log_file(NULL, X265_LOG_ERROR, "Analysis load: failed to open file %s\n", m_param->analysisLoad);
+ m_aborted = true;
+ }
+ else
+ {
+ if (fread(&m_conformanceWindow.rightOffset, sizeof(int), 1, m_analysisFileIn) != 1)
+ {
+ x265_log(NULL, X265_LOG_ERROR, "Error reading analysis data. Conformance window right offset missing\n");
+ m_aborted = true;
+ }
+ else if (m_conformanceWindow.rightOffset)
+ {
+ padsize = m_conformanceWindow.rightOffset * 2;
+ p->sourceWidth += padsize;
+ m_conformanceWindow.bEnabled = true;
+ m_conformanceWindow.rightOffset = padsize;
+ }
+
+ if (fread(&m_conformanceWindow.bottomOffset, sizeof(int), 1, m_analysisFileIn) != 1)
+ {
+ x265_log(NULL, X265_LOG_ERROR, "Error reading analysis data. Conformance window bottom offset missing\n");
+ m_aborted = true;
+ }
+ else if (m_conformanceWindow.bottomOffset)
+ {
+ padsize = m_conformanceWindow.bottomOffset * 2;
+ p->sourceHeight += padsize;
+ m_conformanceWindow.bEnabled = true;
+ m_conformanceWindow.bottomOffset = padsize;
+ }
+ }
+ }
+
/* set pad size if width is not multiple of the minimum CU size */
- if (p->scaleFactor == 2 && ((p->sourceWidth / 2) & (p->minCUSize - 1)) && p->analysisLoad)
- {
- uint32_t rem = (p->sourceWidth / 2) & (p->minCUSize - 1);
- uint32_t padsize = p->minCUSize - rem;
- p->sourceWidth += padsize * 2;
-
- m_conformanceWindow.bEnabled = true;
- m_conformanceWindow.rightOffset = padsize * 2;
- }
- else if(p->sourceWidth & (p->minCUSize - 1))
+ if (p->confWinRightOffset)
+ {
+ if ((p->sourceWidth + p->confWinRightOffset) & (p->minCUSize - 1))
+ {
+ x265_log(p, X265_LOG_ERROR, "Incompatible conformance window right offset."
+ " This when added to the source width should be a multiple of minCUSize\n");
+ m_aborted = true;
+ }
+ else
+ {
+ p->sourceWidth += p->confWinRightOffset;
+ m_conformanceWindow.bEnabled = true;
+ m_conformanceWindow.rightOffset = p->confWinRightOffset;
+ }
+ }
+ else if (p->sourceWidth & (p->minCUSize - 1))
{
uint32_t rem = p->sourceWidth & (p->minCUSize - 1);
- uint32_t padsize = p->minCUSize - rem;
+ padsize = p->minCUSize - rem;
p->sourceWidth += padsize;
m_conformanceWindow.bEnabled = true;
@@ -3989,18 +4027,25 @@
}
}
/* set pad size if height is not multiple of the minimum CU size */
- if (p->scaleFactor == 2 && ((p->sourceHeight / 2) & (p->minCUSize - 1)) && p->analysisLoad)
- {
- uint32_t rem = (p->sourceHeight / 2) & (p->minCUSize - 1);
- uint32_t padsize = p->minCUSize - rem;
- p->sourceHeight += padsize * 2;
- m_conformanceWindow.bEnabled = true;
- m_conformanceWindow.bottomOffset = padsize * 2;
+ if (p->confWinBottomOffset)
+ {
+ if ((p->sourceHeight + p->confWinBottomOffset) & (p->minCUSize - 1))
+ {
+ x265_log(p, X265_LOG_ERROR, "Incompatible conformance window bottom offset."
+ " This when added to the source height should be a multiple of minCUSize\n");
+ m_aborted = true;
+ }
+ else
+ {
+ p->sourceHeight += p->confWinBottomOffset;
+ m_conformanceWindow.bEnabled = true;
+ m_conformanceWindow.bottomOffset = p->confWinBottomOffset;
+ }
}
else if(p->sourceHeight & (p->minCUSize - 1))
{
uint32_t rem = p->sourceHeight & (p->minCUSize - 1);
- uint32_t padsize = p->minCUSize - rem;
+ padsize = p->minCUSize - rem;
p->sourceHeight += padsize;
m_conformanceWindow.bEnabled = true;
m_conformanceWindow.bottomOffset = padsize;
@@ -4835,7 +4880,7 @@
}
-int Encoder::validateAnalysisData(x265_analysis_data* analysis, int writeFlag)
+int Encoder::validateAnalysisData(x265_analysis_validate* saveParam, int writeFlag)
{
#define X265_PARAM_VALIDATE(analysisParam, size, bytes, param, errorMsg)\
if(!writeFlag)\
@@ -4876,11 +4921,16 @@
}\
count++;
- x265_analysis_validate *saveParam = &analysis->saveParam;
FILE* fileOffset = NULL;
int readValue = 0;
int count = 0;
+ if (m_param->bUseAnalysisFile && writeFlag)
+ {
+ X265_PARAM_VALIDATE(saveParam->rightOffset, sizeof(int), 1, &m_conformanceWindow.rightOffset, right-offset);
+ X265_PARAM_VALIDATE(saveParam->bottomOffset, sizeof(int), 1, &m_conformanceWindow.bottomOffset, bottom-offset);
+ }
+
X265_PARAM_VALIDATE(saveParam->intraRefresh, sizeof(int), 1, &m_param->bIntraRefresh, intra-refresh);
X265_PARAM_VALIDATE(saveParam->maxNumReferences, sizeof(int), 1, &m_param->maxNumReferences, ref);
X265_PARAM_VALIDATE(saveParam->keyframeMax, sizeof(int), 1, &m_param->keyframeMax, keyint);
@@ -5235,7 +5285,7 @@
if (!analysis->poc)
{
- if (validateAnalysisData(analysis, 1) == -1)
+ if (validateAnalysisData(&analysis->saveParam, 1) == -1)
{
m_aborted = true;
return;
diff -r 4d870dd7c314 -r 2cfecdc974ac source/encoder/encoder.h
--- a/source/encoder/encoder.h Mon Dec 16 17:55:07 2019 +0530
+++ b/source/encoder/encoder.h Tue Jan 07 00:31:04 2020 +0530
@@ -358,7 +358,7 @@
void finishFrameStats(Frame* pic, FrameEncoder *curEncoder, x265_frame_stats* frameStats, int inPoc);
- int validateAnalysisData(x265_analysis_data* analysis, int readWriteFlag);
+ int validateAnalysisData(x265_analysis_validate* param, int readWriteFlag);
void readUserSeiFile(x265_sei_payload& seiMsg, int poc);
diff -r 4d870dd7c314 -r 2cfecdc974ac source/x265.h
--- a/source/x265.h Mon Dec 16 17:55:07 2019 +0530
+++ b/source/x265.h Tue Jan 07 00:31:04 2020 +0530
@@ -132,6 +132,8 @@
int chunkEnd;
int cuTree;
int ctuDistortionRefine;
+ int rightOffset;
+ int bottomOffset;
}x265_analysis_validate;
/* Stores intra analysis data for a single frame. This struct needs better packing */
@@ -1869,6 +1871,28 @@
* analysis information reused in analysis-load. Higher the refine level higher
* the information reused. Default is 5 */
int analysisLoadReuseLevel;
+
+ /* Conformance window right offset specifies the padding offset to the
+ * right side of the internal copy of the input pictures in the library.
+ * The decoded picture will be cropped based on conformance window right offset
+ * signaled in the SPS before output. Default is 0.
+ * Recommended to set this during non-file based analysis-load to inform
+ * it about the conformace window right offset to be added to match the
+ * number of CUs across the width for which analysis info is available
+ * from the corresponding analysis-save. */
+
+ int confWinRightOffset;
+
+ /* Conformance window bottom offset specifies the padding offset to the
+ * bottom side of the internal copy of the input pictures in the library.
+ * The decoded picture will be cropped based on conformance window bottom offset
+ * signaled in the SPS before output. Default is 0.
+ * Recommended to set this during non-file based analysis-load to inform
+ * it about the conformace window bottom offset to be added to match the
+ * number of CUs across the height for which analysis info is available
+ * from the corresponding analysis-save. */
+
+ int confWinBottomOffset;
} x265_param;
/* x265_param_alloc:
-------------- next part --------------
A non-text attachment was scrubbed...
Name: x265_push-2.patch
Type: text/x-patch
Size: 12897 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20200107/a845ac0b/attachment-0001.bin>
More information about the x265-devel
mailing list