vp9_encodeframe.c 71.7 KB
Newer Older
John Koleszar's avatar
John Koleszar committed
1
/*
2
 *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
John Koleszar's avatar
John Koleszar committed
3
 *
4
 *  Use of this source code is governed by a BSD-style license
5 6
 *  that can be found in the LICENSE file in the root of the source
 *  tree. An additional intellectual property rights grant can be found
7
 *  in the file PATENTS.  All contributing project authors may
8
 *  be found in the AUTHORS file in the root of the source tree.
John Koleszar's avatar
John Koleszar committed
9 10 11
 */


12
#include "./vpx_config.h"
Jim Bankoski's avatar
Jim Bankoski committed
13
#include "./vp9_rtcd.h"
14
#include "vp9/encoder/vp9_encodeframe.h"
15 16
#include "vp9/encoder/vp9_encodemb.h"
#include "vp9/encoder/vp9_encodemv.h"
17
#include "vp9/common/vp9_common.h"
18
#include "vp9/encoder/vp9_onyx_int.h"
19
#include "vp9/common/vp9_extend.h"
Yaowu Xu's avatar
Yaowu Xu committed
20
#include "vp9/common/vp9_entropy.h"
21 22
#include "vp9/common/vp9_entropymode.h"
#include "vp9/common/vp9_quant_common.h"
23 24
#include "vp9/encoder/vp9_segmentation.h"
#include "vp9/encoder/vp9_encodeintra.h"
25 26
#include "vp9/common/vp9_reconinter.h"
#include "vp9/common/vp9_invtrans.h"
27
#include "vp9/encoder/vp9_rdopt.h"
28 29 30
#include "vp9/common/vp9_findnearmv.h"
#include "vp9/common/vp9_reconintra.h"
#include "vp9/common/vp9_seg_common.h"
31
#include "vp9/common/vp9_tile_common.h"
32
#include "vp9/encoder/vp9_tokenize.h"
Yaowu Xu's avatar
Yaowu Xu committed
33
#include "./vp9_rtcd.h"
John Koleszar's avatar
John Koleszar committed
34
#include <stdio.h>
35
#include <math.h>
John Koleszar's avatar
John Koleszar committed
36 37
#include <limits.h>
#include "vpx_ports/vpx_timer.h"
38 39
#include "vp9/common/vp9_pred_common.h"
#include "vp9/common/vp9_mvref_common.h"
Paul Wilkins's avatar
Paul Wilkins committed
40

Yaowu Xu's avatar
Yaowu Xu committed
41
#define DBG_PRNT_SEGMAP 0
42

43
// #define ENC_DEBUG
44
#ifdef ENC_DEBUG
John Koleszar's avatar
John Koleszar committed
45
int enc_debug = 0;
46 47
#endif

Dmitry Kovalev's avatar
Dmitry Kovalev committed
48
void vp9_select_interp_filter_type(VP9_COMP *cpi);
49

50
static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t,
51
                              int output_enabled, int mi_row, int mi_col,
52
                              BLOCK_SIZE_TYPE bsize);
53

54
static void adjust_act_zbin(VP9_COMP *cpi, MACROBLOCK *x);
55

56 57 58
/* activity_avg must be positive, or flat regions could get a zero weight
 *  (infinite lambda), which confounds analysis.
 * This also avoids the need for divide by zero checks in
59
 *  vp9_activity_masking().
60
 */
61
#define VP9_ACTIVITY_AVG_MIN (64)
62 63 64 65 66 67

/* This is used as a reference when computing the source variance for the
 *  purposes of activity masking.
 * Eventually this should be replaced by custom no-reference routines,
 *  which will be faster.
 */
68
static const uint8_t VP9_VAR_OFFS[16] = {
John Koleszar's avatar
John Koleszar committed
69
  128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128
70 71
};

72 73

// Original activity measure from Tim T's code.
74
static unsigned int tt_activity_measure(VP9_COMP *cpi, MACROBLOCK *x) {
John Koleszar's avatar
John Koleszar committed
75 76 77 78 79 80 81 82 83
  unsigned int act;
  unsigned int sse;
  /* TODO: This could also be done over smaller areas (8x8), but that would
   *  require extensive changes elsewhere, as lambda is assumed to be fixed
   *  over an entire MB in most of the code.
   * Another option is to compute four 8x8 variances, and pick a single
   *  lambda using a non-linear combination (e.g., the smallest, or second
   *  smallest, etc.).
   */
John Koleszar's avatar
John Koleszar committed
84 85
  act = vp9_variance16x16(x->plane[0].src.buf, x->plane[0].src.stride,
                          VP9_VAR_OFFS, 0, &sse);
Dmitry Kovalev's avatar
Dmitry Kovalev committed
86
  act <<= 4;
John Koleszar's avatar
John Koleszar committed
87 88 89 90 91 92

  /* If the region is flat, lower the activity some more. */
  if (act < 8 << 12)
    act = act < 5 << 12 ? act : 5 << 12;

  return act;
93 94
}

95
// Stub for alternative experimental activity measures.
96
static unsigned int alt_activity_measure(VP9_COMP *cpi,
John Koleszar's avatar
John Koleszar committed
97
                                         MACROBLOCK *x, int use_dc_pred) {
98
  return vp9_encode_intra(cpi, x, use_dc_pred);
99 100
}

Jim Bankoski's avatar
Jim Bankoski committed
101 102
DECLARE_ALIGNED(16, static const uint8_t, vp9_64x64_zeros[64*64]) = { 0 };

103 104 105

