Merge branch 'intra_sad'

docs.doxy

@@ -1886,7 +1886,7 @@ ENABLE_PREPROCESSING   = YES
 # The default value is: NO.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-MACRO_EXPANSION        = NO
+MACRO_EXPANSION        = YES
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
 # the macro expansion is limited to the macros specified with the PREDEFINED and
@@ -1945,7 +1945,7 @@ EXPAND_AS_DEFINED      =
 # The default value is: YES.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-SKIP_FUNCTION_MACROS   = YES
+SKIP_FUNCTION_MACROS   = NO
 
 #---------------------------------------------------------------------------
 # Configuration options related to external references

src/debug.c

@@ -98,10 +98,12 @@ unsigned render_cu_file(encoder_control *encoder, picture *pic,
   fprintf(fp, 
     "\n<table class='d%u' bgcolor='#%02x%02x%02x'><tr><td colspan='2'>"
     "%u (%u, %u), %c, "
-    "c=%u, mv=(%d, %d)</td></tr>\n", 
+    "c=%u, mv=(%d, %d), intra_cost=%d, intra_mode=%d"
+    "</td></tr>\n", 
     depth, rgb[0], rgb[1], rgb[2],
     depth, xCtb, yCtb, (cu->type == CU_INTRA ? 'I' : 'P'),
-    cu->inter.cost, cu->inter.mv[0], cu->inter.mv[1]);
+    cu->inter.cost, cu->inter.mv[0], cu->inter.mv[1],
+    cu->intra.cost, cu->intra.mode);
 
 
   if(depth != MAX_INTER_SEARCH_DEPTH)

src/intra.c

