Mercurial > mplayer.hg

comparison libswscale/swscale.c @ 30314:a526bb14dea7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Factorize error message logging in rgb2rgbWrapper().
author stefano
date Sun, 17 Jan 2010 15:11:25 +0000
parents b33880a47b41
children 826b65c76d03
comparison
equal deleted inserted replaced
30313:7f7591482564 30314:a526bb14dea7
2083 case 0x64: conv= rgb16to24; break; 2083 case 0x64: conv= rgb16to24; break;
2084 case 0x68: conv= rgb32to24; break; 2084 case 0x68: conv= rgb32to24; break;
2085 case 0x83: conv= rgb15to32; break; 2085 case 0x83: conv= rgb15to32; break;
2086 case 0x84: conv= rgb16to32; break; 2086 case 0x84: conv= rgb16to32; break;
2087 case 0x86: conv= rgb24to32; break; 2087 case 0x86: conv= rgb24to32; break;
2088 default: av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
2089 sws_format_name(srcFormat), sws_format_name(dstFormat)); break;
2090 } 2088 }
2091 } else if ( (isBGR(srcFormat) && isRGB(dstFormat)) 2089 } else if ( (isBGR(srcFormat) && isRGB(dstFormat))
2092 || (isRGB(srcFormat) && isBGR(dstFormat))) { 2090 || (isRGB(srcFormat) && isBGR(dstFormat))) {
2093 switch(srcId | (dstId<<4)) { 2091 switch(srcId | (dstId<<4)) {
2094 case 0x33: conv= rgb15tobgr15; break; 2092 case 0x33: conv= rgb15tobgr15; break;
2105 case 0x68: conv= rgb32tobgr24; break; 2103 case 0x68: conv= rgb32tobgr24; break;
2106 case 0x83: conv= rgb15tobgr32; break; 2104 case 0x83: conv= rgb15tobgr32; break;
2107 case 0x84: conv= rgb16tobgr32; break; 2105 case 0x84: conv= rgb16tobgr32; break;
2108 case 0x86: conv= rgb24tobgr32; break; 2106 case 0x86: conv= rgb24tobgr32; break;
2109 case 0x88: conv= rgb32tobgr32; break; 2107 case 0x88: conv= rgb32tobgr32; break;
2110 default: av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n", 2108 }
2111 sws_format_name(srcFormat), sws_format_name(dstFormat)); break; 2109 }
2112 } 2110
2113 } else { 2111 if (!conv) {
2114 av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n", 2112 av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
2115 sws_format_name(srcFormat), sws_format_name(dstFormat)); 2113 sws_format_name(srcFormat), sws_format_name(dstFormat));
2116 } 2114 } else {
2117
2118 if(conv) {
2119 const uint8_t *srcPtr= src[0]; 2115 const uint8_t *srcPtr= src[0];
2120 if(srcFormat == PIX_FMT_RGB32_1 || srcFormat == PIX_FMT_BGR32_1) 2116 if(srcFormat == PIX_FMT_RGB32_1 || srcFormat == PIX_FMT_BGR32_1)
2121 srcPtr += ALT32_CORR; 2117 srcPtr += ALT32_CORR;
2122 2118
2123 if (dstStride[0]*srcBpp == srcStride[0]*dstBpp && srcStride[0] > 0) 2119 if (dstStride[0]*srcBpp == srcStride[0]*dstBpp && srcStride[0] > 0)