// Measure the activity of the current macroblock
// What we measure here is TBD so abstracted to this function
106
#define ALT_ACT_MEASURE 1
107
static unsigned int mb_activity_measure(VP9_COMP *cpi, MACROBLOCK *x,
John Koleszar's avatar
John Koleszar committed
108 109
                                        int mb_row, int mb_col) {
  unsigned int mb_activity;
110

John Koleszar's avatar
John Koleszar committed
111 112
  if (ALT_ACT_MEASURE) {
    int use_dc_pred = (mb_col || mb_row) && (!mb_col || !mb_row);
113

John Koleszar's avatar
John Koleszar committed
114 115 116 117 118 119
    // Or use and alternative.
    mb_activity = alt_activity_measure(cpi, x, use_dc_pred);
  } else {
    // Original activity measure from Tim T's code.
    mb_activity = tt_activity_measure(cpi, x);
  }
120

121 122
  if (mb_activity < VP9_ACTIVITY_AVG_MIN)
    mb_activity = VP9_ACTIVITY_AVG_MIN;
123

John Koleszar's avatar
John Koleszar committed
124
  return mb_activity;
125 126 127
}

// Calculate an "average" mb activity value for the frame
128
#define ACT_MEDIAN 0
129
static void calc_av_activity(VP9_COMP *cpi, int64_t activity_sum) {
130
#if ACT_MEDIAN
John Koleszar's avatar
John Koleszar committed
131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159
  // Find median: Simple n^2 algorithm for experimentation
  {
    unsigned int median;
    unsigned int i, j;
    unsigned int *sortlist;
    unsigned int tmp;

    // Create a list to sort to
    CHECK_MEM_ERROR(sortlist,
    vpx_calloc(sizeof(unsigned int),
    cpi->common.MBs));

    // Copy map to sort list
    vpx_memcpy(sortlist, cpi->mb_activity_map,
    sizeof(unsigned int) * cpi->common.MBs);


    // Ripple each value down to its correct position
    for (i = 1; i < cpi->common.MBs; i ++) {
      for (j = i; j > 0; j --) {
        if (sortlist[j] < sortlist[j - 1]) {
          // Swap values
          tmp = sortlist[j - 1];
          sortlist[j - 1] = sortlist[j];
          sortlist[j] = tmp;
        } else
          break;
      }
    }
160

John Koleszar's avatar
John Koleszar committed
161 162 163
    // Even number MBs so estimate median as mean of two either side.
    median = (1 + sortlist[cpi->common.MBs >> 1] +
              sortlist[(cpi->common.MBs >> 1) + 1]) >> 1;
164

John Koleszar's avatar
John Koleszar committed
165
    cpi->activity_avg = median;
166

John Koleszar's avatar
John Koleszar committed
167 168
    vpx_free(sortlist);
  }
169
#else
John Koleszar's avatar
John Koleszar committed
170 171
  // Simple mean for now
  cpi->activity_avg = (unsigned int)(activity_sum / cpi->common.MBs);
172 173
#endif

174 175
  if (cpi->activity_avg < VP9_ACTIVITY_AVG_MIN)
    cpi->activity_avg = VP9_ACTIVITY_AVG_MIN;
176

John Koleszar's avatar
John Koleszar committed
177 178 179
  // Experimental code: return fixed value normalized for several clips
  if (ALT_ACT_MEASURE)
    cpi->activity_avg = 100000;
180 181
}

182
#define USE_ACT_INDEX   0
183
#define OUTPUT_NORM_ACT_STATS   0
184 185

#if USE_ACT_INDEX
186
// Calculate an activity index for each mb
187 188
static void calc_activity_index(VP9_COMP *cpi, MACROBLOCK *x) {
  VP9_COMMON *const cm = &cpi->common;
John Koleszar's avatar
John Koleszar committed
189
  int mb_row, mb_col;
190

John Koleszar's avatar
John Koleszar committed
191 192 193
  int64_t act;
  int64_t a;
  int64_t b;
194 195

#if OUTPUT_NORM_ACT_STATS
John Koleszar's avatar
John Koleszar committed
196 197
  FILE *f = fopen("norm_act.stt", "a");
  fprintf(f, "\n%12d\n", cpi->activity_avg);
198 199
#endif

John Koleszar's avatar
John Koleszar committed
200 201
  // Reset pointers to start of activity map
  x->mb_activity_ptr = cpi->mb_activity_map;
202

John Koleszar's avatar
John Koleszar committed
203 204 205 206 207 208
  // Calculate normalized mb activity number.
  for (mb_row = 0; mb_row < cm->mb_rows; mb_row++) {
    // for each macroblock col in image
    for (mb_col = 0; mb_col < cm->mb_cols; mb_col++) {
      // Read activity from the map
      act = *(x->mb_activity_ptr);
209

John Koleszar's avatar
John Koleszar committed
210 211 212
      // Calculate a normalized activity number
      a = act + 4 * cpi->activity_avg;
      b = 4 * act + cpi->activity_avg;
213

John Koleszar's avatar
John Koleszar committed
214 215 216 217
      if (b >= a)
        *(x->activity_ptr) = (int)((b + (a >> 1)) / a) - 1;
      else
        *(x->activity_ptr) = 1 - (int)((a + (b >> 1)) / b);
218 219

#if OUTPUT_NORM_ACT_STATS
John Koleszar's avatar
John Koleszar committed
220
      fprintf(f, " %6d", *(x->mb_activity_ptr));
221
#endif
John Koleszar's avatar
John Koleszar committed
222 223 224
      // Increment activity map pointers
      x->mb_activity_ptr++;
    }
225 226

#if OUTPUT_NORM_ACT_STATS
John Koleszar's avatar
John Koleszar committed
227
    fprintf(f, "\n");
228 229
#endif

John Koleszar's avatar
John Koleszar committed
230
  }
231 232

#if OUTPUT_NORM_ACT_STATS
John Koleszar's avatar
John Koleszar committed
233
  fclose(f);
234 235 236
#endif

}
237
#endif
238 239 240

