threading.c 41.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
#if !defined(WIN32) && CONFIG_OS_SUPPORT == 1
John Koleszar's avatar
John Koleszar committed
13 14 15 16
# include <unistd.h>
#endif
#include "onyxd_int.h"
#include "vpx_mem/vpx_mem.h"
John Koleszar's avatar
John Koleszar committed
17
#include "vp8/common/threading.h"
John Koleszar's avatar
John Koleszar committed
18

John Koleszar's avatar
John Koleszar committed
19 20
#include "vp8/common/loopfilter.h"
#include "vp8/common/extend.h"
John Koleszar's avatar
John Koleszar committed
21
#include "vpx_ports/vpx_timer.h"
22
#include "detokenize.h"
John Koleszar's avatar
John Koleszar committed
23
#include "vp8/common/reconinter.h"
24
#include "reconintra_mt.h"
25 26 27
#if CONFIG_ERROR_CONCEALMENT
#include "error_concealment.h"
#endif
John Koleszar's avatar
John Koleszar committed
28

29
extern void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd);
John Koleszar's avatar
John Koleszar committed
30

31 32 33 34 35
#if CONFIG_RUNTIME_CPU_DETECT
#define RTCD_VTABLE(x) (&(pbi)->common.rtcd.x)
#else
#define RTCD_VTABLE(x) NULL
#endif
36

37
static void setup_decoding_thread_data(VP8D_COMP *pbi, MACROBLOCKD *xd, MB_ROW_DEC *mbrd, int count)
John Koleszar's avatar
John Koleszar committed
38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
{
    VP8_COMMON *const pc = & pbi->common;
    int i, j;

    for (i = 0; i < count; i++)
    {
        MACROBLOCKD *mbd = &mbrd[i].mbd;
#if CONFIG_RUNTIME_CPU_DETECT
        mbd->rtcd = xd->rtcd;
#endif
        mbd->subpixel_predict        = xd->subpixel_predict;
        mbd->subpixel_predict8x4     = xd->subpixel_predict8x4;
        mbd->subpixel_predict8x8     = xd->subpixel_predict8x8;
        mbd->subpixel_predict16x16   = xd->subpixel_predict16x16;

        mbd->mode_info_context = pc->mi   + pc->mode_info_stride * (i + 1);
        mbd->mode_info_stride  = pc->mode_info_stride;

        mbd->frame_type = pc->frame_type;
        mbd->frames_since_golden      = pc->frames_since_golden;
        mbd->frames_till_alt_ref_frame  = pc->frames_till_alt_ref_frame;

60 61
        mbd->pre = pc->yv12_fb[pc->lst_fb_idx];
        mbd->dst = pc->yv12_fb[pc->new_fb_idx];
John Koleszar's avatar
John Koleszar committed
62 63 64 65 66 67 68

        vp8_setup_block_dptrs(mbd);
        vp8_build_block_doffsets(mbd);
        mbd->segmentation_enabled    = xd->segmentation_enabled;
        mbd->mb_segement_abs_delta     = xd->mb_segement_abs_delta;
        vpx_memcpy(mbd->segment_feature_data, xd->segment_feature_data, sizeof(xd->segment_feature_data));

69
        /*signed char ref_lf_deltas[MAX_REF_LF_DELTAS];*/
70
        vpx_memcpy(mbd->ref_lf_deltas, xd->ref_lf_deltas, sizeof(xd->ref_lf_deltas));
71
        /*signed char mode_lf_deltas[MAX_MODE_LF_DELTAS];*/
72
        vpx_memcpy(mbd->mode_lf_deltas, xd->mode_lf_deltas, sizeof(xd->mode_lf_deltas));
73 74
        /*unsigned char mode_ref_lf_delta_enabled;
        unsigned char mode_ref_lf_delta_update;*/
75 76 77
        mbd->mode_ref_lf_delta_enabled    = xd->mode_ref_lf_delta_enabled;
        mbd->mode_ref_lf_delta_update    = xd->mode_ref_lf_delta_update;

John Koleszar's avatar
John Koleszar committed
78 79 80 81 82 83
        mbd->current_bc = &pbi->bc2;

        for (j = 0; j < 25; j++)
        {
            mbd->block[j].dequant = xd->block[j].dequant;
        }
84 85 86 87 88

        mbd->fullpixel_mask = 0xffffffff;
        if(pc->full_pixel)
            mbd->fullpixel_mask = 0xfffffff8;

John Koleszar's avatar
John Koleszar committed
89 90
    }

91
    for (i=0; i< pc->mb_rows; i++)
92
        pbi->mt_current_mb_col[i]=-1;
John Koleszar's avatar
John Koleszar committed
93 94
}

95

