vp9_decoder.c 12.5 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
 */

Dmitry Kovalev's avatar
Dmitry Kovalev committed
11
#include <assert.h>
Dmitry Kovalev's avatar
Dmitry Kovalev committed
12 13
#include <limits.h>
#include <stdio.h>
Dmitry Kovalev's avatar
Dmitry Kovalev committed
14

15 16 17 18 19 20 21 22
#include "./vpx_scale_rtcd.h"

#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/vpx_timer.h"
#include "vpx_scale/vpx_scale.h"

#include "vp9/common/vp9_alloccommon.h"
#include "vp9/common/vp9_loopfilter.h"
23
#include "vp9/common/vp9_onyxc_int.h"
24
#if CONFIG_VP9_POSTPROC
25
#include "vp9/common/vp9_postproc.h"
John Koleszar's avatar
John Koleszar committed
26
#endif
27 28
#include "vp9/common/vp9_quant_common.h"
#include "vp9/common/vp9_systemdependent.h"
29

Yaowu Xu's avatar
Yaowu Xu committed
30
#include "vp9/decoder/vp9_decodeframe.h"
31
#include "vp9/decoder/vp9_decoder.h"
32
#include "vp9/decoder/vp9_detokenize.h"
33
#include "vp9/decoder/vp9_dthread.h"
John Koleszar's avatar
John Koleszar committed
34

35 36
#define WRITE_RECON_BUFFER 0
#if WRITE_RECON_BUFFER == 1
37 38 39
static void recon_write_yuv_frame(const char *name,
                                  const YV12_BUFFER_CONFIG *s,
                                  int w, int _h) {
40
  FILE *yuv_file = fopen(name, "ab");
41 42
  const uint8_t *src = s->y_buffer;
  int h = _h;
43

John Koleszar's avatar
John Koleszar committed
44
  do {
45
    fwrite(src, w, 1,  yuv_file);
John Koleszar's avatar
John Koleszar committed
46 47
    src += s->y_stride;
  } while (--h);
48

John Koleszar's avatar
John Koleszar committed
49
  src = s->u_buffer;
50 51
  h = (_h + 1) >> 1;
  w = (w + 1) >> 1;
52

John Koleszar's avatar
John Koleszar committed
53
  do {
54
    fwrite(src, w, 1,  yuv_file);
John Koleszar's avatar
John Koleszar committed
55 56
    src += s->uv_stride;
  } while (--h);
57

John Koleszar's avatar
John Koleszar committed
58
  src = s->v_buffer;
59
  h = (_h + 1) >> 1;
60

John Koleszar's avatar
John Koleszar committed
61
  do {
62
    fwrite(src, w, 1, yuv_file);
John Koleszar's avatar
John Koleszar committed
63 64
    src += s->uv_stride;
  } while (--h);
65

John Koleszar's avatar
John Koleszar committed
66
  fclose(yuv_file);
67 68
}
#endif
69
#if WRITE_RECON_BUFFER == 2
John Koleszar's avatar
John Koleszar committed
70 71 72 73 74
void write_dx_frame_to_file(YV12_BUFFER_CONFIG *frame, int this_frame) {
  // write the frame
  FILE *yframe;
  int i;
  char filename[255];
75

76
  snprintf(filename, sizeof(filename)-1, "dx\\y%04d.raw", this_frame);
John Koleszar's avatar
John Koleszar committed
77
  yframe = fopen(filename, "wb");
78

John Koleszar's avatar
John Koleszar committed
79 80 81
  for (i = 0; i < frame->y_height; i++)
    fwrite(frame->y_buffer + i * frame->y_stride,
           frame->y_width, 1, yframe);
82

John Koleszar's avatar
John Koleszar committed
83
  fclose(yframe);
84
  snprintf(filename, sizeof(filename)-1, "dx\\u%04d.raw", this_frame);
John Koleszar's avatar
John Koleszar committed
85
  yframe = fopen(filename, "wb");
86

John Koleszar's avatar
John Koleszar committed
87 88 89
  for (i = 0; i < frame->uv_height; i++)
    fwrite(frame->u_buffer + i * frame->uv_stride,
           frame->uv_width, 1, yframe);
90

John Koleszar's avatar
John Koleszar committed
91
  fclose(yframe);
92
  snprintf(filename, sizeof(filename)-1, "dx\\v%04d.raw", this_frame);
John Koleszar's avatar
John Koleszar committed
93
  yframe = fopen(filename, "wb");
94

John Koleszar's avatar
John Koleszar committed
95 96 97
  for (i = 0; i < frame->uv_height; i++)
    fwrite(frame->v_buffer + i * frame->uv_stride,
           frame->uv_width, 1, yframe);
98

John Koleszar's avatar
John Koleszar committed
99
  fclose(yframe);
100 101 102
}
#endif