// Loop through all MBs. Note activity of each, average activity and
// calculate a normalized activity for each
241
static void build_activity_map(VP9_COMP *cpi) {
John Koleszar's avatar
John Koleszar committed
242
  MACROBLOCK *const x = &cpi->mb;
John Koleszar's avatar
John Koleszar committed
243
  MACROBLOCKD *xd = &x->e_mbd;
244
  VP9_COMMON *const cm = &cpi->common;
245

246
#if ALT_ACT_MEASURE
John Koleszar's avatar
John Koleszar committed
247 248 249
  YV12_BUFFER_CONFIG *new_yv12 = &cm->yv12_fb[cm->new_fb_idx];
  int recon_yoffset;
  int recon_y_stride = new_yv12->y_stride;
250 251
#endif

John Koleszar's avatar
John Koleszar committed
252 253 254
  int mb_row, mb_col;
  unsigned int mb_activity;
  int64_t activity_sum = 0;
255

256 257
  x->mb_activity_ptr = cpi->mb_activity_map;

John Koleszar's avatar
John Koleszar committed
258 259
  // for each macroblock row in image
  for (mb_row = 0; mb_row < cm->mb_rows; mb_row++) {
260
#if ALT_ACT_MEASURE
John Koleszar's avatar
John Koleszar committed
261 262 263
    // reset above block coeffs
    xd->up_available = (mb_row != 0);
    recon_yoffset = (mb_row * recon_y_stride * 16);
264
#endif
John Koleszar's avatar
John Koleszar committed
265 266
    // for each macroblock col in image
    for (mb_col = 0; mb_col < cm->mb_cols; mb_col++) {
267
#if ALT_ACT_MEASURE
268
      xd->plane[0].dst.buf = new_yv12->y_buffer + recon_yoffset;
John Koleszar's avatar
John Koleszar committed
269 270
      xd->left_available = (mb_col != 0);
      recon_yoffset += 16;
271
#endif
272

John Koleszar's avatar
John Koleszar committed
273 274
      // measure activity
      mb_activity = mb_activity_measure(cpi, x, mb_row, mb_col);
275

John Koleszar's avatar
John Koleszar committed
276 277
      // Keep frame sum
      activity_sum += mb_activity;
278

John Koleszar's avatar
John Koleszar committed
279 280
      // Store MB level activity details.
      *x->mb_activity_ptr = mb_activity;
281

John Koleszar's avatar
John Koleszar committed
282 283
      // Increment activity map pointer
      x->mb_activity_ptr++;
284

John Koleszar's avatar
John Koleszar committed
285
      // adjust to the next column of source macroblocks
John Koleszar's avatar
John Koleszar committed
286
      x->plane[0].src.buf += 16;
John Koleszar's avatar
John Koleszar committed
287
    }
288

289

John Koleszar's avatar
John Koleszar committed
290
    // adjust to the next row of mbs
John Koleszar's avatar
John Koleszar committed
291
    x->plane[0].src.buf += 16 * x->plane[0].src.stride - 16 * cm->mb_cols;
John Koleszar's avatar
John Koleszar committed
292
  }
293

John Koleszar's avatar
John Koleszar committed
294 295
  // Calculate an "average" MB activity
  calc_av_activity(cpi, activity_sum);
296

297
#if USE_ACT_INDEX
John Koleszar's avatar
John Koleszar committed
298 299
  // Calculate an activity index number of each mb
  calc_activity_index(cpi, x);
300 301
#endif

302 303
}

304
// Macroblock activity masking
305
void vp9_activity_masking(VP9_COMP *cpi, MACROBLOCK *x) {
306
#if USE_ACT_INDEX
John Koleszar's avatar
John Koleszar committed
307 308 309
  x->rdmult += *(x->mb_activity_ptr) * (x->rdmult >> 2);
  x->errorperbit = x->rdmult * 100 / (110 * x->rddiv);
  x->errorperbit += (x->errorperbit == 0);
310
#else
John Koleszar's avatar
John Koleszar committed
311 312 313
  int64_t a;
  int64_t b;
  int64_t act = *(x->mb_activity_ptr);
314

John Koleszar's avatar
John Koleszar committed
315 316 317
  // Apply the masking to the RD multiplier.
  a = act + (2 * cpi->activity_avg);
  b = (2 * act) + cpi->activity_avg;
318

John Koleszar's avatar
John Koleszar committed
319 320 321
  x->rdmult = (unsigned int)(((int64_t)x->rdmult * b + (a >> 1)) / a);
  x->errorperbit = x->rdmult * 100 / (110 * x->rddiv);
  x->errorperbit += (x->errorperbit == 0);
322
#endif
323

John Koleszar's avatar
John Koleszar committed
324 325
  // Activity based Zbin adjustment
  adjust_act_zbin(cpi, x);
326
}
John Koleszar's avatar
John Koleszar committed
327