96
static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd, int mb_row, int mb_col)
97
{
98
    int eobtotal = 0;
99
    int throw_residual = 0;
100
    int i;
101

102
    if (xd->mode_info_context->mbmi.mb_skip_coeff)
103
    {
104 105
        vp8_reset_mb_tokens_context(xd);
    }
106
    else if (!vp8dx_bool_error(xd->current_bc))
107 108 109
    {
        eobtotal = vp8_decode_mb_tokens(pbi, xd);
    }
110

111 112
    eobtotal |= (xd->mode_info_context->mbmi.mode == B_PRED ||
                  xd->mode_info_context->mbmi.mode == SPLITMV);
113
    if (!eobtotal && !vp8dx_bool_error(xd->current_bc))
114
    {
Scott LaVarnway's avatar
Scott LaVarnway committed
115 116 117 118 119
        /* Special case:  Force the loopfilter to skip when eobtotal and
         * mb_skip_coeff are zero.
         * */
        xd->mode_info_context->mbmi.mb_skip_coeff = 1;

120
        /*mt_skip_recon_mb(pbi, xd, mb_row, mb_col);*/
121
        if (xd->mode_info_context->mbmi.ref_frame == INTRA_FRAME)
122 123 124 125 126 127
        {
            vp8mt_build_intra_predictors_mbuv_s(pbi, xd, mb_row, mb_col);
            vp8mt_build_intra_predictors_mby_s(pbi, xd, mb_row, mb_col);
        }
        else
        {
128 129 130
            vp8_build_inter16x16_predictors_mb(xd, xd->dst.y_buffer,
                                               xd->dst.u_buffer, xd->dst.v_buffer,
                                               xd->dst.y_stride, xd->dst.uv_stride);
131 132 133
        }
        return;
    }
134

135 136
    if (xd->segmentation_enabled)
        mb_init_dequantizer(pbi, xd);
137

138
    /* do prediction */
139
    if (xd->mode_info_context->mbmi.ref_frame == INTRA_FRAME)
140
    {
141
        vp8mt_build_intra_predictors_mbuv_s(pbi, xd, mb_row, mb_col);
142 143 144

        if (xd->mode_info_context->mbmi.mode != B_PRED)
        {
145
            vp8mt_build_intra_predictors_mby_s(pbi, xd, mb_row, mb_col);
146 147 148 149 150 151 152 153
        } else {
            vp8mt_intra_prediction_down_copy(pbi, xd, mb_row, mb_col);
        }
    }
    else
    {
        vp8_build_inter_predictors_mb(xd);
    }
154

155 156 157 158 159 160 161
    /* When we have independent partitions we can apply residual even
     * though other partitions within the frame are corrupt.
     */
    throw_residual = (!pbi->independent_partitions &&
                      pbi->frame_corrupt_residual);
    throw_residual = (throw_residual || vp8dx_bool_error(xd->current_bc));

162
#if CONFIG_ERROR_CONCEALMENT
163
    if (pbi->ec_active &&
164
        (mb_row * pbi->common.mb_cols + mb_col >= pbi->mvs_corrupt_from_mb ||
165
         throw_residual))
166 167 168 169
    {
        /* MB with corrupt residuals or corrupt mode/motion vectors.
         * Better to use the predictor as reconstruction.
         */
170
        pbi->frame_corrupt_residual = 1;
171 172 173 174 175 176
        vpx_memset(xd->qcoeff, 0, sizeof(xd->qcoeff));
        vp8_conceal_corrupt_mb(xd);
        return;
    }
#endif

177
    /* dequantization and idct */
178
    if (xd->mode_info_context->mbmi.mode == B_PRED)
179 180 181 182
    {
        for (i = 0; i < 16; i++)
        {
            BLOCKD *b = &xd->block[i];
183
            int b_mode = xd->mode_info_context->bmi[i].as_mode;
Scott LaVarnway's avatar
Scott LaVarnway committed
184

185 186
            vp8mt_predict_intra4x4(pbi, xd, b_mode, *(b->base_dst) + b->dst,
                                   b->dst_stride, mb_row, mb_col, i);
Scott LaVarnway's avatar
Scott LaVarnway committed
187

188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218
            if (xd->eobs[i] )
            {
                if (xd->eobs[i] > 1)
                {
                    DEQUANT_INVOKE(&pbi->dequant, idct_add)
                        (b->qcoeff, b->dequant,
                        *(b->base_dst) + b->dst, b->dst_stride);
                }
                else
                {
                    IDCT_INVOKE(RTCD_VTABLE(idct), idct1_scalar_add)
                        (b->qcoeff[0] * b->dequant[0],
                        *(b->base_dst) + b->dst, b->dst_stride,
                        *(b->base_dst) + b->dst, b->dst_stride);
                    ((int *)b->qcoeff)[0] = 0;
                }
            }
        }
    }
    else
    {
        short *DQC = xd->block[0].dequant;

        DECLARE_ALIGNED(16, short, local_dequant[16]);

        if (xd->mode_info_context->mbmi.mode != SPLITMV)
        {
            BLOCKD *b = &xd->block[24];

            /* do 2nd order transform on the dc block */
            if (xd->eobs[24] > 1)
219
            {
220 221 222 223 224 225 226 227 228 229 230 231
                DEQUANT_INVOKE(&pbi->dequant, block)(b);

                IDCT_INVOKE(RTCD_VTABLE(idct), iwalsh16)(&b->dqcoeff[0],
                    xd->qcoeff);
                ((int *)b->qcoeff)[0] = 0;
                ((int *)b->qcoeff)[1] = 0;
                ((int *)b->qcoeff)[2] = 0;
                ((int *)b->qcoeff)[3] = 0;
                ((int *)b->qcoeff)[4] = 0;
                ((int *)b->qcoeff)[5] = 0;
                ((int *)b->qcoeff)[6] = 0;
                ((int *)b->qcoeff)[7] = 0;
232 233 234
            }
            else
            {
235 236
                b->dqcoeff[0] = b->qcoeff[0] * b->dequant[0];
                IDCT_INVOKE(RTCD_VTABLE(idct), iwalsh1)(&b->dqcoeff[0], xd->qcoeff);
237 238
                ((int *)b->qcoeff)[0] = 0;
            }
239 240 241 242 243 244 245 246 247 248

            /* make a local copy of the dequant constants */
            vpx_memcpy(local_dequant, xd->block[0].dequant,
                       sizeof(local_dequant));

            /* override the dc dequant constant */
            local_dequant[0] = 1;

            /* use the new dequant constants */
            DQC = local_dequant;
249
        }
250

251
        DEQUANT_INVOKE (&pbi->dequant, idct_add_y_block)
252
                        (xd->qcoeff, DQC,
253
                         xd->dst.y_buffer,
254 255 256 257
                         xd->dst.y_stride, xd->eobs);
    }

    DEQUANT_INVOKE (&pbi->dequant, idct_add_uv_block)
258
                    (xd->qcoeff+16*16, xd->block[16].dequant,
259
                     xd->dst.u_buffer, xd->dst.v_buffer,
260
                     xd->dst.uv_stride, xd->eobs+16);
261
}
John Koleszar's avatar
John Koleszar committed
262

