[x265] [PATCH] entropy: removed gcc warning in encodeCoeffNxN

ashok at multicorewareinc.com ashok at multicorewareinc.com
Thu Jan 8 10:36:32 CET 2015


# HG changeset patch
# User Ashok Kumar Mishra<ashok at multicorewareinc.com>
# Date 1420709315 -19800
#      Thu Jan 08 14:58:35 2015 +0530
# Node ID 4659aa3e33bf3cd3a98e8581973eafc30a707caf
# Parent  6dce2b87f0fe4aa37f9c7d66ec99447919b19c64
entropy: removed gcc warning in encodeCoeffNxN

diff -r 6dce2b87f0fe -r 4659aa3e33bf source/common/quant.cpp
--- a/source/common/quant.cpp	Thu Jan 08 10:29:09 2015 +0530
+++ b/source/common/quant.cpp	Thu Jan 08 14:58:35 2015 +0530
@@ -840,7 +840,7 @@
             if (dstCoeff[blkPos])
             {                
                 // Calculates the cost of signaling the last significant coefficient in the block 
-                int pos[2] = { (blkPos & (trSize - 1)), (blkPos >> log2TrSize) };
+                uint32_t pos[2] = { (blkPos & (trSize - 1)), (blkPos >> log2TrSize) };
                 if (codeParams.scanType == SCAN_VER)
                     std::swap(pos[0], pos[1]);
                 uint32_t bitsLastNZ = 0;
diff -r 6dce2b87f0fe -r 4659aa3e33bf source/encoder/entropy.cpp
--- a/source/encoder/entropy.cpp	Thu Jan 08 10:29:09 2015 +0530
+++ b/source/encoder/entropy.cpp	Thu Jan 08 14:58:35 2015 +0530
@@ -1458,8 +1458,8 @@
         // The last position is composed of a prefix and suffix.
         // The prefix is context coded truncated unary bins. The suffix is bypass coded fixed length bins.
         // The bypass coded bins for both the x and y components are grouped together.
-        int packedSuffixBits = 0, packedSuffixLen = 0;
-        int pos[2] = { (posLast & (trSize - 1)), (posLast >> log2TrSize) };
+        uint32_t packedSuffixBits = 0, packedSuffixLen = 0;
+        uint32_t pos[2] = { (posLast & (trSize - 1)), (posLast >> log2TrSize) };
         // swap
         if (codingParameters.scanType == SCAN_VER)
             std::swap(pos[0], pos[1]);


More information about the x265-devel mailing list