Changeset 125 in SHVCSoftware for trunk/source/Lib/TLibCommon/TComPicYuvMD5.cpp

Timestamp:

16 Apr 2013, 06:39:31 (12 years ago)

Author:

seregin

Message:

copy from HM-10.0-dev-SHM

File:

• trunk/source/Lib/TLibCommon/TComPicYuvMD5.cpp (modified) (9 diffs)

trunk/source/Lib/TLibCommon/TComPicYuvMD5.cpp

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2012, ITU/ISO/IEC
+ * Copyright (c) 2010-2013, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -42 +42 @@
  * OUTBIT_BITDEPTH_DIV8.
  */
-template<unsigned OUTPUT_BITDEPTH_DIV8>
-static void md5_block(MD5& md5, const Pel* plane, unsigned n)
+template<UInt OUTPUT_BITDEPTH_DIV8>
+static void md5_block(MD5& md5, const Pel* plane, UInt n)
 {
   /* create a 64 byte buffer for packing Pel's into */
-  unsigned char buf[64/OUTPUT_BITDEPTH_DIV8][OUTPUT_BITDEPTH_DIV8];
-  for (unsigned i = 0; i < n; i++)
+  UChar buf[64/OUTPUT_BITDEPTH_DIV8][OUTPUT_BITDEPTH_DIV8];
+  for (UInt i = 0; i < n; i++)
   {
     Pel pel = plane[i];
     /* perform bitdepth and endian conversion */
-    for (unsigned d = 0; d < OUTPUT_BITDEPTH_DIV8; d++)
+    for (UInt d = 0; d < OUTPUT_BITDEPTH_DIV8; d++)
     {
       buf[i][d] = pel >> (d*8);
     }
   }
-  md5.update((unsigned char*)buf, n * OUTPUT_BITDEPTH_DIV8);
+  md5.update((UChar*)buf, n * OUTPUT_BITDEPTH_DIV8);
 }
 
@@ -63 +63 @@
  * is adjusted to OUTBIT_BITDEPTH_DIV8.
  */