263
static THREAD_FUNCTION thread_decoding_proc(void *p_data)
John Koleszar's avatar
John Koleszar committed
264 265 266 267
{
    int ithread = ((DECODETHREAD_DATA *)p_data)->ithread;
    VP8D_COMP *pbi = (VP8D_COMP *)(((DECODETHREAD_DATA *)p_data)->ptr1);
    MB_ROW_DEC *mbrd = (MB_ROW_DEC *)(((DECODETHREAD_DATA *)p_data)->ptr2);
268
    ENTROPY_CONTEXT_PLANES mb_row_left_context;
John Koleszar's avatar
John Koleszar committed
269 270 271 272 273 274

    while (1)
    {
        if (pbi->b_multithreaded_rd == 0)
            break;

275
        /*if(WaitForSingleObject(pbi->h_event_start_decoding[ithread], INFINITE) == WAIT_OBJECT_0)*/
276
        if (sem_wait(&pbi->h_event_start_decoding[ithread]) == 0)
John Koleszar's avatar
John Koleszar committed
277 278 279 280 281 282 283 284
        {
            if (pbi->b_multithreaded_rd == 0)
                break;
            else
            {
                VP8_COMMON *pc = &pbi->common;
                MACROBLOCKD *xd = &mbrd->mbd;

285 286
                int mb_row;
                int num_part = 1 << pbi->common.multi_token_partition;
John Koleszar's avatar
John Koleszar committed
287
                volatile int *last_row_current_mb_col;
288
                int nsync = pbi->sync_range;
John Koleszar's avatar
John Koleszar committed
289

290
                for (mb_row = ithread+1; mb_row < pc->mb_rows; mb_row += (pbi->decoding_thread_count + 1))
John Koleszar's avatar
John Koleszar committed
291
                {
292 293 294 295 296 297 298 299
                    int i;
                    int recon_yoffset, recon_uvoffset;
                    int mb_col;
                    int ref_fb_idx = pc->lst_fb_idx;
                    int dst_fb_idx = pc->new_fb_idx;
                    int recon_y_stride = pc->yv12_fb[ref_fb_idx].y_stride;
                    int recon_uv_stride = pc->yv12_fb[ref_fb_idx].uv_stride;

300
                    int filter_level;
Attila Nagy's avatar
Attila Nagy committed
301
                    loop_filter_info_n *lfi_n = &pc->lf_info;
302

303 304 305
                    pbi->mb_row_di[ithread].mb_row = mb_row;
                    pbi->mb_row_di[ithread].mbd.current_bc =  &pbi->mbc[mb_row%num_part];

306
                    last_row_current_mb_col = &pbi->mt_current_mb_col[mb_row -1];
307 308 309

                    recon_yoffset = mb_row * recon_y_stride * 16;
                    recon_uvoffset = mb_row * recon_uv_stride * 8;
310
                    /* reset above block coeffs */
311

312 313 314
                    xd->above_context = pc->above_context;
                    xd->left_context = &mb_row_left_context;
                    vpx_memset(&mb_row_left_context, 0, sizeof(mb_row_left_context));
315 316 317 318 319 320
                    xd->up_available = (mb_row != 0);

                    xd->mb_to_top_edge = -((mb_row * 16)) << 3;
                    xd->mb_to_bottom_edge = ((pc->mb_rows - 1 - mb_row) * 16) << 3;

                    for (mb_col = 0; mb_col < pc->mb_cols; mb_col++)
John Koleszar's avatar
John Koleszar committed
321
                    {
322
                        if ((mb_col & (nsync-1)) == 0)
323
                        {
324
                            while (mb_col > (*last_row_current_mb_col - nsync) && *last_row_current_mb_col != pc->mb_cols - 1)
325 326 327 328 329
                            {
                                x86_pause_hint();
                                thread_sleep(0);
                            }
                        }
John Koleszar's avatar
John Koleszar committed
330

331 332 333
                        /* Distance of MB to the various image edges.
                         * These are specified to 8th pel as they are always
                         * compared to values that are in 1/8th pel units.
334
                         */
335 336
                        xd->mb_to_left_edge = -((mb_col * 16) << 3);
                        xd->mb_to_right_edge = ((pc->mb_cols - 1 - mb_col) * 16) << 3;
John Koleszar's avatar
John Koleszar committed
337

338 339
#if CONFIG_ERROR_CONCEALMENT
                        {
340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364
                            int corrupt_residual =
                                        (!pbi->independent_partitions &&
                                        pbi->frame_corrupt_residual) ||
                                        vp8dx_bool_error(xd->current_bc);
                            if (pbi->ec_active &&
                                (xd->mode_info_context->mbmi.ref_frame ==
                                                                 INTRA_FRAME) &&
                                corrupt_residual)
                            {
                                /* We have an intra block with corrupt
                                 * coefficients, better to conceal with an inter
                                 * block.
                                 * Interpolate MVs from neighboring MBs
                                 *
                                 * Note that for the first mb with corrupt
                                 * residual in a frame, we might not discover
                                 * that before decoding the residual. That
                                 * happens after this check, and therefore no
                                 * inter concealment will be done.
                                 */
                                vp8_interpolate_motion(xd,
                                                       mb_row, mb_col,
                                                       pc->mb_rows, pc->mb_cols,
                                                       pc->mode_info_stride);
                            }
365 366 367 368
                        }
#endif


369 370 371
                        xd->dst.y_buffer = pc->yv12_fb[dst_fb_idx].y_buffer + recon_yoffset;
                        xd->dst.u_buffer = pc->yv12_fb[dst_fb_idx].u_buffer + recon_uvoffset;
                        xd->dst.v_buffer = pc->yv12_fb[dst_fb_idx].v_buffer + recon_uvoffset;
John Koleszar's avatar
John Koleszar committed
372

373
                        xd->left_available = (mb_col != 0);
374

375
                        /* Select the appropriate reference frame for this MB */
376
                        if (xd->mode_info_context->mbmi.ref_frame == LAST_FRAME)
377
                            ref_fb_idx = pc->lst_fb_idx;
378
                        else if (xd->mode_info_context->mbmi.ref_frame == GOLDEN_FRAME)
379 380 381
                            ref_fb_idx = pc->gld_fb_idx;
                        else
                            ref_fb_idx = pc->alt_fb_idx;
John Koleszar's avatar
John Koleszar committed
382

383 384 385
                        xd->pre.y_buffer = pc->yv12_fb[ref_fb_idx].y_buffer + recon_yoffset;
                        xd->pre.u_buffer = pc->yv12_fb[ref_fb_idx].u_buffer + recon_uvoffset;
                        xd->pre.v_buffer = pc->yv12_fb[ref_fb_idx].v_buffer + recon_uvoffset;
John Koleszar's avatar
John Koleszar committed
386

387 388 389 390 391 392 393
                        if (xd->mode_info_context->mbmi.ref_frame !=
                                INTRA_FRAME)
                        {
                            /* propagate errors from reference frames */
                            xd->corrupted |= pc->yv12_fb[ref_fb_idx].corrupted;
                        }

394
                        decode_macroblock(pbi, xd, mb_row, mb_col);
John Koleszar's avatar
John Koleszar committed
395

396 397 398
                        /* check if the boolean decoder has suffered an error */
                        xd->corrupted |= vp8dx_bool_error(xd->current_bc);

399 400
                        if (pbi->common.filter_level)
                        {
Attila Nagy's avatar
Attila Nagy committed
401 402 403 404 405 406 407 408 409 410
                            int skip_lf = (xd->mode_info_context->mbmi.mode != B_PRED &&
                                            xd->mode_info_context->mbmi.mode != SPLITMV &&
                                            xd->mode_info_context->mbmi.mb_skip_coeff);

                            const int mode_index = lfi_n->mode_lf_lut[xd->mode_info_context->mbmi.mode];
                            const int seg = xd->mode_info_context->mbmi.segment_id;
                            const int ref_frame = xd->mode_info_context->mbmi.ref_frame;

                            filter_level = lfi_n->lvl[seg][ref_frame][mode_index];

411 412
                            if( mb_row != pc->mb_rows-1 )
                            {
413
                                /* Save decoded MB last row data for next-row decoding */
414 415 416 417 418
                                vpx_memcpy((pbi->mt_yabove_row[mb_row + 1] + 32 + mb_col*16), (xd->dst.y_buffer + 15 * recon_y_stride), 16);
                                vpx_memcpy((pbi->mt_uabove_row[mb_row + 1] + 16 + mb_col*8), (xd->dst.u_buffer + 7 * recon_uv_stride), 8);
                                vpx_memcpy((pbi->mt_vabove_row[mb_row + 1] + 16 + mb_col*8), (xd->dst.v_buffer + 7 * recon_uv_stride), 8);
                            }

419
                            /* save left_col for next MB decoding */
420 421 422 423
                            if(mb_col != pc->mb_cols-1)
                            {
                                MODE_INFO *next = xd->mode_info_context +1;

424
                                if (next->mbmi.ref_frame == INTRA_FRAME)
425 426 427 428 429 430 431 432 433 434 435
                                {
                                    for (i = 0; i < 16; i++)
                                        pbi->mt_yleft_col[mb_row][i] = xd->dst.y_buffer [i* recon_y_stride + 15];
                                    for (i = 0; i < 8; i++)
                                    {
                                        pbi->mt_uleft_col[mb_row][i] = xd->dst.u_buffer [i* recon_uv_stride + 7];
                                        pbi->mt_vleft_col[mb_row][i] = xd->dst.v_buffer [i* recon_uv_stride + 7];
                                    }
                                }
                            }

Ralph Giles's avatar
Ralph Giles committed
436
                            /* loopfilter on this macroblock. */
437 438
                            if (filter_level)
                            {
Attila Nagy's avatar
Attila Nagy committed
439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484
                                if(pc->filter_type == NORMAL_LOOPFILTER)
                                {
                                    loop_filter_info lfi;
                                    FRAME_TYPE frame_type = pc->frame_type;
                                    const int hev_index = lfi_n->hev_thr_lut[frame_type][filter_level];
                                    lfi.mblim = lfi_n->mblim[filter_level];
                                    lfi.blim = lfi_n->blim[filter_level];
                                    lfi.lim = lfi_n->lim[filter_level];
                                    lfi.hev_thr = lfi_n->hev_thr[hev_index];

                                    if (mb_col > 0)
                                        LF_INVOKE(&pc->rtcd.loopfilter, normal_mb_v)
                                        (xd->dst.y_buffer, xd->dst.u_buffer, xd->dst.v_buffer, recon_y_stride, recon_uv_stride, &lfi);

                                    if (!skip_lf)
                                        LF_INVOKE(&pc->rtcd.loopfilter, normal_b_v)
                                        (xd->dst.y_buffer, xd->dst.u_buffer, xd->dst.v_buffer, recon_y_stride, recon_uv_stride, &lfi);

                                    /* don't apply across umv border */
                                    if (mb_row > 0)
                                        LF_INVOKE(&pc->rtcd.loopfilter, normal_mb_h)
                                        (xd->dst.y_buffer, xd->dst.u_buffer, xd->dst.v_buffer, recon_y_stride, recon_uv_stride, &lfi);

                                    if (!skip_lf)
                                        LF_INVOKE(&pc->rtcd.loopfilter, normal_b_h)
                                        (xd->dst.y_buffer, xd->dst.u_buffer, xd->dst.v_buffer,  recon_y_stride, recon_uv_stride, &lfi);
                                }
                                else
                                {
                                    if (mb_col > 0)
                                        LF_INVOKE(&pc->rtcd.loopfilter, simple_mb_v)
                                        (xd->dst.y_buffer, recon_y_stride, lfi_n->mblim[filter_level]);

                                    if (!skip_lf)
                                        LF_INVOKE(&pc->rtcd.loopfilter, simple_b_v)
                                        (xd->dst.y_buffer, recon_y_stride, lfi_n->blim[filter_level]);

                                    /* don't apply across umv border */
                                    if (mb_row > 0)
                                        LF_INVOKE(&pc->rtcd.loopfilter, simple_mb_h)
                                        (xd->dst.y_buffer, recon_y_stride, lfi_n->mblim[filter_level]);

                                    if (!skip_lf)
                                        LF_INVOKE(&pc->rtcd.loopfilter, simple_b_h)
                                        (xd->dst.y_buffer, recon_y_stride, lfi_n->blim[filter_level]);
                                }
485
                            }
Attila Nagy's avatar
Attila Nagy committed
486

487
                        }
John Koleszar's avatar
John Koleszar committed
488

489 490
                        recon_yoffset += 16;
                        recon_uvoffset += 8;
John Koleszar's avatar
John Koleszar committed
491

492
                        ++xd->mode_info_context;  /* next mb */
John Koleszar's avatar
John Koleszar committed
493

494
                        xd->above_context++;
John Koleszar's avatar
John Koleszar committed
495

496
                        /*pbi->mb_row_di[ithread].current_mb_col = mb_col;*/
497
                        pbi->mt_current_mb_col[mb_row] = mb_col;
498
                    }
John Koleszar's avatar
John Koleszar committed
499

500
                    /* adjust to the next row of mbs */
501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516
                    if (pbi->common.filter_level)
                    {
                        if(mb_row != pc->mb_rows-1)
                        {
                            int lasty = pc->yv12_fb[ref_fb_idx].y_width + VP8BORDERINPIXELS;
                            int lastuv = (pc->yv12_fb[ref_fb_idx].y_width>>1) + (VP8BORDERINPIXELS>>1);

                            for (i = 0; i < 4; i++)
                            {
                                pbi->mt_yabove_row[mb_row +1][lasty + i] = pbi->mt_yabove_row[mb_row +1][lasty -1];
                                pbi->mt_uabove_row[mb_row +1][lastuv + i] = pbi->mt_uabove_row[mb_row +1][lastuv -1];
                                pbi->mt_vabove_row[mb_row +1][lastuv + i] = pbi->mt_vabove_row[mb_row +1][lastuv -1];
                            }
                        }
                    } else
                        vp8_extend_mb_row(&pc->yv12_fb[dst_fb_idx], xd->dst.y_buffer + 16, xd->dst.u_buffer + 8, xd->dst.v_buffer + 8);
John Koleszar's avatar
John Koleszar committed
517

518
                    ++xd->mode_info_context;      /* skip prediction column */
John Koleszar's avatar
John Koleszar committed
519

520
                    /* since we have multithread */
521
                    xd->mode_info_context += xd->mode_info_stride * pbi->decoding_thread_count;
John Koleszar's avatar
John Koleszar committed
522 523 524
                }
            }
        }
525
        /*  add this to each frame */
526 527
        if ((mbrd->mb_row == pbi->common.mb_rows-1) || ((mbrd->mb_row == pbi->common.mb_rows-2) && (pbi->common.mb_rows % (pbi->decoding_thread_count+1))==1))
        {
528
            /*SetEvent(pbi->h_event_end_decoding);*/
529 530 531
            sem_post(&pbi->h_event_end_decoding);
        }
    }
John Koleszar's avatar
John Koleszar committed
532 533 534 535

    return 0 ;
}

