comparison h264.c @ 1282:8988af3ae1e8 libavcodec

Warning and compatibility fixes.
author mellum
date Sat, 24 May 2003 18:48:30 +0000
parents 2498a7045b37
children 26c44d2433c1
comparison
equal deleted inserted replaced
1281:37176fafe11e 1282:8988af3ae1e8
1482 src[2+1*stride]= 1482 src[2+1*stride]=
1483 src[3+2*stride]=(lt + 2*t0 + t1 + 2)>>2; 1483 src[3+2*stride]=(lt + 2*t0 + t1 + 2)>>2;
1484 src[2+0*stride]= 1484 src[2+0*stride]=
1485 src[3+1*stride]=(t0 + 2*t1 + t2 + 2)>>2; 1485 src[3+1*stride]=(t0 + 2*t1 + t2 + 2)>>2;
1486 src[3+0*stride]=(t1 + 2*t2 + t3 + 2)>>2; 1486 src[3+0*stride]=(t1 + 2*t2 + t3 + 2)>>2;
1487 }; 1487 }
1488 1488
1489 static void pred4x4_down_left_c(uint8_t *src, uint8_t *topright, int stride){ 1489 static void pred4x4_down_left_c(uint8_t *src, uint8_t *topright, int stride){
1490 LOAD_TOP_EDGE 1490 LOAD_TOP_EDGE
1491 LOAD_TOP_RIGHT_EDGE 1491 LOAD_TOP_RIGHT_EDGE
1492 // LOAD_LEFT_EDGE 1492 // LOAD_LEFT_EDGE
1505 src[2+2*stride]= 1505 src[2+2*stride]=
1506 src[1+3*stride]=(t4 + t6 + 2*t5 + 2)>>2; 1506 src[1+3*stride]=(t4 + t6 + 2*t5 + 2)>>2;
1507 src[3+2*stride]= 1507 src[3+2*stride]=
1508 src[2+3*stride]=(t5 + t7 + 2*t6 + 2)>>2; 1508 src[2+3*stride]=(t5 + t7 + 2*t6 + 2)>>2;
1509 src[3+3*stride]=(t6 + 3*t7 + 2)>>2; 1509 src[3+3*stride]=(t6 + 3*t7 + 2)>>2;
1510 }; 1510 }
1511 1511
1512 static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride){ 1512 static void pred4x4_vertical_right_c(uint8_t *src, uint8_t *topright, int stride){
1513 const int lt= src[-1-1*stride]; 1513 const int lt= src[-1-1*stride];
1514 LOAD_TOP_EDGE 1514 LOAD_TOP_EDGE
1515 LOAD_LEFT_EDGE 1515 LOAD_LEFT_EDGE
1529 src[2+1*stride]= 1529 src[2+1*stride]=
1530 src[3+3*stride]=(t0 + 2*t1 + t2 + 2)>>2; 1530 src[3+3*stride]=(t0 + 2*t1 + t2 + 2)>>2;
1531 src[3+1*stride]=(t1 + 2*t2 + t3 + 2)>>2; 1531 src[3+1*stride]=(t1 + 2*t2 + t3 + 2)>>2;
1532 src[0+2*stride]=(lt + 2*l0 + l1 + 2)>>2; 1532 src[0+2*stride]=(lt + 2*l0 + l1 + 2)>>2;
1533 src[0+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; 1533 src[0+3*stride]=(l0 + 2*l1 + l2 + 2)>>2;
1534 }; 1534 }
1535 1535
1536 static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride){ 1536 static void pred4x4_vertical_left_c(uint8_t *src, uint8_t *topright, int stride){
1537 LOAD_TOP_EDGE 1537 LOAD_TOP_EDGE
1538 LOAD_TOP_RIGHT_EDGE 1538 LOAD_TOP_RIGHT_EDGE
1539 const __attribute__((unused)) int unu= t7; 1539 const __attribute__((unused)) int unu= t7;
1552 src[2+1*stride]= 1552 src[2+1*stride]=
1553 src[1+3*stride]=(t2 + 2*t3 + t4 + 2)>>2; 1553 src[1+3*stride]=(t2 + 2*t3 + t4 + 2)>>2;
1554 src[3+1*stride]= 1554 src[3+1*stride]=
1555 src[2+3*stride]=(t3 + 2*t4 + t5 + 2)>>2; 1555 src[2+3*stride]=(t3 + 2*t4 + t5 + 2)>>2;
1556 src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2; 1556 src[3+3*stride]=(t4 + 2*t5 + t6 + 2)>>2;
1557 }; 1557 }
1558 1558
1559 static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride){ 1559 static void pred4x4_horizontal_up_c(uint8_t *src, uint8_t *topright, int stride){
1560 LOAD_LEFT_EDGE 1560 LOAD_LEFT_EDGE
1561 1561
1562 src[0+0*stride]=(l0 + l1 + 1)>>1; 1562 src[0+0*stride]=(l0 + l1 + 1)>>1;
1573 src[1+3*stride]= 1573 src[1+3*stride]=
1574 src[0+3*stride]= 1574 src[0+3*stride]=
1575 src[2+2*stride]= 1575 src[2+2*stride]=
1576 src[2+3*stride]= 1576 src[2+3*stride]=
1577 src[3+3*stride]=l3; 1577 src[3+3*stride]=l3;
1578 }; 1578 }
1579 1579
1580 static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int stride){ 1580 static void pred4x4_horizontal_down_c(uint8_t *src, uint8_t *topright, int stride){
1581 const int lt= src[-1-1*stride]; 1581 const int lt= src[-1-1*stride];
1582 LOAD_TOP_EDGE 1582 LOAD_TOP_EDGE
1583 LOAD_LEFT_EDGE 1583 LOAD_LEFT_EDGE
1597 src[2+3*stride]=(l1 + l2+ 1)>>1; 1597 src[2+3*stride]=(l1 + l2+ 1)>>1;
1598 src[1+2*stride]= 1598 src[1+2*stride]=
1599 src[3+3*stride]=(l0 + 2*l1 + l2 + 2)>>2; 1599 src[3+3*stride]=(l0 + 2*l1 + l2 + 2)>>2;
1600 src[0+3*stride]=(l2 + l3 + 1)>>1; 1600 src[0+3*stride]=(l2 + l3 + 1)>>1;
1601 src[1+3*stride]=(l1 + 2*l2 + l3 + 2)>>2; 1601 src[1+3*stride]=(l1 + 2*l2 + l3 + 2)>>2;
1602 }; 1602 }
1603 1603
1604 static void pred16x16_vertical_c(uint8_t *src, int stride){ 1604 static void pred16x16_vertical_c(uint8_t *src, int stride){
1605 int i; 1605 int i;
1606 const uint32_t a= ((uint32_t*)(src-stride))[0]; 1606 const uint32_t a= ((uint32_t*)(src-stride))[0];
1607 const uint32_t b= ((uint32_t*)(src-stride))[1]; 1607 const uint32_t b= ((uint32_t*)(src-stride))[1];