328
static void update_state(VP9_COMP *cpi,
329 330
                         PICK_MODE_CONTEXT *ctx,
                         BLOCK_SIZE_TYPE bsize,
Ronald S. Bultje's avatar
Ronald S. Bultje committed
331 332
                         int output_enabled) {
  int i, x_idx, y;
333 334
  MACROBLOCK *const x = &cpi->mb;
  MACROBLOCKD *const xd = &x->e_mbd;
John Koleszar's avatar
John Koleszar committed
335
  MODE_INFO *mi = &ctx->mic;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
336
  MB_MODE_INFO *const mbmi = &xd->mode_info_context->mbmi;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
337 338 339
#if CONFIG_DEBUG || CONFIG_INTERNAL_STATS
  MB_PREDICTION_MODE mb_mode = mi->mbmi.mode;
#endif
John Koleszar's avatar
John Koleszar committed
340
  int mb_mode_index = ctx->best_mode_index;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
341
  const int mis = cpi->common.mode_info_stride;
342
  const int bh = 1 << mi_height_log2(bsize), bw = 1 << mi_width_log2(bsize);
Adrian Grange's avatar
Adrian Grange committed
343 344

#if CONFIG_DEBUG
John Koleszar's avatar
John Koleszar committed
345 346
  assert(mb_mode < MB_MODE_COUNT);
  assert(mb_mode_index < MAX_MODES);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
347 348
  assert(mi->mbmi.ref_frame[0] < MAX_REF_FRAMES);
  assert(mi->mbmi.ref_frame[1] < MAX_REF_FRAMES);
Adrian Grange's avatar
Adrian Grange committed
349 350
#endif

351
  assert(mi->mbmi.sb_type == bsize);
John Koleszar's avatar
John Koleszar committed
352 353
  // Restore the coding context of the MB to that that was in place
  // when the mode was picked for it
354 355
  for (y = 0; y < bh; y++) {
    for (x_idx = 0; x_idx < bw; x_idx++) {
356 357
      if ((xd->mb_to_right_edge >> (3 + LOG2_MI_SIZE)) + bw > x_idx &&
          (xd->mb_to_bottom_edge >> (3 + LOG2_MI_SIZE)) + bh > y) {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
358
        MODE_INFO *mi_addr = xd->mode_info_context + x_idx + y * mis;
359
        *mi_addr = *mi;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
360
      }
Ronald S. Bultje's avatar
Ronald S. Bultje committed
361
    }
Ronald S. Bultje's avatar
Ronald S. Bultje committed
362
  }
363
  if (bsize < BLOCK_SIZE_SB32X32) {
364 365
    if (bsize < BLOCK_SIZE_MB16X16)
      ctx->txfm_rd_diff[ALLOW_16X16] = ctx->txfm_rd_diff[ALLOW_8X8];
366
    ctx->txfm_rd_diff[ALLOW_32X32] = ctx->txfm_rd_diff[ALLOW_16X16];
Ronald S. Bultje's avatar
Ronald S. Bultje committed
367
  }
Adrian Grange's avatar
Adrian Grange committed
368

Ronald S. Bultje's avatar
Ronald S. Bultje committed
369
  if (mbmi->ref_frame[0] != INTRA_FRAME && mbmi->sb_type < BLOCK_SIZE_SB8X8) {
370 371 372
    *x->partition_info = ctx->partition_info;
    mbmi->mv[0].as_int = x->partition_info->bmi[3].mv.as_int;
    mbmi->mv[1].as_int = x->partition_info->bmi[3].second_mv.as_int;
John Koleszar's avatar
John Koleszar committed
373 374
  }

375
  x->skip = ctx->skip;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
376 377 378
  if (!output_enabled)
    return;

Ronald S. Bultje's avatar
Ronald S. Bultje committed
379 380 381
  if (!vp9_segfeature_active(xd, mbmi->segment_id, SEG_LVL_SKIP)) {
    for (i = 0; i < NB_TXFM_MODES; i++) {
      cpi->rd_tx_select_diff[i] += ctx->txfm_rd_diff[i];
382
    }
383 384
  }

John Koleszar's avatar
John Koleszar committed
385 386
  if (cpi->common.frame_type == KEY_FRAME) {
    // Restore the coding modes to that held in the coding context
Yaowu Xu's avatar
Yaowu Xu committed
387
    // if (mb_mode == I4X4_PRED)
John Koleszar's avatar
John Koleszar committed
388 389 390 391 392 393
    //    for (i = 0; i < 16; i++)
    //    {
    //        xd->block[i].bmi.as_mode =
    //                          xd->mode_info_context->bmi[i].as_mode;
    //        assert(xd->mode_info_context->bmi[i].as_mode < MB_MODE_COUNT);
    //    }
394
#if CONFIG_INTERNAL_STATS
John Koleszar's avatar
John Koleszar committed
395 396 397 398 399 400 401 402 403 404 405
    static const int kf_mode_index[] = {
      THR_DC /*DC_PRED*/,
      THR_V_PRED /*V_PRED*/,
      THR_H_PRED /*H_PRED*/,
      THR_D45_PRED /*D45_PRED*/,
      THR_D135_PRED /*D135_PRED*/,
      THR_D117_PRED /*D117_PRED*/,
      THR_D153_PRED /*D153_PRED*/,
      THR_D27_PRED /*D27_PRED*/,
      THR_D63_PRED /*D63_PRED*/,
      THR_TM /*TM_PRED*/,
Yaowu Xu's avatar
Yaowu Xu committed
406
      THR_B_PRED /*I4X4_PRED*/,
John Koleszar's avatar
John Koleszar committed
407 408
    };
    cpi->mode_chosen_counts[kf_mode_index[mb_mode]]++;
409
#endif
John Koleszar's avatar
John Koleszar committed
410 411 412 413 414 415 416
  } else {
    /*
            // Reduce the activation RD thresholds for the best choice mode
            if ((cpi->rd_baseline_thresh[mb_mode_index] > 0) &&
                (cpi->rd_baseline_thresh[mb_mode_index] < (INT_MAX >> 2)))
            {
                int best_adjustment = (cpi->rd_thresh_mult[mb_mode_index] >> 2);
Adrian Grange's avatar
Adrian Grange committed
417

John Koleszar's avatar
John Koleszar committed
418 419 420 421 422 423 424 425
                cpi->rd_thresh_mult[mb_mode_index] =
                        (cpi->rd_thresh_mult[mb_mode_index]
                         >= (MIN_THRESHMULT + best_adjustment)) ?
                                cpi->rd_thresh_mult[mb_mode_index] - best_adjustment :
                                MIN_THRESHMULT;
                cpi->rd_threshes[mb_mode_index] =
                        (cpi->rd_baseline_thresh[mb_mode_index] >> 7)
                        * cpi->rd_thresh_mult[mb_mode_index];
Adrian Grange's avatar
Adrian Grange committed
426

John Koleszar's avatar
John Koleszar committed
427 428 429 430
            }
    */
    // Note how often each mode chosen as best
    cpi->mode_chosen_counts[mb_mode_index]++;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
431
    if (mbmi->ref_frame[0] != INTRA_FRAME &&
Ronald S. Bultje's avatar
Ronald S. Bultje committed
432
        (mbmi->sb_type < BLOCK_SIZE_SB8X8 || mbmi->mode == NEWMV)) {
Deb Mukherjee's avatar
Deb Mukherjee committed
433
      int_mv best_mv, best_second_mv;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
434 435
      const MV_REFERENCE_FRAME rf1 = mbmi->ref_frame[0];
      const MV_REFERENCE_FRAME rf2 = mbmi->ref_frame[1];
Deb Mukherjee's avatar
Deb Mukherjee committed
436 437 438
      best_mv.as_int = ctx->best_ref_mv.as_int;
      best_second_mv.as_int = ctx->second_best_ref_mv.as_int;
      if (mbmi->mode == NEWMV) {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
439 440
        best_mv.as_int = mbmi->ref_mvs[rf1][0].as_int;
        best_second_mv.as_int = mbmi->ref_mvs[rf2][0].as_int;
Deb Mukherjee's avatar
Deb Mukherjee committed
441 442 443 444
      }
      mbmi->best_mv.as_int = best_mv.as_int;
      mbmi->best_second_mv.as_int = best_second_mv.as_int;
      vp9_update_nmv_count(cpi, x, &best_mv, &best_second_mv);
445
    }
Jingning Han's avatar
Jingning Han committed
446

447 448 449 450
    if (bsize > BLOCK_SIZE_SB8X8 && mbmi->mode == NEWMV) {
      int i, j;
      for (j = 0; j < bh; ++j)
        for (i = 0; i < bw; ++i)
Yaowu Xu's avatar
Yaowu Xu committed
451 452
          if ((xd->mb_to_right_edge >> (3 + LOG2_MI_SIZE)) + bw > i &&
              (xd->mb_to_bottom_edge >> (3 + LOG2_MI_SIZE)) + bh > j)
453
            xd->mode_info_context[mis * j + i].mbmi = *mbmi;
Deb Mukherjee's avatar
Deb Mukherjee committed
454
    }
455

456
    if (cpi->common.mcomp_filter_type == SWITCHABLE &&
457
        is_inter_mode(mbmi->mode)) {
458
      ++cpi->common.fc.switchable_interp_count
459 460 461
          [vp9_get_pred_context(&cpi->common, xd, PRED_SWITCHABLE_INTERP)]
          [vp9_switchable_interp_map[mbmi->interp_filter]];
    }
Adrian Grange's avatar
Adrian Grange committed
462

463 464 465
    cpi->rd_comp_pred_diff[SINGLE_PREDICTION_ONLY] += ctx->single_pred_diff;
    cpi->rd_comp_pred_diff[COMP_PREDICTION_ONLY]   += ctx->comp_pred_diff;
    cpi->rd_comp_pred_diff[HYBRID_PREDICTION]      += ctx->hybrid_pred_diff;
John Koleszar's avatar
John Koleszar committed
466
  }
Adrian Grange's avatar
Adrian Grange committed
467 468
}