536

537
void vp8_decoder_create_threads(VP8D_COMP *pbi)
John Koleszar's avatar
John Koleszar committed
538
{
539 540
    int core_count = 0;
    int ithread;
John Koleszar's avatar
John Koleszar committed
541

542 543
    pbi->b_multithreaded_rd = 0;
    pbi->allocated_decoding_thread_count = 0;
544 545 546 547 548 549 550

    /* limit decoding threads to the max number of token partitions */
    core_count = (pbi->max_threads > 8) ? 8 : pbi->max_threads;

    /* limit decoding threads to the available cores */
    if (core_count > pbi->common.processor_core_count)
        core_count = pbi->common.processor_core_count;
John Koleszar's avatar
John Koleszar committed
551

552 553 554
    if (core_count > 1)
    {
        pbi->b_multithreaded_rd = 1;
555
        pbi->decoding_thread_count = core_count - 1;
John Koleszar's avatar
John Koleszar committed
556

557 558 559 560 561
        CHECK_MEM_ERROR(pbi->h_decoding_thread, vpx_malloc(sizeof(pthread_t) * pbi->decoding_thread_count));
        CHECK_MEM_ERROR(pbi->h_event_start_decoding, vpx_malloc(sizeof(sem_t) * pbi->decoding_thread_count));
        CHECK_MEM_ERROR(pbi->mb_row_di, vpx_memalign(32, sizeof(MB_ROW_DEC) * pbi->decoding_thread_count));
        vpx_memset(pbi->mb_row_di, 0, sizeof(MB_ROW_DEC) * pbi->decoding_thread_count);
        CHECK_MEM_ERROR(pbi->de_thread_data, vpx_malloc(sizeof(DECODETHREAD_DATA) * pbi->decoding_thread_count));
John Koleszar's avatar
John Koleszar committed
562

563 564 565
        for (ithread = 0; ithread < pbi->decoding_thread_count; ithread++)
        {
            sem_init(&pbi->h_event_start_decoding[ithread], 0, 0);
John Koleszar's avatar
John Koleszar committed
566

567 568 569
            pbi->de_thread_data[ithread].ithread  = ithread;
            pbi->de_thread_data[ithread].ptr1     = (void *)pbi;
            pbi->de_thread_data[ithread].ptr2     = (void *) &pbi->mb_row_di[ithread];
John Koleszar's avatar
John Koleszar committed
570

571
            pthread_create(&pbi->h_decoding_thread[ithread], 0, thread_decoding_proc, (&pbi->de_thread_data[ithread]));
572
        }
573

574
        sem_init(&pbi->h_event_end_decoding, 0, 0);
John Koleszar's avatar
John Koleszar committed
575

576 577 578
        pbi->allocated_decoding_thread_count = pbi->decoding_thread_count;
    }
}
John Koleszar's avatar
John Koleszar committed
579 580