Dmitry Kovalev's avatar
Dmitry Kovalev committed
103
void vp9_initialize_dec() {
John Koleszar's avatar
John Koleszar committed
104
  static int init_done = 0;
John Koleszar's avatar
John Koleszar committed
105

John Koleszar's avatar
John Koleszar committed
106
  if (!init_done) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
107
    vp9_init_neighbors();
108
    vp9_init_quant_tables();
John Koleszar's avatar
John Koleszar committed
109 110
    init_done = 1;
  }
John Koleszar's avatar
John Koleszar committed
111 112
}

113
VP9D_COMP *vp9_create_decompressor(const VP9D_CONFIG *oxcf) {
114
  VP9D_COMP *const pbi = vpx_memalign(32, sizeof(VP9D_COMP));
115
  VP9_COMMON *const cm = pbi ? &pbi->common : NULL;
John Koleszar's avatar
John Koleszar committed
116

117
  if (!cm)
John Koleszar's avatar
John Koleszar committed
118
    return NULL;
John Koleszar's avatar
John Koleszar committed
119

Dmitry Kovalev's avatar
Dmitry Kovalev committed
120
  vp9_zero(*pbi);
John Koleszar's avatar
John Koleszar committed
121

122 123 124
  // Initialize the references to not point to any frame buffers.
  memset(&cm->ref_frame_map, -1, sizeof(cm->ref_frame_map));

125 126
  if (setjmp(cm->error.jmp)) {
    cm->error.setjmp = 0;
127
    vp9_remove_decompressor(pbi);
128
    return NULL;
John Koleszar's avatar
John Koleszar committed
129
  }
John Koleszar's avatar
John Koleszar committed
130

131
  cm->error.setjmp = 1;
132
  vp9_initialize_dec();
John Koleszar's avatar
John Koleszar committed
133

Yaowu Xu's avatar
Yaowu Xu committed
134
  vp9_rtcd();
John Koleszar's avatar
John Koleszar committed
135

136
  pbi->oxcf = *oxcf;
John Koleszar's avatar
John Koleszar committed
137
  pbi->ready_for_new_data = 1;
138
  cm->current_video_frame = 0;
John Koleszar's avatar
John Koleszar committed
139

140
  // vp9_init_dequantizer() is first called here. Add check in
141
  // frame_init_dequantizer() to avoid unnecessary calling of
142
  // vp9_init_dequantizer() for every frame.
143
  vp9_init_dequantizer(cm);
John Koleszar's avatar
John Koleszar committed
144

145
  vp9_loop_filter_init(cm);
John Koleszar's avatar
John Koleszar committed
146

147
  cm->error.setjmp = 0;
John Koleszar's avatar
John Koleszar committed
148
  pbi->decoded_key_frame = 0;
149

150
  vp9_worker_init(&pbi->lf_worker);
151

152
  return pbi;
John Koleszar's avatar
John Koleszar committed
153 154
}

