Mercurial > libavcodec.hg
comparison dsputil.c @ 6054:de71ee8112f4 libavcodec
More consistent { placement.
author | michael |
---|---|
date | Fri, 21 Dec 2007 10:20:10 +0000 |
parents | f4607985f888 |
children | 558c1fd0ee72 |
comparison
equal
deleted
inserted
replaced
6053:f4607985f888 | 6054:de71ee8112f4 |
---|---|
1439 int i;\ | 1439 int i;\ |
1440 \ | 1440 \ |
1441 assert(x<8 && y<8 && x>=0 && y>=0);\ | 1441 assert(x<8 && y<8 && x>=0 && y>=0);\ |
1442 \ | 1442 \ |
1443 if(D){\ | 1443 if(D){\ |
1444 for(i=0; i<h; i++)\ | 1444 for(i=0; i<h; i++){\ |
1445 {\ | |
1446 OP(dst[0], (A*src[0] + B*src[1] + C*src[stride+0] + D*src[stride+1]));\ | 1445 OP(dst[0], (A*src[0] + B*src[1] + C*src[stride+0] + D*src[stride+1]));\ |
1447 OP(dst[1], (A*src[1] + B*src[2] + C*src[stride+1] + D*src[stride+2]));\ | 1446 OP(dst[1], (A*src[1] + B*src[2] + C*src[stride+1] + D*src[stride+2]));\ |
1448 dst+= stride;\ | 1447 dst+= stride;\ |
1449 src+= stride;\ | 1448 src+= stride;\ |
1450 }\ | 1449 }\ |
1451 }else{\ | 1450 }else{\ |
1452 const int E= B+C;\ | 1451 const int E= B+C;\ |
1453 const int step= C ? stride : 1;\ | 1452 const int step= C ? stride : 1;\ |
1454 for(i=0; i<h; i++)\ | 1453 for(i=0; i<h; i++){\ |
1455 {\ | |
1456 OP(dst[0], (A*src[0] + E*src[step+0]));\ | 1454 OP(dst[0], (A*src[0] + E*src[step+0]));\ |
1457 OP(dst[1], (A*src[1] + E*src[step+1]));\ | 1455 OP(dst[1], (A*src[1] + E*src[step+1]));\ |
1458 dst+= stride;\ | 1456 dst+= stride;\ |
1459 src+= stride;\ | 1457 src+= stride;\ |
1460 }\ | 1458 }\ |
1469 int i;\ | 1467 int i;\ |
1470 \ | 1468 \ |
1471 assert(x<8 && y<8 && x>=0 && y>=0);\ | 1469 assert(x<8 && y<8 && x>=0 && y>=0);\ |
1472 \ | 1470 \ |
1473 if(D){\ | 1471 if(D){\ |
1474 for(i=0; i<h; i++)\ | 1472 for(i=0; i<h; i++){\ |
1475 {\ | |
1476 OP(dst[0], (A*src[0] + B*src[1] + C*src[stride+0] + D*src[stride+1]));\ | 1473 OP(dst[0], (A*src[0] + B*src[1] + C*src[stride+0] + D*src[stride+1]));\ |
1477 OP(dst[1], (A*src[1] + B*src[2] + C*src[stride+1] + D*src[stride+2]));\ | 1474 OP(dst[1], (A*src[1] + B*src[2] + C*src[stride+1] + D*src[stride+2]));\ |
1478 OP(dst[2], (A*src[2] + B*src[3] + C*src[stride+2] + D*src[stride+3]));\ | 1475 OP(dst[2], (A*src[2] + B*src[3] + C*src[stride+2] + D*src[stride+3]));\ |
1479 OP(dst[3], (A*src[3] + B*src[4] + C*src[stride+3] + D*src[stride+4]));\ | 1476 OP(dst[3], (A*src[3] + B*src[4] + C*src[stride+3] + D*src[stride+4]));\ |
1480 dst+= stride;\ | 1477 dst+= stride;\ |
1481 src+= stride;\ | 1478 src+= stride;\ |
1482 }\ | 1479 }\ |
1483 }else{\ | 1480 }else{\ |
1484 const int E= B+C;\ | 1481 const int E= B+C;\ |
1485 const int step= C ? stride : 1;\ | 1482 const int step= C ? stride : 1;\ |
1486 for(i=0; i<h; i++)\ | 1483 for(i=0; i<h; i++){\ |
1487 {\ | |
1488 OP(dst[0], (A*src[0] + E*src[step+0]));\ | 1484 OP(dst[0], (A*src[0] + E*src[step+0]));\ |
1489 OP(dst[1], (A*src[1] + E*src[step+1]));\ | 1485 OP(dst[1], (A*src[1] + E*src[step+1]));\ |
1490 OP(dst[2], (A*src[2] + E*src[step+2]));\ | 1486 OP(dst[2], (A*src[2] + E*src[step+2]));\ |
1491 OP(dst[3], (A*src[3] + E*src[step+3]));\ | 1487 OP(dst[3], (A*src[3] + E*src[step+3]));\ |
1492 dst+= stride;\ | 1488 dst+= stride;\ |
1503 int i;\ | 1499 int i;\ |
1504 \ | 1500 \ |
1505 assert(x<8 && y<8 && x>=0 && y>=0);\ | 1501 assert(x<8 && y<8 && x>=0 && y>=0);\ |
1506 \ | 1502 \ |
1507 if(D){\ | 1503 if(D){\ |
1508 for(i=0; i<h; i++)\ | 1504 for(i=0; i<h; i++){\ |
1509 {\ | |
1510 OP(dst[0], (A*src[0] + B*src[1] + C*src[stride+0] + D*src[stride+1]));\ | 1505 OP(dst[0], (A*src[0] + B*src[1] + C*src[stride+0] + D*src[stride+1]));\ |
1511 OP(dst[1], (A*src[1] + B*src[2] + C*src[stride+1] + D*src[stride+2]));\ | 1506 OP(dst[1], (A*src[1] + B*src[2] + C*src[stride+1] + D*src[stride+2]));\ |
1512 OP(dst[2], (A*src[2] + B*src[3] + C*src[stride+2] + D*src[stride+3]));\ | 1507 OP(dst[2], (A*src[2] + B*src[3] + C*src[stride+2] + D*src[stride+3]));\ |
1513 OP(dst[3], (A*src[3] + B*src[4] + C*src[stride+3] + D*src[stride+4]));\ | 1508 OP(dst[3], (A*src[3] + B*src[4] + C*src[stride+3] + D*src[stride+4]));\ |
1514 OP(dst[4], (A*src[4] + B*src[5] + C*src[stride+4] + D*src[stride+5]));\ | 1509 OP(dst[4], (A*src[4] + B*src[5] + C*src[stride+4] + D*src[stride+5]));\ |
1519 src+= stride;\ | 1514 src+= stride;\ |
1520 }\ | 1515 }\ |
1521 }else{\ | 1516 }else{\ |
1522 const int E= B+C;\ | 1517 const int E= B+C;\ |
1523 const int step= C ? stride : 1;\ | 1518 const int step= C ? stride : 1;\ |
1524 for(i=0; i<h; i++)\ | 1519 for(i=0; i<h; i++){\ |
1525 {\ | |
1526 OP(dst[0], (A*src[0] + E*src[step+0]));\ | 1520 OP(dst[0], (A*src[0] + E*src[step+0]));\ |
1527 OP(dst[1], (A*src[1] + E*src[step+1]));\ | 1521 OP(dst[1], (A*src[1] + E*src[step+1]));\ |
1528 OP(dst[2], (A*src[2] + E*src[step+2]));\ | 1522 OP(dst[2], (A*src[2] + E*src[step+2]));\ |
1529 OP(dst[3], (A*src[3] + E*src[step+3]));\ | 1523 OP(dst[3], (A*src[3] + E*src[step+3]));\ |
1530 OP(dst[4], (A*src[4] + E*src[step+4]));\ | 1524 OP(dst[4], (A*src[4] + E*src[step+4]));\ |