581 582 583
void vp8mt_de_alloc_temp_buffers(VP8D_COMP *pbi, int mb_rows)
{
    int i;
John Koleszar's avatar
John Koleszar committed
584

585 586 587 588
    if (pbi->b_multithreaded_rd)
    {
            vpx_free(pbi->mt_current_mb_col);
            pbi->mt_current_mb_col = NULL ;
John Koleszar's avatar
John Koleszar committed
589

590
        /* Free above_row buffers. */
591 592 593 594 595 596 597 598 599 600
        if (pbi->mt_yabove_row)
        {
            for (i=0; i< mb_rows; i++)
            {
                    vpx_free(pbi->mt_yabove_row[i]);
                    pbi->mt_yabove_row[i] = NULL ;
            }
            vpx_free(pbi->mt_yabove_row);
            pbi->mt_yabove_row = NULL ;
        }
John Koleszar's avatar
John Koleszar committed
601

602 603 604 605 606 607 608 609 610 611
        if (pbi->mt_uabove_row)
        {
            for (i=0; i< mb_rows; i++)
            {
                    vpx_free(pbi->mt_uabove_row[i]);
                    pbi->mt_uabove_row[i] = NULL ;
            }
            vpx_free(pbi->mt_uabove_row);
            pbi->mt_uabove_row = NULL ;
        }
John Koleszar's avatar
John Koleszar committed
612

613 614 615 616 617 618 619 620 621 622
        if (pbi->mt_vabove_row)
        {
            for (i=0; i< mb_rows; i++)
            {
                    vpx_free(pbi->mt_vabove_row[i]);
                    pbi->mt_vabove_row[i] = NULL ;
            }
            vpx_free(pbi->mt_vabove_row);
            pbi->mt_vabove_row = NULL ;
        }
John Koleszar's avatar
John Koleszar committed
623

624
        /* Free left_col buffers. */
625 626 627 628 629 630 631 632 633 634
        if (pbi->mt_yleft_col)
        {
            for (i=0; i< mb_rows; i++)
            {
                    vpx_free(pbi->mt_yleft_col[i]);
                    pbi->mt_yleft_col[i] = NULL ;
            }
            vpx_free(pbi->mt_yleft_col);
            pbi->mt_yleft_col = NULL ;
        }
John Koleszar's avatar
John Koleszar committed
635

636 637 638 639 640 641
        if (pbi->mt_uleft_col)
        {
            for (i=0; i< mb_rows; i++)
            {
                    vpx_free(pbi->mt_uleft_col[i]);
                    pbi->mt_uleft_col[i] = NULL ;
642
            }
643 644
            vpx_free(pbi->mt_uleft_col);
            pbi->mt_uleft_col = NULL ;
John Koleszar's avatar
John Koleszar committed
645 646
        }

647
        if (pbi->mt_vleft_col)
648
        {
649 650 651 652 653 654 655
            for (i=0; i< mb_rows; i++)
            {
                    vpx_free(pbi->mt_vleft_col[i]);
                    pbi->mt_vleft_col[i] = NULL ;
            }
            vpx_free(pbi->mt_vleft_col);
            pbi->mt_vleft_col = NULL ;
656
        }
657
    }
John Koleszar's avatar
John Koleszar committed
658 659
}