Dmitry Kovalev's avatar
Dmitry Kovalev committed
155
void vp9_remove_decompressor(VP9D_COMP *pbi) {
156
  VP9_COMMON *const cm = &pbi->common;
157
  int i;
John Koleszar's avatar
John Koleszar committed
158

159
  vp9_remove_common(cm);
160 161
  vp9_worker_end(&pbi->lf_worker);
  vpx_free(pbi->lf_worker.data1);
162 163 164 165 166 167 168
  for (i = 0; i < pbi->num_tile_workers; ++i) {
    VP9Worker *const worker = &pbi->tile_workers[i];
    vp9_worker_end(worker);
    vpx_free(worker->data1);
    vpx_free(worker->data2);
  }
  vpx_free(pbi->tile_workers);
169 170 171 172

  if (pbi->num_tile_workers) {
    const int sb_rows =
        mi_cols_aligned_to_sb(cm->mi_rows) >> MI_BLOCK_SIZE_LOG2;
173
    vp9_loop_filter_dealloc(&pbi->lf_row_sync, sb_rows);
174 175
  }

John Koleszar's avatar
John Koleszar committed
176
  vpx_free(pbi);
John Koleszar's avatar
John Koleszar committed
177 178
}

179 180
static int equal_dimensions(const YV12_BUFFER_CONFIG *a,
                            const YV12_BUFFER_CONFIG *b) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
181 182 183
    return a->y_height == b->y_height && a->y_width == b->y_width &&
           a->uv_height == b->uv_height && a->uv_width == b->uv_width;
}
John Koleszar's avatar
John Koleszar committed
184

Dmitry Kovalev's avatar
Dmitry Kovalev committed
185
vpx_codec_err_t vp9_copy_reference_dec(VP9D_COMP *pbi,
John Koleszar's avatar
John Koleszar committed
186 187
                                       VP9_REFFRAME ref_frame_flag,
                                       YV12_BUFFER_CONFIG *sd) {
188
  VP9_COMMON *cm = &pbi->common;
John Koleszar's avatar
John Koleszar committed
189

190 191 192 193 194
  /* TODO(jkoleszar): The decoder doesn't have any real knowledge of what the
   * encoder is using the frame buffers for. This is just a stub to keep the
   * vpxenc --test-decode functionality working, and will be replaced in a
   * later commit that adds VP9-specific controls for this functionality.
   */
Dmitry Kovalev's avatar
Dmitry Kovalev committed
195
  if (ref_frame_flag == VP9_LAST_FLAG) {
196 197
    const YV12_BUFFER_CONFIG *const cfg =
        &cm->frame_bufs[cm->ref_frame_map[0]].buf;
198 199 200 201 202
    if (!equal_dimensions(cfg, sd))
      vpx_internal_error(&cm->error, VPX_CODEC_ERROR,
                         "Incorrect buffer dimensions");
    else
      vp8_yv12_copy_frame(cfg, sd);
Dmitry Kovalev's avatar
Dmitry Kovalev committed
203
  } else {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
204
    vpx_internal_error(&cm->error, VPX_CODEC_ERROR,
John Koleszar's avatar
John Koleszar committed
205
                       "Invalid reference frame");
Dmitry Kovalev's avatar
Dmitry Kovalev committed
206
  }
207

Dmitry Kovalev's avatar
Dmitry Kovalev committed
208
  return cm->error.error_code;
John Koleszar's avatar
John Koleszar committed
209
}
210 211


212
vpx_codec_err_t vp9_set_reference_dec(VP9_COMMON *cm,
Dmitry Kovalev's avatar
Dmitry Kovalev committed
213
                                      VP9_REFFRAME ref_frame_flag,
214
                                      YV12_BUFFER_CONFIG *sd) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
215
  RefBuffer *ref_buf = NULL;
John Koleszar's avatar
John Koleszar committed
216

217 218 219 220
  // TODO(jkoleszar): The decoder doesn't have any real knowledge of what the
  // encoder is using the frame buffers for. This is just a stub to keep the
  // vpxenc --test-decode functionality working, and will be replaced in a
  // later commit that adds VP9-specific controls for this functionality.
221
  if (ref_frame_flag == VP9_LAST_FLAG) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
222
    ref_buf = &cm->frame_refs[0];
223
  } else if (ref_frame_flag == VP9_GOLD_FLAG) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
224
    ref_buf = &cm->frame_refs[1];
225
  } else if (ref_frame_flag == VP9_ALT_FLAG) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
226
    ref_buf = &cm->frame_refs[2];