-template<unsigned OUTPUT_BITDEPTH_DIV8>
-static void md5_plane(MD5& md5, const Pel* plane, unsigned width, unsigned height, unsigned stride)
+template<UInt OUTPUT_BITDEPTH_DIV8>
+static void md5_plane(MD5& md5, const Pel* plane, UInt width, UInt height, UInt stride)
 {
   /* N is the number of samples to process per md5 update.
    * All N samples must fit in buf */
-  unsigned N = 32;
-  unsigned width_modN = width % N;
-  unsigned width_less_modN = width - width_modN;
-
-  for (unsigned y = 0; y < height; y++)
-  {
-    /* convert pel's into unsigned chars in little endian byte order.
+  UInt N = 32;
+  UInt width_modN = width % N;
+  UInt width_less_modN = width - width_modN;
+
+  for (UInt y = 0; y < height; y++)
+  {
+    /* convert pel's into UInt chars in little endian byte order.
      * NB, for 8bit data, data is truncated to 8bits. */
-    for (unsigned x = 0; x < width_less_modN; x += N)
+    for (UInt x = 0; x < width_less_modN; x += N)
       md5_block<OUTPUT_BITDEPTH_DIV8>(md5, &plane[y*stride + x], N);
 
@@ -84 +84 @@
 }
 
-void compCRC(const Pel* plane, unsigned int width, unsigned int height, unsigned int stride, unsigned char digest[16])
-{
-  unsigned int bitdepth = g_uiBitDepth + g_uiBitIncrement;
-  unsigned int dataMsbIdx = bitdepth - 1;
-  unsigned int crcMsb;
-  unsigned int bitVal;
-  unsigned int crcVal = 0xffff;
-  unsigned int bitIdx;
-  for (unsigned y = 0; y < height; y++)
-  {
-    for (unsigned x = 0; x < width; x++)
-    {     
-      for(bitIdx=0; bitIdx<bitdepth; bitIdx++)
+static void compCRC(Int bitdepth, const Pel* plane, UInt width, UInt height, UInt stride, UChar digest[16])
+{
+  UInt crcMsb;
+  UInt bitVal;
+  UInt crcVal = 0xffff;
+  UInt bitIdx;
+  for (UInt y = 0; y < height; y++)
+  {
+    for (UInt x = 0; x < width; x++)
+    {
+      // take CRC of first pictureData byte
+      for(bitIdx=0; bitIdx<8; bitIdx++)
       {
         crcMsb = (crcVal >> 15) & 1;
-        bitVal = (plane[y*stride+x]>> (dataMsbIdx - (bitIdx&dataMsbIdx))) & 1;
+        bitVal = (plane[y*stride+x] >> (7 - bitIdx)) & 1;
         crcVal = (((crcVal << 1) + bitVal) & 0xffff) ^ (crcMsb * 0x1021);
       }
+      // take CRC of second pictureData byte if bit depth is greater than 8-bits
+      if(bitdepth > 8)
+      {
+        for(bitIdx=0; bitIdx<8; bitIdx++)
+        {
+          crcMsb = (crcVal >> 15) & 1;
+          bitVal = (plane[y*stride+x] >> (15 - bitIdx)) & 1;
+          crcVal = (((crcVal << 1) + bitVal) & 0xffff) ^ (crcMsb * 0x1021);
+        }
+      }
     }
   }
@@ -114 +123 @@
 }
 
-void calcCRC(TComPicYuv& pic, unsigned char digest[3][16])
-{
-  unsigned width = pic.getWidth();
-  unsigned height = pic.getHeight();
-  unsigned stride = pic.getStride();
-
-  compCRC(pic.getLumaAddr(), width, height, stride, digest[0]);
+void calcCRC(TComPicYuv& pic, UChar digest[3][16])
+{
+  UInt width = pic.getWidth();
+  UInt height = pic.getHeight();
+  UInt stride = pic.getStride();
+
+  compCRC(g_bitDepthY, pic.getLumaAddr(), width, height, stride, digest[0]);
 
   width >>= 1;
@@ -126 +135 @@
   stride >>= 1;
 
-  compCRC(pic.getCbAddr(), width, height, stride, digest[1]);
-  compCRC(pic.getCrAddr(), width, height, stride, digest[2]);
-}
-
-void compChecksum(const Pel* plane, unsigned int width, unsigned int height, unsigned int stride, unsigned char digest[16])
-{
-  unsigned int bitdepth = g_uiBitDepth + g_uiBitIncrement;
-
-  unsigned int checksum = 0;
-  unsigned char xor_mask;
-
-  for (unsigned y = 0; y < height; y++)
-  {
-    for (unsigned x = 0; x < width; x++)
+  compCRC(g_bitDepthC, pic.getCbAddr(), width, height, stride, digest[1]);
+  compCRC(g_bitDepthC, pic.getCrAddr(), width, height, stride, digest[2]);
+}
+
+static void compChecksum(Int bitdepth, const Pel* plane, UInt width, UInt height, UInt stride, UChar digest[16])
+{
+  UInt checksum = 0;
+  UChar xor_mask;
+
+  for (UInt y = 0; y < height; y++)
+  {
+    for (UInt x = 0; x < width; x++)
     {
       xor_mask = (x & 0xff) ^ (y & 0xff) ^ (x >> 8) ^ (y >> 8);
@@ -157 +164 @@
 }
 
-void calcChecksum(TComPicYuv& pic, unsigned char digest[3][16])
-{
-  unsigned width = pic.getWidth();
-  unsigned height = pic.getHeight();
-  unsigned stride = pic.getStride();
-
-  compChecksum(pic.getLumaAddr(), width, height, stride, digest[0]);
+void calcChecksum(TComPicYuv& pic, UChar digest[3][16])
+{
+  UInt width = pic.getWidth();
+  UInt height = pic.getHeight();
+  UInt stride = pic.getStride();
+
+  compChecksum(g_bitDepthY, pic.getLumaAddr(), width, height, stride, digest[0]);
 
   width >>= 1;
@@ -169 +176 @@
   stride >>= 1;
 
-  compChecksum(pic.getCbAddr(), width, height, stride, digest[1]);
-  compChecksum(pic.getCrAddr(), width, height, stride, digest[2]);
+  compChecksum(g_bitDepthC, pic.getCbAddr(), width, height, stride, digest[1]);
+  compChecksum(g_bitDepthC, pic.getCrAddr(), width, height, stride, digest[2]);
 }
 /**
@@ -179 +186 @@
  * uses little-endian two byte words; 8bit data uses single byte words.
  */
-void calcMD5(TComPicYuv& pic, unsigned char digest[3][16])
-{
-  unsigned bitdepth = g_uiBitDepth + g_uiBitIncrement;
+void calcMD5(TComPicYuv& pic, UChar digest[3][16])
+{
   /* choose an md5_plane packing function based on the system bitdepth */
-  typedef void (*MD5PlaneFunc)(MD5&, const Pel*, unsigned, unsigned, unsigned);
+  typedef void (*MD5PlaneFunc)(MD5&, const Pel*, UInt, UInt, UInt);
   MD5PlaneFunc md5_plane_func;
-  md5_plane_func = bitdepth <= 8 ? (MD5PlaneFunc)md5_plane<1> : (MD5PlaneFunc)md5_plane<2>;
+  md5_plane_func = g_bitDepthY <= 8 ? (MD5PlaneFunc)md5_plane<1> : (MD5PlaneFunc)md5_plane<2>;
 
   MD5 md5Y, md5U, md5V;
-  unsigned width = pic.getWidth();
-  unsigned height = pic.getHeight();
-  unsigned stride = pic.getStride();
+  UInt width = pic.getWidth();
+  UInt height = pic.getHeight();
+  UInt stride = pic.getStride();
 
   md5_plane_func(md5Y, pic.getLumaAddr(), width, height, stride);
   md5Y.finalize(digest[0]);
 
+  md5_plane_func = g_bitDepthC <= 8 ? (MD5PlaneFunc)md5_plane<1> : (MD5PlaneFunc)md5_plane<2>;
   width >>= 1;
   height >>= 1;