660

661
void vp8mt_alloc_temp_buffers(VP8D_COMP *pbi, int width, int prev_mb_rows)
John Koleszar's avatar
John Koleszar committed
662
{
663 664 665
    VP8_COMMON *const pc = & pbi->common;
    int i;
    int uv_width;
John Koleszar's avatar
John Koleszar committed
666

667
    if (pbi->b_multithreaded_rd)
John Koleszar's avatar
John Koleszar committed
668
    {
669
        vp8mt_de_alloc_temp_buffers(pbi, prev_mb_rows);
John Koleszar's avatar
John Koleszar committed
670

671
        /* our internal buffers are always multiples of 16 */
672 673
        if ((width & 0xf) != 0)
            width += 16 - (width & 0xf);
John Koleszar's avatar
John Koleszar committed
674

675 676 677 678 679
        if (width < 640) pbi->sync_range = 1;
        else if (width <= 1280) pbi->sync_range = 8;
        else if (width <= 2560) pbi->sync_range =16;
        else pbi->sync_range = 32;

680
        uv_width = width >>1;
681

682
        /* Allocate an int for each mb row. */
683
        CHECK_MEM_ERROR(pbi->mt_current_mb_col, vpx_malloc(sizeof(int) * pc->mb_rows));
John Koleszar's avatar
John Koleszar committed
684

685
        /* Allocate memory for above_row buffers. */
686 687 688
        CHECK_MEM_ERROR(pbi->mt_yabove_row, vpx_malloc(sizeof(unsigned char *) * pc->mb_rows));
        for (i=0; i< pc->mb_rows; i++)
            CHECK_MEM_ERROR(pbi->mt_yabove_row[i], vpx_calloc(sizeof(unsigned char) * (width + (VP8BORDERINPIXELS<<1)), 1));
John Koleszar's avatar
John Koleszar committed
689

690 691 692
        CHECK_MEM_ERROR(pbi->mt_uabove_row, vpx_malloc(sizeof(unsigned char *) * pc->mb_rows));
        for (i=0; i< pc->mb_rows; i++)
            CHECK_MEM_ERROR(pbi->mt_uabove_row[i], vpx_calloc(sizeof(unsigned char) * (uv_width + VP8BORDERINPIXELS), 1));
John Koleszar's avatar
John Koleszar committed
693

694 695 696
        CHECK_MEM_ERROR(pbi->mt_vabove_row, vpx_malloc(sizeof(unsigned char *) * pc->mb_rows));
        for (i=0; i< pc->mb_rows; i++)
            CHECK_MEM_ERROR(pbi->mt_vabove_row[i], vpx_calloc(sizeof(unsigned char) * (uv_width + VP8BORDERINPIXELS), 1));
697

698
        /* Allocate memory for left_col buffers. */
699 700 701
        CHECK_MEM_ERROR(pbi->mt_yleft_col, vpx_malloc(sizeof(unsigned char *) * pc->mb_rows));
        for (i=0; i< pc->mb_rows; i++)
            CHECK_MEM_ERROR(pbi->mt_yleft_col[i], vpx_calloc(sizeof(unsigned char) * 16, 1));
John Koleszar's avatar
John Koleszar committed
702

703 704 705 706 707 708 709 710
        CHECK_MEM_ERROR(pbi->mt_uleft_col, vpx_malloc(sizeof(unsigned char *) * pc->mb_rows));
        for (i=0; i< pc->mb_rows; i++)
            CHECK_MEM_ERROR(pbi->mt_uleft_col[i], vpx_calloc(sizeof(unsigned char) * 8, 1));

        CHECK_MEM_ERROR(pbi->mt_vleft_col, vpx_malloc(sizeof(unsigned char *) * pc->mb_rows));
        for (i=0; i< pc->mb_rows; i++)
            CHECK_MEM_ERROR(pbi->mt_vleft_col[i], vpx_calloc(sizeof(unsigned char) * 8, 1));
    }
John Koleszar's avatar
John Koleszar committed
711 712
}

713

