Revision 145d3186

View differences:

libavcodec/vp8.c
1273 1273
    int filter_level = f->filter_level;
1274 1274
    int inner_limit = f->inner_limit;
1275 1275
    int inner_filter = f->inner_filter;
1276
    int linesize = s->linesize;
1277
    int uvlinesize = s->uvlinesize;
1276 1278

  
1277 1279
    if (!filter_level)
1278 1280
        return;
......
1292 1294
    }
1293 1295

  
1294 1296
    if (mb_x) {
1295
        s->vp8dsp.vp8_h_loop_filter16y(dst[0],     s->linesize,
1297
        s->vp8dsp.vp8_h_loop_filter16y(dst[0],     linesize,
1296 1298
                                       mbedge_lim, inner_limit, hev_thresh);
1297
        s->vp8dsp.vp8_h_loop_filter8uv(dst[1],     dst[2],      s->uvlinesize,
1299
        s->vp8dsp.vp8_h_loop_filter8uv(dst[1],     dst[2],      uvlinesize,
1298 1300
                                       mbedge_lim, inner_limit, hev_thresh);
1299 1301
    }
1300 1302

  
1301 1303
    if (inner_filter) {
1302
        s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0]+ 4, s->linesize, bedge_lim,
1303
                                             inner_limit,   hev_thresh);
1304
        s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0]+ 8, s->linesize, bedge_lim,
1305
                                             inner_limit,   hev_thresh);
1306
        s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0]+12, s->linesize, bedge_lim,
1307
                                             inner_limit,   hev_thresh);
1308
        s->vp8dsp.vp8_h_loop_filter8uv_inner(dst[1] + 4,    dst[2] + 4,
1309
                                             s->uvlinesize, bedge_lim,
1310
                                             inner_limit,   hev_thresh);
1304
        s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0]+ 4, linesize, bedge_lim,
1305
                                             inner_limit, hev_thresh);
1306
        s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0]+ 8, linesize, bedge_lim,
1307
                                             inner_limit, hev_thresh);
1308
        s->vp8dsp.vp8_h_loop_filter16y_inner(dst[0]+12, linesize, bedge_lim,
1309
                                             inner_limit, hev_thresh);
1310
        s->vp8dsp.vp8_h_loop_filter8uv_inner(dst[1] + 4, dst[2] + 4,
1311
                                             uvlinesize,  bedge_lim,
1312
                                             inner_limit, hev_thresh);
1311 1313
    }