@@ -216,12 +216,12 @@ void intra_filter(int16_t *ref, int32_t stride,int32_t width, int8_t mode)
 int16_t intra_prediction(pixel *orig, int32_t origstride, int16_t *rec, int32_t recstride, uint32_t xpos,
                          uint32_t ypos, uint32_t width, int16_t *dst, int32_t dststride, uint32_t *sad_out)
 {
-  typedef uint32_t (*sad_function)(int16_t *block,uint32_t stride1,int16_t *block2, uint32_t stride2);
   uint32_t best_sad = 0xffffffff;
   uint32_t sad = 0;
   int16_t best_mode = 1;
   int32_t x,y,i;
-  sad_function calc_sad;
+
+  cost_16bit_nxn_func cost_func = get_satd_16bit_nxn_func(width);
 
   // Temporary block arrays
   // TODO: alloc with alignment
@@ -233,11 +233,10 @@ int16_t intra_prediction(pixel *orig, int32_t origstride, int16_t *rec, int32_t
   pixel *orig_shift = &orig[xpos + ypos*origstride];  //!< pointer to orig with offset of (1,1)
   int8_t filter = (width<32); // TODO: chroma support
 
-  sad_function sad_array[5] = {&sad4x4,&sad8x8,&sad16x16,&sad32x32,&sad64x64}; //TODO: get SAD functions from parameters
   uint8_t threshold = intra_hor_ver_dist_thres[g_to_bits[width]]; //!< Intra filtering threshold
 
   #define COPY_PRED_TO_DST() for (y = 0; y < (int32_t)width; y++)  { for (x = 0; x < (int32_t)width; x++) { dst[x + y*dststride] = pred[x + y*width]; } }
-  #define CHECK_FOR_BEST(mode, additional_sad)  sad = calc_sad(pred,width,orig_block,width); \
+  #define CHECK_FOR_BEST(mode, additional_sad)  sad = cost_func(pred, orig_block); \
                                                 sad += additional_sad;\
                                                 if(sad < best_sad)\
                                                 {\
@@ -246,9 +245,6 @@ int16_t intra_prediction(pixel *orig, int32_t origstride, int16_t *rec, int32_t
                                                   COPY_PRED_TO_DST();\
                                                 }
 
-  // Choose SAD function according to width
-  calc_sad = sad_array[g_to_bits[width]];
-
   // Store original block for SAD computation
   i = 0;
   for(y = 0; y < (int32_t)width; y++) {

src/picture.c

@@ -300,12 +300,13 @@ double image_psnr(pixel *frame1, pixel *frame2, int32_t x, int32_t y)
 }
 
 /**
- * \brief 
+ * \brief  Calculate SATD between two 8x8 blocks inside bigger arrays.
  */
-uint32_t Hadamard8x8(int16_t *piOrg, int32_t iStrideOrg, int16_t *piCur, int32_t iStrideCur)
+unsigned satd_16bit_8x8_general(int16_t *piOrg, int32_t iStrideOrg, int16_t *piCur, int32_t iStrideCur)
 {
   int32_t k, i, j, jj, sad=0;
   int32_t diff[64], m1[8][8], m2[8][8], m3[8][8];
+
   for (k = 0; k < 64; k += 8) {
     diff[k+0] = piOrg[0] - piCur[0];
     diff[k+1] = piOrg[1] - piCur[1];
@@ -392,194 +393,144 @@ uint32_t Hadamard8x8(int16_t *piOrg, int32_t iStrideOrg, int16_t *piCur, int32_t
   return sad;
 }
 
-/**
+// Function macro for defining hadamart calculating functions 
- * \brief 
+// for fixed size blocks. They calculate hadamart for integer
- */
+// multiples of 8x8 with the 8x8 hadamart function.
-uint32_t sad64x64(int16_t *block1, uint32_t stride1, 
+#define SATD_NXN(n, pixel_type, suffix) \
-                  int16_t *block2, uint32_t stride2)
+  unsigned satd_ ## suffix ## _ ## n ## x ## n ## ( \
-{
+                    pixel_type *block1, pixel_type *block2) \
-  int32_t y, x;
+  { \
-  uint32_t sum = 0;
+    unsigned y, x; \
-  /*
+    unsigned sum = 0; \
-  for (y=0; y<64; y++) {
+    for (y = 0; y < (n); y += 8) { \
-    i = y * stride1; 
+      unsigned row = y * (n); \
-    ii = y * stride2;
+      for (x = 0; x < (n); x += 8) { \
-    for (x = 0; x < 64; x++) {
+        sum += satd_16bit_8x8_general(&block1[row + x], (n), &block2[row + x], (n)); \
-      sum += abs((int16_t)block1[i + x] - (int16_t)block2[ii + x]);
+      } \
-    }
+    } \
-  }
+    return sum; \
-  }*/
-  int32_t  iOffsetOrg = stride1 << 3;
-  int32_t  iOffsetCur = stride2 << 3;
-  for (y = 0; y < 64; y += 8) {
-    for (x = 0; x < 64; x += 8) {
-      sum += Hadamard8x8(&block1[x], stride1, &block2[x], stride2);
-    }
-    block1 += iOffsetOrg;
-    block2 += iOffsetCur;
   }
 
-  return sum;    
+// These macros define sadt_16bit_NxN for N = 8, 16, 32, 64
+SATD_NXN(8, int16_t, 16bit)
+SATD_NXN(16, int16_t, 16bit)
+SATD_NXN(32, int16_t, 16bit)
+SATD_NXN(64, int16_t, 16bit)
+
+
+// Function macro for defining SAD calculating functions 
+// for fixed size blocks.
+#define SAD_NXN(n, pixel_type, suffix) \
+  unsigned sad_ ## suffix ## _ ##  n ## x ## n ## ( \
+               pixel_type *block1, pixel_type *block2) \
+  { \
+    unsigned x, y, row; \
+    unsigned sum = 0; \
+    for(y = 0; y < (n); y++) { \
+      row = y * (n); \
+      for (x = 0; x < (n); ++x) { \
+        sum += abs(block1[row + x] - block2[row + x]); \
+      } \
+    } \
+    return sum; \
+  }
+
+// These macros define sad_16bit_nxn functions for n = 4, 8, 16, 32, 64
+// with function signatures of cost_16bit_nxn_func.
+// They are used through get_sad_16bit_nxn_func.
+SAD_NXN(4, int16_t, 16bit)
+SAD_NXN(8, int16_t, 16bit)
+SAD_NXN(16, int16_t, 16bit)
+SAD_NXN(32, int16_t, 16bit)
+SAD_NXN(64, int16_t, 16bit)
+
+/**
+ * \brief  Get a function that calculates SATD for NxN block.
+ * 
+ * \param n  Width of the region for which SATD is calculated.
+ * 
+ * \returns  Pointer to cost_16bit_nxn_func.
+ */
+cost_16bit_nxn_func get_satd_16bit_nxn_func(unsigned n)
+{
+  switch (n) {
+  case 8:
+    return &satd_16bit_8x8;
+  case 16:
+    return &satd_16bit_16x16;
+  case 32:
+    return &satd_16bit_32x32;
+  case 64:
+    return &satd_16bit_64x64;
+  default:
+    return NULL;
+  }
 }
 
 /**
- * \brief 
+ * \brief  Get a function that calculates SAD for NxN block.
+ * 
+ * \param n  Width of the region for which SAD is calculated.
+ * 
+ * \returns  Pointer to cost_16bit_nxn_func.
  */
-uint32_t sad32x32(int16_t *block1, uint32_t stride1, 
+cost_16bit_nxn_func get_sad_16bit_nxn_func(unsigned n)
-                  int16_t *block2, uint32_t stride2)
 {
-  int32_t x, y;
+  switch (n) {
-  int32_t sum = 0;
+  case 4:
-  int32_t iOffsetOrg = stride1 << 3;
+    return &sad_16bit_4x4;
-  int32_t iOffsetCur = stride2 << 3;
+  case 8:
-  
+    return &sad_16bit_8x8;
-  for (y = 0; y < 32; y += 8) {
+  case 16:
-    for ( x = 0; x < 32; x += 8 ) {
+    return &sad_16bit_16x16;
-      sum += Hadamard8x8(&block1[x], stride1, &block2[x], stride2);
+  case 32:
+    return &sad_16bit_32x32;
+  case 64:
+    return &sad_16bit_64x64;
+  default:
+    return NULL;
   }
-    block1 += iOffsetOrg;
-    block2 += iOffsetCur;
-  }
-
-  /*
-  uint32_t sum=0;
-  int32_t i,ii;
-  for(y=0;y<32;y++)
-  {
-    i = y*stride1; 
-    ii = y*stride2;
-    sum+=abs((int32_t)block[i]-(int32_t)block2[ii]);
-    sum+=abs((int32_t)block[i+1]-(int32_t)block2[ii+1]);
-    sum+=abs((int32_t)block[i+2]-(int32_t)block2[ii+2]);
-    sum+=abs((int32_t)block[i+3]-(int32_t)block2[ii+3]);
-    sum+=abs((int32_t)block[i+4]-(int32_t)block2[ii+4]);
-    sum+=abs((int32_t)block[i+5]-(int32_t)block2[ii+5]);
-    sum+=abs((int32_t)block[i+6]-(int32_t)block2[ii+6]);
-    sum+=abs((int32_t)block[i+7]-(int32_t)block2[ii+7]);
-    sum+=abs((int32_t)block[i+8]-(int32_t)block2[ii+8]);
-    sum+=abs((int32_t)block[i+9]-(int32_t)block2[ii+9]);
-    sum+=abs((int32_t)block[i+10]-(int32_t)block2[ii+10]);
-    sum+=abs((int32_t)block[i+11]-(int32_t)block2[ii+11]);
-    sum+=abs((int32_t)block[i+12]-(int32_t)block2[ii+12]);
-    sum+=abs((int32_t)block[i+13]-(int32_t)block2[ii+13]);
-    sum+=abs((int32_t)block[i+14]-(int32_t)block2[ii+14]);
-    sum+=abs((int32_t)block[i+15]-(int32_t)block2[ii+15]);
-    sum+=abs((int32_t)block[i+16]-(int32_t)block2[ii+16]);
-    sum+=abs((int32_t)block[i+17]-(int32_t)block2[ii+17]);
-    sum+=abs((int32_t)block[i+18]-(int32_t)block2[ii+18]);
-    sum+=abs((int32_t)block[i+19]-(int32_t)block2[ii+19]);
-    sum+=abs((int32_t)block[i+20]-(int32_t)block2[ii+20]);
-    sum+=abs((int32_t)block[i+21]-(int32_t)block2[ii+21]);
-    sum+=abs((int32_t)block[i+22]-(int32_t)block2[ii+22]);
-    sum+=abs((int32_t)block[i+23]-(int32_t)block2[ii+23]);
-    sum+=abs((int32_t)block[i+24]-(int32_t)block2[ii+24]);
-    sum+=abs((int32_t)block[i+25]-(int32_t)block2[ii+25]);
-    sum+=abs((int32_t)block[i+26]-(int32_t)block2[ii+26]);
-    sum+=abs((int32_t)block[i+27]-(int32_t)block2[ii+27]);
-    sum+=abs((int32_t)block[i+28]-(int32_t)block2[ii+28]);
-    sum+=abs((int32_t)block[i+29]-(int32_t)block2[ii+29]);
-    sum+=abs((int32_t)block[i+30]-(int32_t)block2[ii+30]);
-    sum+=abs((int32_t)block[i+31]-(int32_t)block2[ii+31]);
-  }
-  */
-  return sum;    
 }
 
 /**
- * \brief 
+ * \brief  Calculate SATD for NxN block of size N.
+ * 
+ * \param block1  Start of the first block.
+ * \param block2  Start of the second block.
+ * \param n       Width of the region for which SAD is calculated.
+ * 
+ * \returns       Sum of Absolute Transformed Differences (SATD)
  */
-uint32_t sad16x16(int16_t *block1, uint32_t stride1, 
+unsigned satd_nxn_16bit(int16_t *block1, int16_t *block2, unsigned n)
-                  int16_t* block2, uint32_t stride2)
 {
-  int32_t x, y;
+  cost_16bit_nxn_func sad_func = get_satd_16bit_nxn_func(n);
-    
+  return sad_func(block1, block2);
-  int32_t sum = 0;
-  int32_t iOffsetOrg = stride1 << 3;
-  int32_t iOffsetCur = stride2 << 3;
-
-  for (y = 0; y < 16; y += 8) {
-    for (x = 0; x < 16; x += 8) {
-      sum += Hadamard8x8(&block1[x], stride1, &block2[x],  stride2);
-    }
-    block1 += iOffsetOrg;
-    block2 += iOffsetCur;
-  }
-  
-  /*
-  uint32_t sum=0;
-  int32_t i,ii;
-  for(y=0;y<16;y++)
-  {
-    i = y*stride1; 
-    ii = y*stride2;
-    sum+=abs((int32_t)block[i]-(int32_t)block2[ii]);
-    sum+=abs((int32_t)block[i+1]-(int32_t)block2[ii+1]);
-    sum+=abs((int32_t)block[i+2]-(int32_t)block2[ii+2]);
-    sum+=abs((int32_t)block[i+3]-(int32_t)block2[ii+3]);
-    sum+=abs((int32_t)block[i+4]-(int32_t)block2[ii+4]);
-    sum+=abs((int32_t)block[i+5]-(int32_t)block2[ii+5]);
-    sum+=abs((int32_t)block[i+6]-(int32_t)block2[ii+6]);
-    sum+=abs((int32_t)block[i+7]-(int32_t)block2[ii+7]);
-    sum+=abs((int32_t)block[i+8]-(int32_t)block2[ii+8]);
-    sum+=abs((int32_t)block[i+9]-(int32_t)block2[ii+9]);
-    sum+=abs((int32_t)block[i+10]-(int32_t)block2[ii+10]);
-    sum+=abs((int32_t)block[i+11]-(int32_t)block2[ii+11]);
-    sum+=abs((int32_t)block[i+12]-(int32_t)block2[ii+12]);
-    sum+=abs((int32_t)block[i+13]-(int32_t)block2[ii+13]);
-    sum+=abs((int32_t)block[i+14]-(int32_t)block2[ii+14]);
-    sum+=abs((int32_t)block[i+15]-(int32_t)block2[ii+15]);
-  }  
-  */
-  return sum;    
 }
 
 /**
- * \brief 
+ * \brief Calculate SAD for NxN block of size N.
+ * 
+ * \param block1  Start of the first block.
+ * \param block2  Start of the second block.
+ * \param n       Width of the region for which SAD is calculated.
+ * 
+ * \returns       Sum of Absolute Differences
  */
-uint32_t sad8x8(int16_t *block1, uint32_t stride1, 
+unsigned sad_nxn_16bit(int16_t *block1, int16_t *block2, unsigned n)
-                int16_t* block2, uint32_t stride2)
 {
-  uint32_t sum = 0;
+  cost_16bit_nxn_func sad_func = get_sad_16bit_nxn_func(n);
-  sum = Hadamard8x8(block1, stride1, block2, stride2);
+  if (sad_func) {
-  /*
+    return sad_func(block1, block2);
-  
+  } else {
-  for(y=0;y<8;y++)
+    unsigned row, x;
-  {
+    unsigned sum = 0;
-    i = y*stride1; 
+    for (row = 0; row < n; row += n) {
-    ii = y*stride2;
+      for (x = 0; x < n; ++x) {
-    sum+=abs((int32_t)block[i]-(int32_t)block2[ii]);
+        sum += abs(block1[row + x] - block2[row + x]);
-    sum+=abs((int32_t)block[i+1]-(int32_t)block2[ii+1]);
+      }
-    sum+=abs((int32_t)block[i+2]-(int32_t)block2[ii+2]);
-    sum+=abs((int32_t)block[i+3]-(int32_t)block2[ii+3]);
-    sum+=abs((int32_t)block[i+4]-(int32_t)block2[ii+4]);
-    sum+=abs((int32_t)block[i+5]-(int32_t)block2[ii+5]);
-    sum+=abs((int32_t)block[i+6]-(int32_t)block2[ii+6]);
-    sum+=abs((int32_t)block[i+7]-(int32_t)block2[ii+7]);
     }
-  */
-
     return sum;
   }
-
-/**
- * \brief 
- */
-uint32_t sad4x4(int16_t *block1, uint32_t stride1, 
-                int16_t *block2, uint32_t stride2)
-{
-  int32_t i, ii, y;
-  uint32_t sum = 0;
-
-  for (y = 0; y < 4; y++) {
-    i = y * stride1; 
-    ii = y * stride2;
-    sum += abs((int32_t)block1[i]   - (int32_t)block2[ii]);
-    sum += abs((int32_t)block1[i+1] - (int32_t)block2[ii+1]);
-    sum += abs((int32_t)block1[i+2] - (int32_t)block2[ii+2]);
-    sum += abs((int32_t)block1[i+3] - (int32_t)block2[ii+3]);
-  }
-
-  return sum;
 }
 
 /**

src/picture.h

@@ -113,16 +113,13 @@ int picture_list_destroy(picture_list *list);
 int picture_list_add(picture_list *list, picture *pic);
 int picture_list_rem(picture_list *list, int n, int8_t destroy);
 
-uint32_t sad64x64(int16_t *block1, uint32_t stride1,
+typedef unsigned (*cost_16bit_nxn_func)(int16_t *block1, int16_t *block2);
-                  int16_t* block2, uint32_t stride2);
+
-uint32_t sad32x32(int16_t *block1, uint32_t stride1,
+cost_16bit_nxn_func get_satd_16bit_nxn_func(unsigned n);
-                  int16_t* block2, uint32_t stride2);
+cost_16bit_nxn_func get_sad_16bit_nxn_func(unsigned n);
-uint32_t sad16x16(int16_t *block1, uint32_t stride1,
+
-                  int16_t* block2, uint32_t stride2);
+unsigned satd_16bit_nxn(int16_t *block1, int16_t *block2, unsigned n);
-uint32_t sad8x8(int16_t *block1, uint32_t stride1,
+unsigned sad_16bit_nxn(int16_t *block1, int16_t *block2, unsigned n);
-                int16_t* block2, uint32_t stride2);
-uint32_t sad4x4(int16_t *block1, uint32_t stride1,
-                int16_t* block2, uint32_t stride2);
 
 unsigned calc_sad(picture *pic, picture *ref, 
                   int pic_x, int pic_y, int ref_x, int ref_y, 

src/search.c

@@ -382,8 +382,7 @@ uint32_t search_best_mode(encoder_control *encoder,
         (cost != 0 
         && (best_intra_cost != 0 && cost + lambdaCost < best_intra_cost)
         && (best_inter_cost != 0
-            && cost + lambdaCost < best_inter_cost
+            && cost + lambdaCost < best_inter_cost)))
-            && encoder->in.cur_pic->slicetype != SLICE_I)))
     {
       // Set split to 1
       best_cost = cost + lambdaCost;