John Koleszar's avatar
John Koleszar committed
714 715
void vp8_decoder_remove_threads(VP8D_COMP *pbi)
{
716
    /* shutdown MB Decoding thread; */
John Koleszar's avatar
John Koleszar committed
717 718
    if (pbi->b_multithreaded_rd)
    {
719 720
        int i;

John Koleszar's avatar
John Koleszar committed
721
        pbi->b_multithreaded_rd = 0;
722

723
        /* allow all threads to exit */
724
        for (i = 0; i < pbi->allocated_decoding_thread_count; i++)
John Koleszar's avatar
John Koleszar committed
725
        {
726 727
            sem_post(&pbi->h_event_start_decoding[i]);
            pthread_join(pbi->h_decoding_thread[i], NULL);
John Koleszar's avatar
John Koleszar committed
728 729
        }

730 731 732
        for (i = 0; i < pbi->allocated_decoding_thread_count; i++)
        {
            sem_destroy(&pbi->h_event_start_decoding[i]);
John Koleszar's avatar
John Koleszar committed
733 734
        }

735
        sem_destroy(&pbi->h_event_end_decoding);
John Koleszar's avatar
John Koleszar committed
736 737 738 739

            vpx_free(pbi->h_decoding_thread);
            pbi->h_decoding_thread = NULL;

740 741 742
            vpx_free(pbi->h_event_start_decoding);
            pbi->h_event_start_decoding = NULL;

John Koleszar's avatar
John Koleszar committed
743 744 745 746 747
            vpx_free(pbi->mb_row_di);
            pbi->mb_row_di = NULL ;

            vpx_free(pbi->de_thread_data);
            pbi->de_thread_data = NULL;
748
    }
John Koleszar's avatar
John Koleszar committed
749 750
}