227
  } else {
228
    vpx_internal_error(&cm->error, VPX_CODEC_ERROR,
John Koleszar's avatar
John Koleszar committed
229
                       "Invalid reference frame");
230
    return cm->error.error_code;
John Koleszar's avatar
John Koleszar committed
231
  }
232

Dmitry Kovalev's avatar
Dmitry Kovalev committed
233
  if (!equal_dimensions(ref_buf->buf, sd)) {
234
    vpx_internal_error(&cm->error, VPX_CODEC_ERROR,
John Koleszar's avatar
John Koleszar committed
235 236
                       "Incorrect buffer dimensions");
  } else {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
237 238
    int *ref_fb_ptr = &ref_buf->idx;

Dmitry Kovalev's avatar
Dmitry Kovalev committed
239 240
    // Find an empty frame buffer.
    const int free_fb = get_free_fb(cm);
241
    // Decrease ref_count since it will be increased again in
Dmitry Kovalev's avatar
Dmitry Kovalev committed
242
    // ref_cnt_fb() below.
243
    cm->frame_bufs[free_fb].ref_count--;
John Koleszar's avatar
John Koleszar committed
244

Dmitry Kovalev's avatar
Dmitry Kovalev committed
245
    // Manage the reference counters and copy image.
246 247
    ref_cnt_fb(cm->frame_bufs, ref_fb_ptr, free_fb);
    ref_buf->buf = &cm->frame_bufs[*ref_fb_ptr].buf;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
248
    vp8_yv12_copy_frame(sd, ref_buf->buf);
John Koleszar's avatar
John Koleszar committed
249
  }
250

251
  return cm->error.error_code;
John Koleszar's avatar
John Koleszar committed
252 253
}

254

Dmitry Kovalev's avatar
Dmitry Kovalev committed
255
int vp9_get_reference_dec(VP9D_COMP *pbi, int index, YV12_BUFFER_CONFIG **fb) {
John Koleszar's avatar
John Koleszar committed
256 257
  VP9_COMMON *cm = &pbi->common;

Dmitry Kovalev's avatar
Dmitry Kovalev committed
258
  if (index < 0 || index >= REF_FRAMES)
John Koleszar's avatar
John Koleszar committed
259 260
    return -1;

261
  *fb = &cm->frame_bufs[cm->ref_frame_map[index]].buf;
John Koleszar's avatar
John Koleszar committed
262 263 264
  return 0;
}

265
/* If any buffer updating is signaled it should be done here. */
266 267
static void swap_frame_buffers(VP9D_COMP *pbi) {
  int ref_index = 0, mask;
Dmitry Kovalev's avatar
Dmitry Kovalev committed
268
  VP9_COMMON *const cm = &pbi->common;
269

270
  for (mask = pbi->refresh_frame_flags; mask; mask >>= 1) {
271 272
    if (mask & 1) {
      const int old_idx = cm->ref_frame_map[ref_index];
273
      ref_cnt_fb(cm->frame_bufs, &cm->ref_frame_map[ref_index],
Dmitry Kovalev's avatar
Dmitry Kovalev committed
274
                 cm->new_fb_idx);
275 276 277 278
      if (old_idx >= 0 && cm->frame_bufs[old_idx].ref_count == 0)
        cm->release_fb_cb(cm->cb_priv,
                          &cm->frame_bufs[old_idx].raw_frame_buffer);
    }
279 280
    ++ref_index;
  }
281

282
  cm->frame_to_show = get_frame_new_buffer(cm);
283
  cm->frame_bufs[cm->new_fb_idx].ref_count--;
284

Dmitry Kovalev's avatar
Dmitry Kovalev committed
285
  // Invalidate these references until the next frame starts.
286
  for (ref_index = 0; ref_index < 3; ref_index++)
Dmitry Kovalev's avatar
Dmitry Kovalev committed
287
    cm->frame_refs[ref_index].idx = INT_MAX;
288 289
}