469
static unsigned find_seg_id(VP9_COMMON *cm, uint8_t *buf, BLOCK_SIZE_TYPE bsize,
Ronald S. Bultje's avatar
Ronald S. Bultje committed
470
                            int start_y, int height, int start_x, int width) {
471
  const int bw = 1 << mi_width_log2(bsize), bh = 1 << mi_height_log2(bsize);
472 473
  const int end_x = MIN(start_x + bw, width);
  const int end_y = MIN(start_y + bh, height);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
474 475 476 477
  int x, y;
  unsigned seg_id = -1;

  buf += width * start_y;
478
  assert(start_y < cm->mi_rows && start_x < cm->cur_tile_mi_col_end);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
479 480 481 482 483 484 485 486 487
  for (y = start_y; y < end_y; y++, buf += width) {
    for (x = start_x; x < end_x; x++) {
      seg_id = MIN(seg_id, buf[x]);
    }
  }

  return seg_id;
}

John Koleszar's avatar
John Koleszar committed
488 489 490
void vp9_setup_src_planes(MACROBLOCK *x,
                          const YV12_BUFFER_CONFIG *src,
                          int mb_row, int mb_col) {
491 492 493 494 495 496 497 498 499 500 501 502 503
  uint8_t *buffers[4] = {src->y_buffer, src->u_buffer, src->v_buffer,
                         src->alpha_buffer};
  int strides[4] = {src->y_stride, src->uv_stride, src->uv_stride,
                    src->alpha_stride};
  int i;

  for (i = 0; i < MAX_MB_PLANE; i++) {
    setup_pred_plane(&x->plane[i].src,
                     buffers[i], strides[i],
                     mb_row, mb_col, NULL,
                     x->e_mbd.plane[i].subsampling_x,
                     x->e_mbd.plane[i].subsampling_y);
  }
John Koleszar's avatar
John Koleszar committed
504 505
}

