[x265-commits] [x265] log: move lookahead options all together, rate-control at...
Steve Borho
steve at borho.org
Wed Feb 5 00:34:49 CET 2014
details: http://hg.videolan.org/x265/rev/51011b224a7c
branches:
changeset: 6008:51011b224a7c
user: Steve Borho <steve at borho.org>
date: Tue Feb 04 17:18:06 2014 -0600
description:
log: move lookahead options all together, rate-control at the end (nit)
Subject: [x265] asm: disable x86 versions of addAvg - they are broken
details: http://hg.videolan.org/x265/rev/a88c7bbfba61
branches:
changeset: 6009:a88c7bbfba61
user: Steve Borho <steve at borho.org>
date: Tue Feb 04 17:24:06 2014 -0600
description:
asm: disable x86 versions of addAvg - they are broken
Subject: [x265] pixelharness: fix luma_addAvg tests
details: http://hg.videolan.org/x265/rev/43966a9a13ba
branches:
changeset: 6010:43966a9a13ba
user: Steve Borho <steve at borho.org>
date: Tue Feb 04 17:30:21 2014 -0600
description:
pixelharness: fix luma_addAvg tests
Subject: [x265] pixelharness: actually report chroma addAvg as addAvg, not add_ps
details: http://hg.videolan.org/x265/rev/bed6e485d6c1
branches:
changeset: 6011:bed6e485d6c1
user: Steve Borho <steve at borho.org>
date: Tue Feb 04 17:30:50 2014 -0600
description:
pixelharness: actually report chroma addAvg as addAvg, not add_ps
diffstat:
source/common/common.cpp | 21 ++++++++++-----------
source/common/x86/asm-primitives.cpp | 2 ++
source/test/pixelharness.cpp | 34 +++++++++++++++++-----------------
3 files changed, 29 insertions(+), 28 deletions(-)
diffs (126 lines):
diff -r 8d2b20447b8a -r bed6e485d6c1 source/common/common.cpp
--- a/source/common/common.cpp Tue Feb 04 16:43:44 2014 -0600
+++ b/source/common/common.cpp Tue Feb 04 17:30:50 2014 -0600
@@ -587,6 +587,16 @@ void x265_print_params(x265_param *param
x265_log(param, X265_LOG_INFO, "ME / range / subpel / merge : %s / %d / %d / %d\n",
x265_motion_est_names[param->searchMethod], param->searchRange, param->subpelRefine, param->maxNumMergeCand);
x265_log(param, X265_LOG_INFO, "Keyframe min / max / scenecut : %d / %d / %d\n", param->keyframeMin, param->keyframeMax, param->scenecutThreshold);
+ if (param->cbQpOffset || param->crQpOffset)
+ {
+ x265_log(param, X265_LOG_INFO, "Cb/Cr QP Offset : %d / %d\n", param->cbQpOffset, param->crQpOffset);
+ }
+ if (param->rdPenalty)
+ {
+ x265_log(param, X265_LOG_INFO, "RDpenalty : %d\n", param->rdPenalty);
+ }
+ x265_log(param, X265_LOG_INFO, "Lookahead / bframes / badapt : %d / %d / %d\n", param->lookaheadDepth, param->bframes, param->bFrameAdaptive);
+ x265_log(param, X265_LOG_INFO, "b-pyramid / weightp / refs : %d / %d / %d\n", param->bBPyramid, param->bEnableWeightedPred, param->maxNumReferences);
switch (param->rc.rateControlMode)
{
case X265_RC_ABR:
@@ -602,17 +612,6 @@ void x265_print_params(x265_param *param
param->rc.aqStrength, param->rc.cuTree);
break;
}
-
- if (param->cbQpOffset || param->crQpOffset)
- {
- x265_log(param, X265_LOG_INFO, "Cb/Cr QP Offset : %d / %d\n", param->cbQpOffset, param->crQpOffset);
- }
- if (param->rdPenalty)
- {
- x265_log(param, X265_LOG_INFO, "RDpenalty : %d\n", param->rdPenalty);
- }
- x265_log(param, X265_LOG_INFO, "Lookahead / bframes / badapt : %d / %d / %d\n", param->lookaheadDepth, param->bframes, param->bFrameAdaptive);
- x265_log(param, X265_LOG_INFO, "b-pyramid / weightp / refs : %d / %d / %d\n", param->bBPyramid, param->bEnableWeightedPred, param->maxNumReferences);
x265_log(param, X265_LOG_INFO, "tools: ");
#define TOOLOPT(FLAG, STR) if (FLAG) fprintf(stderr, "%s ", STR)
TOOLOPT(param->bEnableRectInter, "rect");
diff -r 8d2b20447b8a -r bed6e485d6c1 source/common/x86/asm-primitives.cpp
--- a/source/common/x86/asm-primitives.cpp Tue Feb 04 16:43:44 2014 -0600
+++ b/source/common/x86/asm-primitives.cpp Tue Feb 04 17:30:50 2014 -0600
@@ -947,8 +947,10 @@ void Setup_Assembly_Primitives(EncoderPr
p.idct[IDCT_4x4] = x265_idct4_sse2;
p.idct[IDST_4x4] = x265_idst4_sse2;
+#if X86_64
LUMA_ADDAVG(_sse2);
CHROMA_ADDAVG(_sse2);
+#endif
}
if (cpuMask & X265_CPU_SSSE3)
{
diff -r 8d2b20447b8a -r bed6e485d6c1 source/test/pixelharness.cpp
--- a/source/test/pixelharness.cpp Tue Feb 04 16:43:44 2014 -0600
+++ b/source/test/pixelharness.cpp Tue Feb 04 17:30:50 2014 -0600
@@ -916,6 +916,15 @@ bool PixelHarness::testPartition(int par
}
}
+ if (opt.luma_addAvg[part])
+ {
+ if (!check_addAvg(ref.luma_addAvg[part], opt.luma_addAvg[part]))
+ {
+ printf("luma_addAvg[%s] failed\n", lumaPartStr[part]);
+ return false;
+ }
+ }
+
for (int i = 0; i < X265_CSP_COUNT; i++)
{
if (opt.chroma[i].copy_pp[part])
@@ -962,21 +971,12 @@ bool PixelHarness::testPartition(int par
{
if (!check_addAvg(ref.chroma[i].addAvg[part], opt.chroma[i].addAvg[part]))
{
- printf("chroma_add_ps[%s][%s] failed\n", x265_source_csp_names[i], chromaPartStr[part]);
+ printf("chroma_addAvg[%s][%s] failed\n", x265_source_csp_names[i], chromaPartStr[part]);
return false;
}
}
}
- if (opt.luma_addAvg[part])
- {
- if (!check_addAvg(ref.luma_addAvg[part], opt.luma_addAvg[part]))
- {
- printf("luma_addAvg[%s] failed\n", lumaPartStr[part]);
- return false;
- }
- }
-
return true;
}
@@ -1271,6 +1271,12 @@ void PixelHarness::measurePartition(int
#endif
}
+ if (opt.luma_addAvg[part])
+ {
+ HEADER("luma_addAvg[%s]", lumaPartStr[part]);
+ REPORT_SPEEDUP(opt.luma_addAvg[part], ref.luma_addAvg[part], sbuf1, sbuf2, pbuf1, STRIDE, STRIDE, STRIDE);
+ }
+
for (int i = 0; i < X265_CSP_COUNT; i++)
{
if (opt.chroma[i].copy_pp[part])
@@ -1300,17 +1306,11 @@ void PixelHarness::measurePartition(int
}
if (opt.chroma[i].addAvg[part])
{
- HEADER("[%s] add_ps[%s]", x265_source_csp_names[i], chromaPartStr[part]);
+ HEADER("[%s] addAvg[%s]", x265_source_csp_names[i], chromaPartStr[part]);
REPORT_SPEEDUP(opt.chroma[i].addAvg[part], ref.chroma[i].addAvg[part], sbuf1, sbuf2, pbuf1, STRIDE, STRIDE, STRIDE);
}
}
- if (opt.luma_addAvg[part])
- {
- printf("luma_addAvg[%s]", lumaPartStr[part]);
- REPORT_SPEEDUP(opt.luma_addAvg[part], ref.luma_addAvg[part], sbuf1, sbuf2, pbuf1, STRIDE, STRIDE, STRIDE);
- }
-
#undef HEADER
}
More information about the x265-commits
mailing list