1312 1314

  
1313 1315
    if (mb_y) {
1314
        s->vp8dsp.vp8_v_loop_filter16y(dst[0],     s->linesize,
1316
        s->vp8dsp.vp8_v_loop_filter16y(dst[0],     linesize,
1315 1317
                                       mbedge_lim, inner_limit, hev_thresh);
1316
        s->vp8dsp.vp8_v_loop_filter8uv(dst[1],     dst[2],      s->uvlinesize,
1318
        s->vp8dsp.vp8_v_loop_filter8uv(dst[1],     dst[2],      uvlinesize,
1317 1319
                                       mbedge_lim, inner_limit, hev_thresh);
1318 1320
    }
1319 1321

  
1320 1322
    if (inner_filter) {
1321
        s->vp8dsp.vp8_v_loop_filter16y_inner(dst[0]+ 4*s->linesize,
1322
                                             s->linesize,   bedge_lim,
1323
                                             inner_limit,   hev_thresh);
1324
        s->vp8dsp.vp8_v_loop_filter16y_inner(dst[0]+ 8*s->linesize,
1325
                                             s->linesize,   bedge_lim,
1326
                                             inner_limit,   hev_thresh);
1327
        s->vp8dsp.vp8_v_loop_filter16y_inner(dst[0]+12*s->linesize,
1328
                                             s->linesize,   bedge_lim,
1323
        s->vp8dsp.vp8_v_loop_filter16y_inner(dst[0]+ 4*linesize,
1324
                                             linesize,    bedge_lim,
1325
                                             inner_limit, hev_thresh);
1326
        s->vp8dsp.vp8_v_loop_filter16y_inner(dst[0]+ 8*linesize,
1327
                                             linesize,    bedge_lim,
1328
                                             inner_limit, hev_thresh);
1329
        s->vp8dsp.vp8_v_loop_filter16y_inner(dst[0]+12*linesize,
1330
                                             linesize,    bedge_lim,
1331
                                             inner_limit, hev_thresh);
1332
        s->vp8dsp.vp8_v_loop_filter8uv_inner(dst[1] + 4 * uvlinesize,
1333
                                             dst[2] + 4 * uvlinesize,
1334
                                             uvlinesize,  bedge_lim,
1329 1335
                                             inner_limit, hev_thresh);
1330
        s->vp8dsp.vp8_v_loop_filter8uv_inner(dst[1] + 4 * s->uvlinesize,
1331
                                             dst[2] + 4 * s->uvlinesize,
1332
                                             s->uvlinesize, bedge_lim,
1333
                                             inner_limit,   hev_thresh);
1334 1336
    }
1335 1337
}
1336 1338

  
......
1340 1342
    int filter_level = f->filter_level;
1341 1343
    int inner_limit = f->inner_limit;
1342 1344
    int inner_filter = f->inner_filter;
1345
    int linesize = s->linesize;
1343 1346

  
1344 1347
    if (!filter_level)
1345 1348
        return;
......
1348 1351
     bedge_lim = 2* filter_level    + inner_limit;
1349 1352

  
1350 1353
    if (mb_x)
1351
        s->vp8dsp.vp8_h_loop_filter_simple(dst, s->linesize, mbedge_lim);
1354
        s->vp8dsp.vp8_h_loop_filter_simple(dst, linesize, mbedge_lim);
1352 1355
    if (inner_filter) {
1353
        s->vp8dsp.vp8_h_loop_filter_simple(dst+ 4, s->linesize, bedge_lim);
1354
        s->vp8dsp.vp8_h_loop_filter_simple(dst+ 8, s->linesize, bedge_lim);
1355
        s->vp8dsp.vp8_h_loop_filter_simple(dst+12, s->linesize, bedge_lim);
1356
        s->vp8dsp.vp8_h_loop_filter_simple(dst+ 4, linesize, bedge_lim);
1357
        s->vp8dsp.vp8_h_loop_filter_simple(dst+ 8, linesize, bedge_lim);
1358
        s->vp8dsp.vp8_h_loop_filter_simple(dst+12, linesize, bedge_lim);
1356 1359
    }
1357 1360

  
1358 1361
    if (mb_y)
1359
        s->vp8dsp.vp8_v_loop_filter_simple(dst, s->linesize, mbedge_lim);
1362
        s->vp8dsp.vp8_v_loop_filter_simple(dst, linesize, mbedge_lim);
1360 1363
    if (inner_filter) {
1361
        s->vp8dsp.vp8_v_loop_filter_simple(dst+ 4*s->linesize, s->linesize, bedge_lim);
1362
        s->vp8dsp.vp8_v_loop_filter_simple(dst+ 8*s->linesize, s->linesize, bedge_lim);
1363
        s->vp8dsp.vp8_v_loop_filter_simple(dst+12*s->linesize, s->linesize, bedge_lim);
1364
        s->vp8dsp.vp8_v_loop_filter_simple(dst+ 4*linesize, linesize, bedge_lim);
1365
        s->vp8dsp.vp8_v_loop_filter_simple(dst+ 8*linesize, linesize, bedge_lim);
1366
        s->vp8dsp.vp8_v_loop_filter_simple(dst+12*linesize, linesize, bedge_lim);
1364 1367
    }
1365 1368
}
1366 1369

  

Also available in: Unified diff