Ronald S. Bultje's avatar
Ronald S. Bultje committed
506
static void set_offsets(VP9_COMP *cpi,
507
                        int mi_row, int mi_col, BLOCK_SIZE_TYPE bsize) {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
508 509 510 511 512
  MACROBLOCK *const x = &cpi->mb;
  VP9_COMMON *const cm = &cpi->common;
  MACROBLOCKD *const xd = &x->e_mbd;
  MB_MODE_INFO *mbmi;
  const int dst_fb_idx = cm->new_fb_idx;
513 514
  const int idx_str = xd->mode_info_stride * mi_row + mi_col;
  const int bw = 1 << mi_width_log2(bsize), bh = 1 << mi_height_log2(bsize);
Jingning Han's avatar
Jingning Han committed
515 516
  const int mb_row = mi_row >> 1;
  const int mb_col = mi_col >> 1;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
517
  const int idx_map = mb_row * cm->mb_cols + mb_col;
518
  int i;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
519 520

  // entropy context structures
521 522
  for (i = 0; i < MAX_MB_PLANE; i++) {
    xd->plane[i].above_context = cm->above_context[i] +
Jingning Han's avatar
Jingning Han committed
523
        (mi_col * 2 >>  xd->plane[i].subsampling_x);
524
    xd->plane[i].left_context = cm->left_context[i] +
Jingning Han's avatar
Jingning Han committed
525
        (((mi_row * 2) & 15) >> xd->plane[i].subsampling_y);
526
  }
Ronald S. Bultje's avatar
Ronald S. Bultje committed
527

528
  // partition contexts
529
  set_partition_seg_context(cm, xd, mi_row, mi_col);
530

Ronald S. Bultje's avatar
Ronald S. Bultje committed
531 532 533 534 535 536 537 538
  // Activity map pointer
  x->mb_activity_ptr = &cpi->mb_activity_map[idx_map];
  x->active_ptr = cpi->active_map + idx_map;

  /* pointers to mode info contexts */
  x->partition_info          = x->pi + idx_str;
  xd->mode_info_context      = cm->mi + idx_str;
  mbmi = &xd->mode_info_context->mbmi;
539 540 541 542
  // Special case: if prev_mi is NULL, the previous mode info context
  // cannot be used.
  xd->prev_mode_info_context = cm->prev_mi ?
                                 cm->prev_mi + idx_str : NULL;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
543 544

  // Set up destination pointers
545
  setup_dst_planes(xd, &cm->yv12_fb[dst_fb_idx], mi_row, mi_col);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
546 547 548

  /* Set up limit values for MV components to prevent them from
   * extending beyond the UMV borders assuming 16x16 block size */
549 550 551 552 553 554
  x->mv_row_min = -((mi_row * MI_SIZE) + VP9BORDERINPIXELS - VP9_INTERP_EXTEND);
  x->mv_col_min = -((mi_col * MI_SIZE) + VP9BORDERINPIXELS - VP9_INTERP_EXTEND);
  x->mv_row_max = ((cm->mi_rows - mi_row) * MI_SIZE +
                   (VP9BORDERINPIXELS - MI_SIZE * bh - VP9_INTERP_EXTEND));
  x->mv_col_max = ((cm->mi_cols - mi_col) * MI_SIZE +
                   (VP9BORDERINPIXELS - MI_SIZE * bw - VP9_INTERP_EXTEND));
Ronald S. Bultje's avatar
Ronald S. Bultje committed
555 556

  // Set up distance of MB to edge of frame in 1/8th pel units
557 558
  assert(!(mi_col & (bw - 1)) && !(mi_row & (bh - 1)));
  set_mi_row_col(cm, xd, mi_row, bh, mi_col, bw);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
559 560

  /* set up source buffers */
561
  vp9_setup_src_planes(x, cpi->Source, mi_row, mi_col);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
562 563 564 565 566 567 568

  /* R/D setup */
  x->rddiv = cpi->RDDIV;
  x->rdmult = cpi->RDMULT;

  /* segment ID */
  if (xd->segmentation_enabled) {
569 570
    uint8_t *map = xd->update_mb_segmentation_map ? cpi->segmentation_map
                                                  : cm->last_frame_seg_map;
571
    mbmi->segment_id = find_seg_id(cm, map, bsize, mi_row,
572 573
                                   cm->mi_rows, mi_col, cm->mi_cols);

574
    assert(mbmi->segment_id <= (MAX_MB_SEGMENTS-1));
Ronald S. Bultje's avatar
Ronald S. Bultje committed
575 576 577 578
    vp9_mb_init_quantizer(cpi, x);

    if (xd->segmentation_enabled && cpi->seg0_cnt > 0 &&
        !vp9_segfeature_active(xd, 0, SEG_LVL_REF_FRAME) &&
579
        vp9_segfeature_active(xd, 1, SEG_LVL_REF_FRAME)) {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
580 581 582 583 584 585
      cpi->seg0_progress = (cpi->seg0_idx << 16) / cpi->seg0_cnt;
    } else {
      const int y = mb_row & ~3;
      const int x = mb_col & ~3;
      const int p16 = ((mb_row & 1) << 1) +  (mb_col & 1);
      const int p32 = ((mb_row & 2) << 2) + ((mb_col & 2) << 1);
586
      const int tile_progress =
Jingning Han's avatar
Jingning Han committed
587
          cm->cur_tile_mi_col_start * cm->mb_rows >> 1;
588
      const int mb_cols =
Jingning Han's avatar
Jingning Han committed
589
          (cm->cur_tile_mi_col_end - cm->cur_tile_mi_col_start) >> 1;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
590 591

      cpi->seg0_progress =
592
          ((y * mb_cols + x * 4 + p32 + p16 + tile_progress) << 16) / cm->MBs;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
593 594 595 596 597 598
    }
  } else {
    mbmi->segment_id = 0;
  }
}

599
static void pick_sb_modes(VP9_COMP *cpi, int mi_row, int mi_col,
600 601
                          TOKENEXTRA **tp, int *totalrate, int *totaldist,
                          BLOCK_SIZE_TYPE bsize, PICK_MODE_CONTEXT *ctx) {
602 603 604
  VP9_COMMON *const cm = &cpi->common;
  MACROBLOCK *const x = &cpi->mb;
  MACROBLOCKD *const xd = &x->e_mbd;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
605

606 607 608 609
  if (bsize < BLOCK_SIZE_SB8X8)
    if (xd->ab_index != 0)
      return;

610
  set_offsets(cpi, mi_row, mi_col, bsize);
611
  xd->mode_info_context->mbmi.sb_type = bsize;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
612
  if (cpi->oxcf.tuning == VP8_TUNE_SSIM)
613
    vp9_activity_masking(cpi, x);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
614 615 616

  /* Find best coding mode & reconstruct the MB so it is available
   * as a predictor for MBs that follow in the SB */
Ronald S. Bultje's avatar
Ronald S. Bultje committed
617
  if (cm->frame_type == KEY_FRAME) {
618
    vp9_rd_pick_intra_mode_sb(cpi, x, totalrate, totaldist, bsize, ctx);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
619
  } else {
620
    vp9_rd_pick_inter_mode_sb(cpi, x, mi_row, mi_col, totalrate, totaldist,
621
                              bsize, ctx);
Ronald S. Bultje's avatar
Ronald S. Bultje committed
622 623
  }
}
Adrian Grange's avatar
Adrian Grange committed
624