Dmitry Kovalev's avatar
Dmitry Kovalev committed
290
int vp9_receive_compressed_data(VP9D_COMP *pbi,
291
                                size_t size, const uint8_t **psource,
292
                                int64_t time_stamp) {
293
  VP9_COMMON *const cm = &pbi->common;
294
  const uint8_t *source = *psource;
John Koleszar's avatar
John Koleszar committed
295
  int retcode = 0;
John Koleszar's avatar
John Koleszar committed
296

Dmitry Kovalev's avatar
Dmitry Kovalev committed
297
  cm->error.error_code = VPX_CODEC_OK;
John Koleszar's avatar
John Koleszar committed
298

299
  if (size == 0) {
300 301 302 303 304 305 306 307
    // This is used to signal that we are missing frames.
    // We do not know if the missing frame(s) was supposed to update
    // any of the reference buffers, but we act conservative and
    // mark only the last buffer as corrupted.
    //
    // TODO(jkoleszar): Error concealment is undefined and non-normative
    // at this point, but if it becomes so, [0] may not always be the correct
    // thing to do here.
Dmitry Kovalev's avatar
Dmitry Kovalev committed
308 309
    if (cm->frame_refs[0].idx != INT_MAX)
      cm->frame_refs[0].buf->corrupted = 1;
John Koleszar's avatar
John Koleszar committed
310
  }
311

312 313 314 315
  // Check if the previous frame was a frame without any references to it.
  if (cm->new_fb_idx >= 0 && cm->frame_bufs[cm->new_fb_idx].ref_count == 0)
    cm->release_fb_cb(cm->cb_priv,
                      &cm->frame_bufs[cm->new_fb_idx].raw_frame_buffer);
John Koleszar's avatar
John Koleszar committed
316
  cm->new_fb_idx = get_free_fb(cm);
317

Dmitry Kovalev's avatar
Dmitry Kovalev committed
318 319
  if (setjmp(cm->error.jmp)) {
    cm->error.setjmp = 0;
John Koleszar's avatar
John Koleszar committed
320

321 322 323 324 325 326 327
    // We do not know if the missing frame(s) was supposed to update
    // any of the reference buffers, but we act conservative and
    // mark only the last buffer as corrupted.
    //
    // TODO(jkoleszar): Error concealment is undefined and non-normative
    // at this point, but if it becomes so, [0] may not always be the correct
    // thing to do here.
Dmitry Kovalev's avatar
Dmitry Kovalev committed
328 329
    if (cm->frame_refs[0].idx != INT_MAX)
      cm->frame_refs[0].buf->corrupted = 1;
John Koleszar's avatar
John Koleszar committed
330

331 332
    if (cm->frame_bufs[cm->new_fb_idx].ref_count > 0)
      cm->frame_bufs[cm->new_fb_idx].ref_count--;
333

John Koleszar's avatar
John Koleszar committed
334 335
    return -1;
  }
John Koleszar's avatar
John Koleszar committed
336

Dmitry Kovalev's avatar
Dmitry Kovalev committed
337
  cm->error.setjmp = 1;
Paul Wilkins's avatar
Paul Wilkins committed
338

339
  retcode = vp9_decode_frame(pbi, source, source + size, psource);
John Koleszar's avatar
John Koleszar committed
340

John Koleszar's avatar
John Koleszar committed
341
  if (retcode < 0) {
Dmitry Kovalev's avatar
Dmitry Kovalev committed
342 343
    cm->error.error_code = VPX_CODEC_ERROR;
    cm->error.setjmp = 0;
344 345
    if (cm->frame_bufs[cm->new_fb_idx].ref_count > 0)
      cm->frame_bufs[cm->new_fb_idx].ref_count--;
John Koleszar's avatar
John Koleszar committed
346 347
    return retcode;
  }
John Koleszar's avatar
John Koleszar committed
348

349
  swap_frame_buffers(pbi);
John Koleszar's avatar
John Koleszar committed
350

351
#if WRITE_RECON_BUFFER == 2
352 353 354 355 356 357
  if (cm->show_frame)
    write_dx_frame_to_file(cm->frame_to_show,
                           cm->current_video_frame);
  else
    write_dx_frame_to_file(cm->frame_to_show,
                           cm->current_video_frame + 1000);
358 359
#endif

360
  if (!pbi->do_loopfilter_inline) {
361 362 363 364 365 366 367
    // If multiple threads are used to decode tiles, then we use those threads
    // to do parallel loopfiltering.
    if (pbi->num_tile_workers) {
      vp9_loop_filter_frame_mt(pbi, cm, &pbi->mb, cm->lf.filter_level, 0, 0);
    } else {
      vp9_loop_filter_frame(cm, &pbi->mb, cm->lf.filter_level, 0, 0);
    }
368
  }
369 370

#if WRITE_RECON_BUFFER == 2
371 372 373 374 375 376
  if (cm->show_frame)
    write_dx_frame_to_file(cm->frame_to_show,
                           cm->current_video_frame + 2000);
  else
    write_dx_frame_to_file(cm->frame_to_show,
                           cm->current_video_frame + 3000);
377 378
#endif

379
#if WRITE_RECON_BUFFER == 1
John Koleszar's avatar
John Koleszar committed
380
  if (cm->show_frame)
381
    recon_write_yuv_frame("recon.yuv", cm->frame_to_show,
382
                          cm->width, cm->height);
383
#endif
384

385
  vp9_clear_system_state();
John Koleszar's avatar
John Koleszar committed
386

387 388 389
  cm->last_width = cm->width;
  cm->last_height = cm->height;

390 391
  if (!cm->show_existing_frame)
    cm->last_show_frame = cm->show_frame;
John Koleszar's avatar
John Koleszar committed
392
  if (cm->show_frame) {
393 394 395
    if (!cm->show_existing_frame)
      vp9_swap_mi_and_prev_mi(cm);

396
    cm->current_video_frame++;
John Koleszar's avatar
John Koleszar committed
397
  }
398

John Koleszar's avatar
John Koleszar committed
399 400
  pbi->ready_for_new_data = 0;
  pbi->last_time_stamp = time_stamp;
John Koleszar's avatar
John Koleszar committed
401

Dmitry Kovalev's avatar
Dmitry Kovalev committed
402
  cm->error.setjmp = 0;
John Koleszar's avatar
John Koleszar committed
403
  return retcode;
John Koleszar's avatar
John Koleszar committed
404
}
405

