[x265] [PATCH 6 of 6] testbench: fix table fault when trSize more than 8

Min Chen chenm003 at 163.com
Wed Apr 22 15:32:00 CEST 2015


# HG changeset patch
# User Min Chen <chenm003 at 163.com>
# Date 1429709483 -28800
# Node ID 40d3d07f09f53dfd25b4aa529ff3bf385ec314bb
# Parent  d70698f3f9d9ae6e7a37a5e5aa0b737913cae514
testbench: fix table fault when trSize more than 8
---
 source/test/pixelharness.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff -r d70698f3f9d9 -r 40d3d07f09f5 source/test/pixelharness.cpp
--- a/source/test/pixelharness.cpp	Wed Apr 22 21:31:19 2015 +0800
+++ b/source/test/pixelharness.cpp	Wed Apr 22 21:31:23 2015 +0800
@@ -1255,7 +1255,7 @@
 
         const int trSize = (1 << (rand_scan_size + 2));
         const uint16_t* const scanTbl = g_scanOrder[rand_scan_type][rand_scan_size];
-        const uint16_t* const scanTblCG4x4 = g_scan4x4[rand_scan_type];
+        const uint16_t* const scanTblCG4x4 = g_scan4x4[rand_scan_size <= (MDCS_LOG2_MAX_SIZE - 2) ? rand_scan_type : SCAN_DIAG];
 
         int ref_scanPos = ref(scanTbl, ref_src + i, ref_coeffSign, ref_coeffFlag, ref_coeffNum, rand_numCoeff, scanTblCG4x4, trSize);
         int opt_scanPos = (int)checked(opt, scanTbl, ref_src + i, opt_coeffSign, opt_coeffFlag, opt_coeffNum, rand_numCoeff, scanTblCG4x4, trSize);



More information about the x265-devel mailing list