625
static void update_stats(VP9_COMP *cpi, int mi_row, int mi_col) {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
626 627 628 629 630
  VP9_COMMON *const cm = &cpi->common;
  MACROBLOCK *const x = &cpi->mb;
  MACROBLOCKD *const xd = &x->e_mbd;
  MODE_INFO *mi = xd->mode_info_context;
  MB_MODE_INFO *const mbmi = &mi->mbmi;
Adrian Grange's avatar
Adrian Grange committed
631

Paul Wilkins's avatar
Paul Wilkins committed
632
  if (cm->frame_type != KEY_FRAME) {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
633
    int segment_id, seg_ref_active;
John Koleszar's avatar
John Koleszar committed
634

635 636 637 638 639 640 641
    segment_id = mbmi->segment_id;
    seg_ref_active = vp9_segfeature_active(xd, segment_id,
                                           SEG_LVL_REF_FRAME);

    if (!seg_ref_active)
      cpi->intra_inter_count[vp9_get_pred_context(cm, xd, PRED_INTRA_INTER)]
                            [mbmi->ref_frame[0] > INTRA_FRAME]++;
Adrian Grange's avatar
Adrian Grange committed
642

643 644 645 646
    // If the segment reference feature is enabled we have only a single
    // reference frame allowed for the segment so exclude it from
    // the reference frame counts used to work out probabilities.
    if ((mbmi->ref_frame[0] > INTRA_FRAME) && !seg_ref_active) {
Ronald S. Bultje's avatar
Ronald S. Bultje committed
647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662
      if (cm->comp_pred_mode == HYBRID_PREDICTION)
        cpi->comp_inter_count[vp9_get_pred_context(cm, xd,
                                                   PRED_COMP_INTER_INTER)]
                             [mbmi->ref_frame[1] > INTRA_FRAME]++;

      if (mbmi->ref_frame[1] > INTRA_FRAME) {
        cpi->comp_ref_count[vp9_get_pred_context(cm, xd, PRED_COMP_REF_P)]
                           [mbmi->ref_frame[0] == GOLDEN_FRAME]++;
      } else {
        cpi->single_ref_count[vp9_get_pred_context(cm, xd, PRED_SINGLE_REF_P1)]
                             [0][mbmi->ref_frame[0] != LAST_FRAME]++;
        if (mbmi->ref_frame[0] != LAST_FRAME)
          cpi->single_ref_count[vp9_get_pred_context(cm, xd,
                                                     PRED_SINGLE_REF_P2)]
                               [1][mbmi->ref_frame[0] != GOLDEN_FRAME]++;
      }
Ronald S. Bultje's avatar
Ronald S. Bultje committed
663
    }
Ronald S. Bultje's avatar
Ronald S. Bultje committed
664
    // Count of last ref frame 0,0 usage
Ronald S. Bultje's avatar
Ronald S. Bultje committed
665
    if ((mbmi->mode == ZEROMV) && (mbmi->ref_frame[0] == LAST_FRAME))
Ronald S. Bultje's avatar
Ronald S. Bultje committed
666 667 668
      cpi->inter_zz_count++;
  }
}
John Koleszar's avatar
John Koleszar committed
669

670 671 672
// TODO(jingning): the variables used here are little complicated. need further
// refactoring on organizing the the temporary buffers, when recursive
// partition down to 4x4 block size is enabled.
673 674 675
static PICK_MODE_CONTEXT *get_block_context(MACROBLOCK *x,
                                            BLOCK_SIZE_TYPE bsize) {
  MACROBLOCKD *const xd = &x->e_mbd;
Ronald S. Bultje's avatar
Ronald S. Bultje committed
676

677 678 679 680 681 682 683 684 685 686 687 688 689 690 691
  switch (bsize) {
    case BLOCK_SIZE_SB64X64:
      return &x->sb64_context;
    case BLOCK_SIZE_SB64X32:
      return &x->sb64x32_context[xd->sb_index];
    case BLOCK_SIZE_SB32X64:
      return &x->sb32x64_context[xd->sb_index];
    case BLOCK_SIZE_SB32X32:
      return &x->sb32_context[xd->sb_index];
    case BLOCK_SIZE_SB32X16:
      return &x->sb32x16_context[xd->sb_index][xd->mb_index];
    case BLOCK_SIZE_SB16X32:
      return &x->sb16x32_context[xd->sb_index][xd->mb_index];
    case BLOCK_SIZE_MB16X16:
      return &x->mb_context[xd->sb_index][xd->mb_index];
692 693 694 695 696
    case BLOCK_SIZE_SB16X8:
      return &x->sb16x8_context[xd->sb_index][xd->mb_index][xd->b_index];
    case BLOCK_SIZE_SB8X16:
      return &x->sb8x16_context[xd->sb_index][xd->mb_index][xd->b_index];
    case BLOCK_SIZE_SB8X8:
697 698 699 700 701 702 703
      return &x->sb8x8_context[xd->sb_index][xd->mb_index][xd->b_index];
    case BLOCK_SIZE_SB8X4:
      return &x->sb8x4_context[xd->sb_index][xd->mb_index][xd->b_index];
    case BLOCK_SIZE_SB4X8:
      return &x->sb4x8_context[xd->sb_index][xd->mb_index][xd->b_index];
    case BLOCK_SIZE_AB4X4:
      return &x->ab4x4_context[xd->sb_index][xd->mb_index][xd->b_index];
704 705 706 707 708
    default:
      assert(0);
      return NULL;
  }
}
Ronald S. Bultje's avatar
Ronald S. Bultje committed
709

710 711 712 713 714 715 716 717 718 719
static BLOCK_SIZE_TYPE *get_sb_partitioning(MACROBLOCK *x,
                                            BLOCK_SIZE_TYPE bsize) {
  MACROBLOCKD *xd = &x->e_mbd;
  switch (bsize) {
    case BLOCK_SIZE_SB64X64:
      return &x->sb64_partitioning;
    case BLOCK_SIZE_SB32X32:
      return &x->sb_partitioning[xd->sb_index];
    case BLOCK_SIZE_MB16X16:
      return &x->mb_partitioning[xd->sb_index][xd->mb_index];
720 721
    case BLOCK_SIZE_SB8X8:
      return &x->b_partitioning[xd->sb_index][xd->mb_index][xd->b_index];
722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756
    default:
      assert(0);
      return NULL;
  }
}