Dmitry Kovalev's avatar
Dmitry Kovalev committed
406
int vp9_get_raw_frame(VP9D_COMP *pbi, YV12_BUFFER_CONFIG *sd,
407
                      int64_t *time_stamp, int64_t *time_end_stamp,
408
                      vp9_ppflags_t *flags) {
John Koleszar's avatar
John Koleszar committed
409
  int ret = -1;
John Koleszar's avatar
John Koleszar committed
410

John Koleszar's avatar
John Koleszar committed
411 412
  if (pbi->ready_for_new_data == 1)
    return ret;
John Koleszar's avatar
John Koleszar committed
413

John Koleszar's avatar
John Koleszar committed
414 415 416
  /* ie no raw frame to show!!! */
  if (pbi->common.show_frame == 0)
    return ret;
John Koleszar's avatar
John Koleszar committed
417

John Koleszar's avatar
John Koleszar committed
418 419 420
  pbi->ready_for_new_data = 1;
  *time_stamp = pbi->last_time_stamp;
  *time_end_stamp = 0;
John Koleszar's avatar
John Koleszar committed
421

422
#if CONFIG_VP9_POSTPROC
423
  ret = vp9_post_proc_frame(&pbi->common, sd, flags);
John Koleszar's avatar
John Koleszar committed
424
#else
John Koleszar's avatar
John Koleszar committed
425
    *sd = *pbi->common.frame_to_show;
426 427
    sd->y_width = pbi->common.width;
    sd->y_height = pbi->common.height;
428 429
    sd->uv_width = sd->y_width >> pbi->common.subsampling_x;
    sd->uv_height = sd->y_height >> pbi->common.subsampling_y;
John Koleszar's avatar
John Koleszar committed
430
    ret = 0;
431
#endif /*!CONFIG_POSTPROC*/
432
  vp9_clear_system_state();
John Koleszar's avatar
John Koleszar committed
433
  return ret;
John Koleszar's avatar
John Koleszar committed
434
}