Merge commit 'f9e86d9ad4da4292d994b57674332c0018cac7f5'

ShiftMediaProject · Aug 11, 2019 · e59cfe4 · e59cfe4
2 parents a447071 + f9e86d9
commit e59cfe4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/.hgtags b/.hgtags
@@ -35,3 +35,4 @@ bad4e598cac7cdd3df4623c68c91299c620471bd 3.0-rc
 72188bd2f03447e71e789a5fd2f10364bb232c2c 3.0
 113518629fa54ffb491dd479e15c1f00dd39d376 3.1_RC1
 b4e38ce16d7c4b37a6482dc7ae61fd31071b6ff1 3.1_RC2
+acce27790559b68f93319cd21b588f90aa93c0b1 3.1
diff --git a/source/common/lowres.cpp b/source/common/lowres.cpp
@@ -71,7 +71,7 @@ bool Lowres::create(x265_param* param, PicYuv *origPic, uint32_t qgSize)
 
     size_t planesize = lumaStride * (lines + 2 * origPic->m_lumaMarginY);
     size_t padoffset = lumaStride * origPic->m_lumaMarginY + origPic->m_lumaMarginX;
-    if (!!param->rc.aqMode || !!param->rc.hevcAq)
+    if (!!param->rc.aqMode || !!param->rc.hevcAq || !!param->bAQMotion)
     {
         CHECKED_MALLOC_ZERO(qpAqOffset, double, cuCountFullRes);
         CHECKED_MALLOC_ZERO(invQscaleFactor, int, cuCountFullRes);

diff --git a/source/test/regression-tests.txt b/source/test/regression-tests.txt
@@ -84,6 +84,7 @@ ParkScene_1920x1080_24_10bit_444.yuv,--preset superfast --weightp --lookahead-sl
 ParkScene_1920x1080_24.y4m,--preset medium --qp 40 --rdpenalty 2 --tu-intra-depth 3
 ParkScene_1920x1080_24.y4m,--preset medium --pme --tskip-fast --tskip --min-keyint 48 --weightb --limit-refs 3
 ParkScene_1920x1080_24.y4m,--preset slower --no-weightp
+ParkScene_1920x1080_24.y4m,--tune grain --aq-motion
 RaceHorses_416x240_30.y4m,--preset superfast --no-cutree
 RaceHorses_416x240_30.y4m,--preset medium --tskip-fast --tskip
 RaceHorses_416x240_30.y4m,--preset slower --keyint -1 --rdoq-level 0 --limit-tu 2