static void restore_context(VP9_COMP *cpi, int mi_row, int mi_col,
                            ENTROPY_CONTEXT a[16 * MAX_MB_PLANE],
                            ENTROPY_CONTEXT l[16 * MAX_MB_PLANE],
                            PARTITION_CONTEXT sa[8],
                            PARTITION_CONTEXT sl[8],
                            BLOCK_SIZE_TYPE bsize) {
  VP9_COMMON *const cm = &cpi->common;
  MACROBLOCK *const x = &cpi->mb;
  MACROBLOCKD *const xd = &x->e_mbd;
  int p;
  int bwl = b_width_log2(bsize), bw = 1 << bwl;
  int bhl = b_height_log2(bsize), bh = 1 << bhl;
  int mwl = mi_width_log2(bsize), mw = 1 << mwl;
  int mhl = mi_height_log2(bsize), mh = 1 << mhl;
  for (p = 0; p < MAX_MB_PLANE; p++) {
    vpx_memcpy(cm->above_context[p] +
               ((mi_col * 2) >> xd->plane[p].subsampling_x),
               a + bw * p,
               sizeof(ENTROPY_CONTEXT) * bw >> xd->plane[p].subsampling_x);
    vpx_memcpy(cm->left_context[p] +
               ((mi_row & MI_MASK) * 2 >> xd->plane[p].subsampling_y),
               l + bh * p,
               sizeof(ENTROPY_CONTEXT) * bh >> xd->plane[p].subsampling_y);
  }
  vpx_memcpy(cm->above_seg_context + mi_col, sa,
             sizeof(PARTITION_CONTEXT) * mw);
  vpx_memcpy(cm->left_seg_context + (mi_row & MI_MASK), sl,
             sizeof(PARTITION_CONTEXT) * mh);
}
Jim Bankoski's avatar
Jim Bankoski committed
757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785
static void save_context(VP9_COMP *cpi, int mi_row, int mi_col,
                          ENTROPY_CONTEXT a[16 * MAX_MB_PLANE],
                          ENTROPY_CONTEXT l[16 * MAX_MB_PLANE],
                          PARTITION_CONTEXT sa[8],
                          PARTITION_CONTEXT sl[8],
                          BLOCK_SIZE_TYPE bsize) {
  VP9_COMMON *const cm = &cpi->common;
  MACROBLOCK *const x = &cpi->mb;
  MACROBLOCKD *const xd = &x->e_mbd;
  int p;
  int bwl = b_width_log2(bsize), bw = 1 << bwl;
  int bhl = b_height_log2(bsize), bh = 1 << bhl;
  int mwl = mi_width_log2(bsize), mw = 1 << mwl;
  int mhl = mi_height_log2(bsize), mh = 1 << mhl;

  // buffer the above/left context information of the block in search.
  for (p = 0; p < MAX_MB_PLANE; ++p) {
    vpx_memcpy(a + bw * p, cm->above_context[p] +
               (mi_col * 2 >> xd->plane[p].subsampling_x),
               sizeof(ENTROPY_CONTEXT) * bw >> xd->plane[p].subsampling_x);
    vpx_memcpy(l + bh * p, cm->left_context[p] +
               ((mi_row & MI_MASK) * 2 >> xd->plane[p].subsampling_y),
               sizeof(ENTROPY_CONTEXT) * bh >> xd->plane[p].subsampling_y);
  }
  vpx_memcpy(sa, cm->above_seg_context + mi_col,
             sizeof(PARTITION_CONTEXT) * mw);
  vpx_memcpy(sl, cm->left_seg_context + (mi_row & MI_MASK),
             sizeof(PARTITION_CONTEXT) * mh);
}
786

787 788 789 790 791 792
static void encode_b(VP9_COMP *cpi, TOKENEXTRA **tp,
                     int mi_row, int mi_col, int output_enabled,
                     BLOCK_SIZE_TYPE bsize, int sub_index) {
  VP9_COMMON *const cm = &cpi->common;
  MACROBLOCK *const x = &cpi->mb;
  MACROBLOCKD *const xd = &x->e_mbd;
John Koleszar's avatar
John Koleszar committed
793

794 795
  if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols)
    return;
John Koleszar's avatar
John Koleszar committed
796

797
  if (sub_index != -1)
798
    *(get_sb_index(xd, bsize)) = sub_index;
799 800 801 802

  if (bsize < BLOCK_SIZE_SB8X8)
    if (xd->ab_index > 0)
      return;
803 804
  set_offsets(cpi, mi_row, mi_col, bsize);
  update_state(cpi, get_block_context(x, bsize), bsize, output_enabled);
Jingning Han's avatar
Jingning Han committed
805
  encode_superblock(cpi, tp, output_enabled, mi_row, mi_col, bsize);
John Koleszar's avatar
John Koleszar committed
806

807 808
  if (output_enabled) {
    update_stats(cpi, mi_row, mi_col);
809

810 811
    (*tp)->token = EOSB_TOKEN;
    (*tp)++;
John Koleszar's avatar
John Koleszar committed
812
  }
Ronald S. Bultje's avatar
Ronald S. Bultje committed
813 814
}

815 816
static void encode_sb(VP9_COMP *cpi, TOKENEXTRA **tp,
                      int mi_row, int mi_col, int output_enabled,
817
                      BLOCK_SIZE_TYPE bsize) {
818 819 820
  VP9_COMMON *const cm = &cpi->common;
  MACROBLOCK *const x = &cpi->mb;
  MACROBLOCKD *const xd = &x->e_mbd;
821
  BLOCK_SIZE_TYPE c1 = BLOCK_SIZE_SB8X8;
822
  const int bsl = b_width_log2(bsize), bs = (1 << bsl) / 4;
823
  int bwl, bhl;
824
  int UNINITIALIZED_IS_SAFE(pl);
825

826 827
  if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols)
    return;
828

829
  c1 = BLOCK_SIZE_AB4X4;
830
  if (bsize >= BLOCK_SIZE_SB8X8) {
831
    set_partition_seg_context(cm, xd, mi_row, mi_col);
832 833
    pl = partition_plane_context(xd, bsize);
    c1 = *(get_sb_partitioning(x, bsize));
834
  }
Ronald S. Bultje's avatar
Ronald S. Bultje committed
835