Mercurial > mplayer.hg

comparison postproc/swscale.c @ 5937:4b18bf35f153

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
printf to mp_msg
author albeu
date Thu, 02 May 2002 11:00:16 +0000
parents eb87391a5292
children 31e465fda59c
comparison
equal deleted inserted replaced
5936:d0f040d8f53c 5937:4b18bf35f153
60 #include "../cpudetect.h" 60 #include "../cpudetect.h"
61 #include "../bswap.h" 61 #include "../bswap.h"
62 #include "../libvo/img_format.h" 62 #include "../libvo/img_format.h"
63 #include "rgb2rgb.h" 63 #include "rgb2rgb.h"
64 #include "../libvo/fastmemcpy.h" 64 #include "../libvo/fastmemcpy.h"
65 #include "../mp_msg.h"
65 #undef MOVNTQ 66 #undef MOVNTQ
66 #undef PAVGB 67 #undef PAVGB
67 68
68 //#undef HAVE_MMX2 69 //#undef HAVE_MMX2
69 //#define HAVE_3DNOW 70 //#define HAVE_3DNOW
934 filterSize= (minFilterSize +(filterAlign-1)) & (~(filterAlign-1)); 935 filterSize= (minFilterSize +(filterAlign-1)) & (~(filterAlign-1));
935 ASSERT(filterSize > 0) 936 ASSERT(filterSize > 0)
936 filter= (double*)memalign(8, filterSize*dstW*sizeof(double)); 937 filter= (double*)memalign(8, filterSize*dstW*sizeof(double));
937 *outFilterSize= filterSize; 938 *outFilterSize= filterSize;
938 939
939 if((flags&SWS_PRINT_INFO) && verbose) 940 if(flags&SWS_PRINT_INFO)
940 printf("SwScaler: reducing / aligning filtersize %d -> %d\n", filter2Size, filterSize); 941 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: reducing / aligning filtersize %d -> %d\n", filter2Size, filterSize);
941 /* try to reduce the filter-size (step2 reduce it) */ 942 /* try to reduce the filter-size (step2 reduce it) */
942 for(i=0; i<dstW; i++) 943 for(i=0; i<dstW; i++)
943 { 944 {
944 int j; 945 int j;
945 946
1450 if(srcFormat==IMGFMT_Y8) srcFormat=IMGFMT_Y800; 1451 if(srcFormat==IMGFMT_Y8) srcFormat=IMGFMT_Y800;
1451 if(dstFormat==IMGFMT_Y8) dstFormat=IMGFMT_Y800; 1452 if(dstFormat==IMGFMT_Y8) dstFormat=IMGFMT_Y800;
1452 1453
1453 if(!isSupportedIn(srcFormat)) 1454 if(!isSupportedIn(srcFormat))
1454 { 1455 {
1455 fprintf(stderr, "swScaler: %s is not supported as input format\n", vo_format_name(srcFormat)); 1456 mp_msg(MSGT_SWS,MSGL_ERR,"swScaler: %s is not supported as input format\n", vo_format_name(srcFormat));
1456 return NULL; 1457 return NULL;
1457 } 1458 }
1458 if(!isSupportedOut(dstFormat)) 1459 if(!isSupportedOut(dstFormat))
1459 { 1460 {
1460 fprintf(stderr, "swScaler: %s is not supported as output format\n", vo_format_name(dstFormat)); 1461 mp_msg(MSGT_SWS,MSGL_ERR,"swScaler: %s is not supported as output format\n", vo_format_name(dstFormat));
1461 return NULL; 1462 return NULL;
1462 } 1463 }
1463 1464
1464 /* sanity check */ 1465 /* sanity check */
1465 if(srcW<4 || srcH<1 || dstW<8 || dstH<1) //FIXME check if these are enough and try to lowwer them after fixing the relevant parts of the code 1466 if(srcW<4 || srcH<1 || dstW<8 || dstH<1) //FIXME check if these are enough and try to lowwer them after fixing the relevant parts of the code
1466 { 1467 {
1467 fprintf(stderr, "swScaler: %dx%d -> %dx%d is invalid scaling dimension\n", 1468 mp_msg(MSGT_SWS,MSGL_ERR,"swScaler: %dx%d -> %dx%d is invalid scaling dimension\n",
1468 srcW, srcH, dstW, dstH); 1469 srcW, srcH, dstW, dstH);
1469 return NULL; 1470 return NULL;
1470 } 1471 }
1471 1472
1472 if(!dstFilter) dstFilter= &dummyFilter; 1473 if(!dstFilter) dstFilter= &dummyFilter;
1511 yuv2rgb_init( dstFormat&0xFF /* =bpp */, MODE_RGB); 1512 yuv2rgb_init( dstFormat&0xFF /* =bpp */, MODE_RGB);
1512 #endif 1513 #endif
1513 c->swScale= planarYuvToBgr; 1514 c->swScale= planarYuvToBgr;
1514 1515
1515 if(flags&SWS_PRINT_INFO) 1516 if(flags&SWS_PRINT_INFO)
1516 printf("SwScaler: using unscaled %s -> %s special converter\n", 1517 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using unscaled %s -> %s special converter\n",
1517 vo_format_name(srcFormat), vo_format_name(dstFormat)); 1518 vo_format_name(srcFormat), vo_format_name(dstFormat));
1518 return c; 1519 return c;
1519 } 1520 }
1520 1521
1521 /* simple copy */ 1522 /* simple copy */
1522 if(srcFormat == dstFormat || (isPlanarYUV(srcFormat) && isPlanarYUV(dstFormat))) 1523 if(srcFormat == dstFormat || (isPlanarYUV(srcFormat) && isPlanarYUV(dstFormat)))
1523 { 1524 {
1524 c->swScale= simpleCopy; 1525 c->swScale= simpleCopy;
1525 1526
1526 if(flags&SWS_PRINT_INFO) 1527 if(flags&SWS_PRINT_INFO)
1527 printf("SwScaler: using unscaled %s -> %s special converter\n", 1528 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using unscaled %s -> %s special converter\n",
1528 vo_format_name(srcFormat), vo_format_name(dstFormat)); 1529 vo_format_name(srcFormat), vo_format_name(dstFormat));
1529 return c; 1530 return c;
1530 } 1531 }
1531 1532
1532 /* bgr32to24 & rgb32to24*/ 1533 /* bgr32to24 & rgb32to24*/
1534 ||(srcFormat==IMGFMT_RGB32 && dstFormat==IMGFMT_RGB24)) 1535 ||(srcFormat==IMGFMT_RGB32 && dstFormat==IMGFMT_RGB24))
1535 { 1536 {
1536 c->swScale= bgr32to24Wrapper; 1537 c->swScale= bgr32to24Wrapper;
1537 1538
1538 if(flags&SWS_PRINT_INFO) 1539 if(flags&SWS_PRINT_INFO)
1539 printf("SwScaler: using unscaled %s -> %s special converter\n", 1540 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using unscaled %s -> %s special converter\n",
1540 vo_format_name(srcFormat), vo_format_name(dstFormat)); 1541 vo_format_name(srcFormat), vo_format_name(dstFormat));
1541 return c; 1542 return c;
1542 } 1543 }
1543 1544
1544 /* bgr24to32 & rgb24to32*/ 1545 /* bgr24to32 & rgb24to32*/
1546 ||(srcFormat==IMGFMT_RGB24 && dstFormat==IMGFMT_RGB32)) 1547 ||(srcFormat==IMGFMT_RGB24 && dstFormat==IMGFMT_RGB32))
1547 { 1548 {
1548 c->swScale= bgr24to32Wrapper; 1549 c->swScale= bgr24to32Wrapper;
1549 1550
1550 if(flags&SWS_PRINT_INFO) 1551 if(flags&SWS_PRINT_INFO)
1551 printf("SwScaler: using unscaled %s -> %s special converter\n", 1552 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using unscaled %s -> %s special converter\n",
1552 vo_format_name(srcFormat), vo_format_name(dstFormat)); 1553 vo_format_name(srcFormat), vo_format_name(dstFormat));
1553 return c; 1554 return c;
1554 } 1555 }
1555 1556
1556 /* bgr15to16 */ 1557 /* bgr15to16 */
1557 if(srcFormat==IMGFMT_BGR15 && dstFormat==IMGFMT_BGR16) 1558 if(srcFormat==IMGFMT_BGR15 && dstFormat==IMGFMT_BGR16)
1558 { 1559 {
1559 c->swScale= bgr15to16Wrapper; 1560 c->swScale= bgr15to16Wrapper;
1560 1561
1561 if(flags&SWS_PRINT_INFO) 1562 if(flags&SWS_PRINT_INFO)
1562 printf("SwScaler: using unscaled %s -> %s special converter\n", 1563 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using unscaled %s -> %s special converter\n",
1563 vo_format_name(srcFormat), vo_format_name(dstFormat)); 1564 vo_format_name(srcFormat), vo_format_name(dstFormat));
1564 return c; 1565 return c;
1565 } 1566 }
1566 1567
1567 /* bgr24toYV12 */ 1568 /* bgr24toYV12 */
1568 if(srcFormat==IMGFMT_BGR24 && dstFormat==IMGFMT_YV12) 1569 if(srcFormat==IMGFMT_BGR24 && dstFormat==IMGFMT_YV12)
1569 { 1570 {
1570 c->swScale= bgr24toyv12Wrapper; 1571 c->swScale= bgr24toyv12Wrapper;
1571 1572
1572 if(flags&SWS_PRINT_INFO) 1573 if(flags&SWS_PRINT_INFO)
1573 printf("SwScaler: using unscaled %s -> %s special converter\n", 1574 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using unscaled %s -> %s special converter\n",
1574 vo_format_name(srcFormat), vo_format_name(dstFormat)); 1575 vo_format_name(srcFormat), vo_format_name(dstFormat));
1575 return c; 1576 return c;
1576 } 1577 }
1577 } 1578 }
1578 1579
1580 { 1581 {
1581 c->canMMX2BeUsed= (dstW >=srcW && (dstW&31)==0 && (srcW&15)==0) ? 1 : 0; 1582 c->canMMX2BeUsed= (dstW >=srcW && (dstW&31)==0 && (srcW&15)==0) ? 1 : 0;
1582 if(!c->canMMX2BeUsed && dstW >=srcW && (srcW&15)==0 && (flags&SWS_FAST_BILINEAR)) 1583 if(!c->canMMX2BeUsed && dstW >=srcW && (srcW&15)==0 && (flags&SWS_FAST_BILINEAR))
1583 { 1584 {
1584 if(flags&SWS_PRINT_INFO) 1585 if(flags&SWS_PRINT_INFO)
1585 fprintf(stderr, "SwScaler: output Width is not a multiple of 32 -> no MMX2 scaler\n"); 1586 mp_msg(MSGT_SWS,MSGL_WARN,"SwScaler: output Width is not a multiple of 32 -> no MMX2 scaler\n");
1586 } 1587 }
1587 } 1588 }
1588 else 1589 else
1589 c->canMMX2BeUsed=0; 1590 c->canMMX2BeUsed=0;
1590 1591
1718 char *dither= " dithered"; 1719 char *dither= " dithered";
1719 #else 1720 #else
1720 char *dither= ""; 1721 char *dither= "";
1721 #endif 1722 #endif
1722 if(flags&SWS_FAST_BILINEAR) 1723 if(flags&SWS_FAST_BILINEAR)
1723 fprintf(stderr, "\nSwScaler: FAST_BILINEAR scaler, "); 1724 mp_msg(MSGT_SWS,MSGL_INFO,"\nSwScaler: FAST_BILINEAR scaler, ");
1724 else if(flags&SWS_BILINEAR) 1725 else if(flags&SWS_BILINEAR)
1725 fprintf(stderr, "\nSwScaler: BILINEAR scaler, "); 1726 mp_msg(MSGT_SWS,MSGL_INFO,"\nSwScaler: BILINEAR scaler, ");
1726 else if(flags&SWS_BICUBIC) 1727 else if(flags&SWS_BICUBIC)
1727 fprintf(stderr, "\nSwScaler: BICUBIC scaler, "); 1728 mp_msg(MSGT_SWS,MSGL_INFO,"\nSwScaler: BICUBIC scaler, ");
1728 else if(flags&SWS_X) 1729 else if(flags&SWS_X)
1729 fprintf(stderr, "\nSwScaler: Experimental scaler, "); 1730 mp_msg(MSGT_SWS,MSGL_INFO,"\nSwScaler: Experimental scaler, ");
1730 else if(flags&SWS_POINT) 1731 else if(flags&SWS_POINT)
1731 fprintf(stderr, "\nSwScaler: Nearest Neighbor / POINT scaler, "); 1732 mp_msg(MSGT_SWS,MSGL_INFO,"\nSwScaler: Nearest Neighbor / POINT scaler, ");
1732 else if(flags&SWS_AREA) 1733 else if(flags&SWS_AREA)
1733 fprintf(stderr, "\nSwScaler: Area Averageing scaler, "); 1734 mp_msg(MSGT_SWS,MSGL_INFO,"\nSwScaler: Area Averageing scaler, ");
1734 else 1735 else
1735 fprintf(stderr, "\nSwScaler: ehh flags invalid?! "); 1736 mp_msg(MSGT_SWS,MSGL_INFO,"\nSwScaler: ehh flags invalid?! ");
1736 1737
1737 if(dstFormat==IMGFMT_BGR15 || dstFormat==IMGFMT_BGR16) 1738 if(dstFormat==IMGFMT_BGR15 || dstFormat==IMGFMT_BGR16)
1738 fprintf(stderr, "from %s to%s %s ", 1739 mp_msg(MSGT_SWS,MSGL_INFO,"from %s to%s %s ",
1739 vo_format_name(srcFormat), dither, vo_format_name(dstFormat)); 1740 vo_format_name(srcFormat), dither, vo_format_name(dstFormat));
1740 else 1741 else
1741 fprintf(stderr, "from %s to %s ", 1742 mp_msg(MSGT_SWS,MSGL_INFO,"from %s to %s ",
1742 vo_format_name(srcFormat), vo_format_name(dstFormat)); 1743 vo_format_name(srcFormat), vo_format_name(dstFormat));
1743 1744
1744 if(cpuCaps.hasMMX2) 1745 if(cpuCaps.hasMMX2)
1745 fprintf(stderr, "using MMX2\n"); 1746 mp_msg(MSGT_SWS,MSGL_INFO,"using MMX2\n");
1746 else if(cpuCaps.has3DNow) 1747 else if(cpuCaps.has3DNow)
1747 fprintf(stderr, "using 3DNOW\n"); 1748 mp_msg(MSGT_SWS,MSGL_INFO,"using 3DNOW\n");
1748 else if(cpuCaps.hasMMX) 1749 else if(cpuCaps.hasMMX)
1749 fprintf(stderr, "using MMX\n"); 1750 mp_msg(MSGT_SWS,MSGL_INFO,"using MMX\n");
1750 else 1751 else
1751 fprintf(stderr, "using C\n"); 1752 mp_msg(MSGT_SWS,MSGL_INFO,"using C\n");
1752 } 1753 }
1753 1754
1754 if((flags & SWS_PRINT_INFO) && verbose) 1755 if((flags & SWS_PRINT_INFO) && verbose)
1755 { 1756 {
1756 if(cpuCaps.hasMMX) 1757 if(cpuCaps.hasMMX)
1757 { 1758 {
1758 if(c->canMMX2BeUsed && (flags&SWS_FAST_BILINEAR)) 1759 if(c->canMMX2BeUsed && (flags&SWS_FAST_BILINEAR))
1759 printf("SwScaler: using FAST_BILINEAR MMX2 scaler for horizontal scaling\n"); 1760 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using FAST_BILINEAR MMX2 scaler for horizontal scaling\n");
1760 else 1761 else
1761 { 1762 {
1762 if(c->hLumFilterSize==4) 1763 if(c->hLumFilterSize==4)
1763 printf("SwScaler: using 4-tap MMX scaler for horizontal luminance scaling\n"); 1764 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using 4-tap MMX scaler for horizontal luminance scaling\n");
1764 else if(c->hLumFilterSize==8) 1765 else if(c->hLumFilterSize==8)
1765 printf("SwScaler: using 8-tap MMX scaler for horizontal luminance scaling\n"); 1766 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using 8-tap MMX scaler for horizontal luminance scaling\n");
1766 else 1767 else
1767 printf("SwScaler: using n-tap MMX scaler for horizontal luminance scaling\n"); 1768 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using n-tap MMX scaler for horizontal luminance scaling\n");
1768 1769
1769 if(c->hChrFilterSize==4) 1770 if(c->hChrFilterSize==4)
1770 printf("SwScaler: using 4-tap MMX scaler for horizontal chrominance scaling\n"); 1771 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using 4-tap MMX scaler for horizontal chrominance scaling\n");
1771 else if(c->hChrFilterSize==8) 1772 else if(c->hChrFilterSize==8)
1772 printf("SwScaler: using 8-tap MMX scaler for horizontal chrominance scaling\n"); 1773 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using 8-tap MMX scaler for horizontal chrominance scaling\n");
1773 else 1774 else
1774 printf("SwScaler: using n-tap MMX scaler for horizontal chrominance scaling\n"); 1775 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using n-tap MMX scaler for horizontal chrominance scaling\n");
1775 } 1776 }
1776 } 1777 }
1777 else 1778 else
1778 { 1779 {
1779 #ifdef ARCH_X86 1780 #ifdef ARCH_X86
1780 printf("SwScaler: using X86-Asm scaler for horizontal scaling\n"); 1781 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using X86-Asm scaler for horizontal scaling\n");
1781 #else 1782 #else
1782 if(flags & SWS_FAST_BILINEAR) 1783 if(flags & SWS_FAST_BILINEAR)
1783 printf("SwScaler: using FAST_BILINEAR C scaler for horizontal scaling\n"); 1784 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using FAST_BILINEAR C scaler for horizontal scaling\n");
1784 else 1785 else
1785 printf("SwScaler: using C scaler for horizontal scaling\n"); 1786 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using C scaler for horizontal scaling\n");
1786 #endif 1787 #endif
1787 } 1788 }
1788 if(isPlanarYUV(dstFormat)) 1789 if(isPlanarYUV(dstFormat))
1789 { 1790 {
1790 if(c->vLumFilterSize==1) 1791 if(c->vLumFilterSize==1)
1791 printf("SwScaler: using 1-tap %s \"scaler\" for vertical scaling (YV12 like)\n", cpuCaps.hasMMX ? "MMX" : "C"); 1792 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using 1-tap %s \"scaler\" for vertical scaling (YV12 like)\n", cpuCaps.hasMMX ? "MMX" : "C");
1792 else 1793 else
1793 printf("SwScaler: using n-tap %s scaler for vertical scaling (YV12 like)\n", cpuCaps.hasMMX ? "MMX" : "C"); 1794 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using n-tap %s scaler for vertical scaling (YV12 like)\n", cpuCaps.hasMMX ? "MMX" : "C");
1794 } 1795 }
1795 else 1796 else
1796 { 1797 {
1797 if(c->vLumFilterSize==1 && c->vChrFilterSize==2) 1798 if(c->vLumFilterSize==1 && c->vChrFilterSize==2)
1798 printf("SwScaler: using 1-tap %s \"scaler\" for vertical luminance scaling (BGR)\n" 1799 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using 1-tap %s \"scaler\" for vertical luminance scaling (BGR)\n"
1799 "SwScaler: 2-tap scaler for vertical chrominance scaling (BGR)\n",cpuCaps.hasMMX ? "MMX" : "C"); 1800 "SwScaler: 2-tap scaler for vertical chrominance scaling (BGR)\n",cpuCaps.hasMMX ? "MMX" : "C");
1800 else if(c->vLumFilterSize==2 && c->vChrFilterSize==2) 1801 else if(c->vLumFilterSize==2 && c->vChrFilterSize==2)
1801 printf("SwScaler: using 2-tap linear %s scaler for vertical scaling (BGR)\n", cpuCaps.hasMMX ? "MMX" : "C"); 1802 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using 2-tap linear %s scaler for vertical scaling (BGR)\n", cpuCaps.hasMMX ? "MMX" : "C");
1802 else 1803 else
1803 printf("SwScaler: using n-tap %s scaler for vertical scaling (BGR)\n", cpuCaps.hasMMX ? "MMX" : "C"); 1804 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using n-tap %s scaler for vertical scaling (BGR)\n", cpuCaps.hasMMX ? "MMX" : "C");
1804 } 1805 }
1805 1806
1806 if(dstFormat==IMGFMT_BGR24) 1807 if(dstFormat==IMGFMT_BGR24)
1807 printf("SwScaler: using %s YV12->BGR24 Converter\n", 1808 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using %s YV12->BGR24 Converter\n",
1808 cpuCaps.hasMMX2 ? "MMX2" : (cpuCaps.hasMMX ? "MMX" : "C")); 1809 cpuCaps.hasMMX2 ? "MMX2" : (cpuCaps.hasMMX ? "MMX" : "C"));
1809 else if(dstFormat==IMGFMT_BGR32) 1810 else if(dstFormat==IMGFMT_BGR32)
1810 printf("SwScaler: using %s YV12->BGR32 Converter\n", cpuCaps.hasMMX ? "MMX" : "C"); 1811 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using %s YV12->BGR32 Converter\n", cpuCaps.hasMMX ? "MMX" : "C");
1811 else if(dstFormat==IMGFMT_BGR16) 1812 else if(dstFormat==IMGFMT_BGR16)
1812 printf("SwScaler: using %s YV12->BGR16 Converter\n", cpuCaps.hasMMX ? "MMX" : "C"); 1813 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using %s YV12->BGR16 Converter\n", cpuCaps.hasMMX ? "MMX" : "C");
1813 else if(dstFormat==IMGFMT_BGR15) 1814 else if(dstFormat==IMGFMT_BGR15)
1814 printf("SwScaler: using %s YV12->BGR15 Converter\n", cpuCaps.hasMMX ? "MMX" : "C"); 1815 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: using %s YV12->BGR15 Converter\n", cpuCaps.hasMMX ? "MMX" : "C");
1815 1816
1816 printf("SwScaler: %dx%d -> %dx%d\n", srcW, srcH, dstW, dstH); 1817 mp_msg(MSGT_SWS,MSGL_V,"SwScaler: %dx%d -> %dx%d\n", srcW, srcH, dstW, dstH);
1817 } 1818 }
1818 if((flags & SWS_PRINT_INFO) && verbose>1) 1819 if((flags & SWS_PRINT_INFO) && verbose>1)
1819 { 1820 {
1820 printf("SwScaler:Lum srcW=%d srcH=%d dstW=%d dstH=%d xInc=%d yInc=%d\n", 1821 mp_msg(MSGT_SWS,MSGL_DBG2,"SwScaler:Lum srcW=%d srcH=%d dstW=%d dstH=%d xInc=%d yInc=%d\n",
1821 c->srcW, c->srcH, c->dstW, c->dstH, c->lumXInc, c->lumYInc); 1822 c->srcW, c->srcH, c->dstW, c->dstH, c->lumXInc, c->lumYInc);
1822 printf("SwScaler:Chr srcW=%d srcH=%d dstW=%d dstH=%d xInc=%d yInc=%d\n", 1823 mp_msg(MSGT_SWS,MSGL_DBG2,"SwScaler:Chr srcW=%d srcH=%d dstW=%d dstH=%d xInc=%d yInc=%d\n",
1823 c->chrSrcW, c->chrSrcH, c->chrDstW, c->chrDstH, c->chrXInc, c->chrYInc); 1824 c->chrSrcW, c->chrSrcH, c->chrDstW, c->chrDstH, c->chrXInc, c->chrYInc);
1824 } 1825 }
1825 1826
1826 c->swScale= swScale; 1827 c->swScale= swScale;
1827 return c; 1828 return c;