751
void vp8mt_decode_mb_rows( VP8D_COMP *pbi, MACROBLOCKD *xd)
John Koleszar's avatar
John Koleszar committed
752 753 754 755 756
{
    int mb_row;
    VP8_COMMON *pc = &pbi->common;

    int num_part = 1 << pbi->common.multi_token_partition;
Henrik Lundin's avatar
Henrik Lundin committed
757
    int i;
758
    volatile int *last_row_current_mb_col = NULL;
759
    int nsync = pbi->sync_range;
John Koleszar's avatar
John Koleszar committed
760

Attila Nagy's avatar
Attila Nagy committed
761 762
    int filter_level = pc->filter_level;
    loop_filter_info_n *lfi_n = &pc->lf_info;
763

Attila Nagy's avatar
Attila Nagy committed
764
    if (filter_level)
765
    {
766
        /* Set above_row buffer to 127 for decoding first MB row */
767 768 769 770 771 772 773 774 775 776 777
        vpx_memset(pbi->mt_yabove_row[0] + VP8BORDERINPIXELS-1, 127, pc->yv12_fb[pc->lst_fb_idx].y_width + 5);
        vpx_memset(pbi->mt_uabove_row[0] + (VP8BORDERINPIXELS>>1)-1, 127, (pc->yv12_fb[pc->lst_fb_idx].y_width>>1) +5);
        vpx_memset(pbi->mt_vabove_row[0] + (VP8BORDERINPIXELS>>1)-1, 127, (pc->yv12_fb[pc->lst_fb_idx].y_width>>1) +5);

        for (i=1; i<pc->mb_rows; i++)
        {
            vpx_memset(pbi->mt_yabove_row[i] + VP8BORDERINPIXELS-1, (unsigned char)129, 1);
            vpx_memset(pbi->mt_uabove_row[i] + (VP8BORDERINPIXELS>>1)-1, (unsigned char)129, 1);
            vpx_memset(pbi->mt_vabove_row[i] + (VP8BORDERINPIXELS>>1)-1, (unsigned char)129, 1);
        }

778
        /* Set left_col to 129 initially */
779 780 781 782 783 784
        for (i=0; i<pc->mb_rows; i++)
        {
            vpx_memset(pbi->mt_yleft_col[i], (unsigned char)129, 16);
            vpx_memset(pbi->mt_uleft_col[i], (unsigned char)129, 8);
            vpx_memset(pbi->mt_vleft_col[i], (unsigned char)129, 8);
        }
Attila Nagy's avatar
Attila Nagy committed
785 786

        /* Initialize the loop filter for this frame. */
Johann's avatar
Johann committed
787
        vp8_loop_filter_frame_init(pc, &pbi->mb, filter_level);
788 789
    }

790
    setup_decoding_thread_data(pbi, xd, pbi->mb_row_di, pbi->decoding_thread_count);
John Koleszar's avatar
John Koleszar committed
791

792 793 794
    for (i = 0; i < pbi->decoding_thread_count; i++)
        sem_post(&pbi->h_event_start_decoding[i]);

John Koleszar's avatar
John Koleszar committed
795 796
    for (mb_row = 0; mb_row < pc->mb_rows; mb_row += (pbi->decoding_thread_count + 1))
    {
797
        xd->current_bc = &pbi->mbc[mb_row%num_part];
John Koleszar's avatar
John Koleszar committed
798

799
        /* vp8_decode_mb_row(pbi, pc, mb_row, xd); */
John Koleszar's avatar
John Koleszar committed
800
        {
801 802 803 804 805 806 807 808
            int i;
            int recon_yoffset, recon_uvoffset;
            int mb_col;
            int ref_fb_idx = pc->lst_fb_idx;
            int dst_fb_idx = pc->new_fb_idx;
            int recon_y_stride = pc->yv12_fb[ref_fb_idx].y_stride;
            int recon_uv_stride = pc->yv12_fb[ref_fb_idx].uv_stride;

809
           /* volatile int *last_row_current_mb_col = NULL; */
810
            if (mb_row > 0)
811
                last_row_current_mb_col = &pbi->mt_current_mb_col[mb_row -1];
812

813
            vpx_memset(&pc->left_context, 0, sizeof(pc->left_context));
814 815
            recon_yoffset = mb_row * recon_y_stride * 16;
            recon_uvoffset = mb_row * recon_uv_stride * 8;
816
            /* reset above block coeffs */
817

818
            xd->above_context = pc->above_context;
819 820 821 822 823 824 825
            xd->up_available = (mb_row != 0);

            xd->mb_to_top_edge = -((mb_row * 16)) << 3;
            xd->mb_to_bottom_edge = ((pc->mb_rows - 1 - mb_row) * 16) << 3;

            for (mb_col = 0; mb_col < pc->mb_cols; mb_col++)
            {
826 827
                if ( mb_row > 0 && (mb_col & (nsync-1)) == 0){
                    while (mb_col > (*last_row_current_mb_col - nsync) && *last_row_current_mb_col != pc->mb_cols - 1)
828 829 830 831
                    {
                        x86_pause_hint();
                        thread_sleep(0);
                    }
832
                }
John Koleszar's avatar
John Koleszar committed
833

834 835 836
                /* Distance of MB to the various image edges.
                 * These are specified to 8th pel as they are always compared to
                 * values that are in 1/8th pel units.
837
                 */
838 839 840
                xd->mb_to_left_edge = -((mb_col * 16) << 3);
                xd->mb_to_right_edge = ((pc->mb_cols - 1 - mb_col) * 16) << 3;

841 842
#if CONFIG_ERROR_CONCEALMENT
                {
843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863
                    int corrupt_residual = (!pbi->independent_partitions &&
                                            pbi->frame_corrupt_residual) ||
                                            vp8dx_bool_error(xd->current_bc);
                    if (pbi->ec_active &&
                        (xd->mode_info_context->mbmi.ref_frame == INTRA_FRAME) &&
                        corrupt_residual)
                    {
                        /* We have an intra block with corrupt coefficients,
                         * better to conceal with an inter block. Interpolate
                         * MVs from neighboring MBs
                         *
                         * Note that for the first mb with corrupt residual in a
                         * frame, we might not discover that before decoding the
                         * residual. That happens after this check, and
                         * therefore no inter concealment will be done.
                         */
                        vp8_interpolate_motion(xd,
                                               mb_row, mb_col,
                                               pc->mb_rows, pc->mb_cols,
                                               pc->mode_info_stride);
                    }
864 865 866 867
                }
#endif


868 869 870 871 872 873
                xd->dst.y_buffer = pc->yv12_fb[dst_fb_idx].y_buffer + recon_yoffset;
                xd->dst.u_buffer = pc->yv12_fb[dst_fb_idx].u_buffer + recon_uvoffset;
                xd->dst.v_buffer = pc->yv12_fb[dst_fb_idx].v_buffer + recon_uvoffset;

                xd->left_available = (mb_col != 0);

874
                /* Select the appropriate reference frame for this MB */
875
                if (xd->mode_info_context->mbmi.ref_frame == LAST_FRAME)
876
                    ref_fb_idx = pc->lst_fb_idx;
877
                else if (xd->mode_info_context->mbmi.ref_frame == GOLDEN_FRAME)
878 879 880 881 882 883 884 885
                    ref_fb_idx = pc->gld_fb_idx;
                else
                    ref_fb_idx = pc->alt_fb_idx;

                xd->pre.y_buffer = pc->yv12_fb[ref_fb_idx].y_buffer + recon_yoffset;
                xd->pre.u_buffer = pc->yv12_fb[ref_fb_idx].u_buffer + recon_uvoffset;
                xd->pre.v_buffer = pc->yv12_fb[ref_fb_idx].v_buffer + recon_uvoffset;

886 887 888 889 890 891
                if (xd->mode_info_context->mbmi.ref_frame != INTRA_FRAME)
                {
                    /* propagate errors from reference frames */
                    xd->corrupted |= pc->yv12_fb[ref_fb_idx].corrupted;
                }

892
                decode_macroblock(pbi, xd, mb_row, mb_col);
893

894 895 896
                /* check if the boolean decoder has suffered an error */
                xd->corrupted |= vp8dx_bool_error(xd->current_bc);

897 898
                if (pbi->common.filter_level)
                {
Attila Nagy's avatar
Attila Nagy committed
899 900 901 902 903 904 905 906 907 908
                    int skip_lf = (xd->mode_info_context->mbmi.mode != B_PRED &&
                                    xd->mode_info_context->mbmi.mode != SPLITMV &&
                                    xd->mode_info_context->mbmi.mb_skip_coeff);

                    const int mode_index = lfi_n->mode_lf_lut[xd->mode_info_context->mbmi.mode];
                    const int seg = xd->mode_info_context->mbmi.segment_id;
                    const int ref_frame = xd->mode_info_context->mbmi.ref_frame;

                    filter_level = lfi_n->lvl[seg][ref_frame][mode_index];

909
                    /* Save decoded MB last row data for next-row decoding */
910 911 912 913 914 915 916
                    if(mb_row != pc->mb_rows-1)
                    {
                        vpx_memcpy((pbi->mt_yabove_row[mb_row +1] + 32 + mb_col*16), (xd->dst.y_buffer + 15 * recon_y_stride), 16);
                        vpx_memcpy((pbi->mt_uabove_row[mb_row +1] + 16 + mb_col*8), (xd->dst.u_buffer + 7 * recon_uv_stride), 8);
                        vpx_memcpy((pbi->mt_vabove_row[mb_row +1] + 16 + mb_col*8), (xd->dst.v_buffer + 7 * recon_uv_stride), 8);
                    }

917
                    /* save left_col for next MB decoding */
918 919 920 921
                    if(mb_col != pc->mb_cols-1)
                    {
                        MODE_INFO *next = xd->mode_info_context +1;

922
                        if (next->mbmi.ref_frame == INTRA_FRAME)
923 924 925 926 927 928 929 930 931 932 933
                        {
                            for (i = 0; i < 16; i++)
                                pbi->mt_yleft_col[mb_row][i] = xd->dst.y_buffer [i* recon_y_stride + 15];
                            for (i = 0; i < 8; i++)
                            {
                                pbi->mt_uleft_col[mb_row][i] = xd->dst.u_buffer [i* recon_uv_stride + 7];
                                pbi->mt_vleft_col[mb_row][i] = xd->dst.v_buffer [i* recon_uv_stride + 7];
                            }
                        }
                    }

934
                    /* loopfilter on this macroblock. */
935 936
                    if (filter_level)
                    {
Attila Nagy's avatar
Attila Nagy committed
937 938 939