Mercurial > mplayer.hg

comparison libswscale/swscale.c @ 30318:862c1c9d733b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Factorize error message logging, log it if the converter cannot be set.
author stefano
date Sun, 17 Jan 2010 23:07:37 +0000
parents 67b85934c374
children 841a6029e259
comparison
equal deleted inserted replaced
30317:67b85934c374 30318:862c1c9d733b
2030 const uint8_t *palette)=NULL; 2030 const uint8_t *palette)=NULL;
2031 int i; 2031 int i;
2032 uint8_t *dstPtr= dst[0] + dstStride[0]*srcSliceY; 2032 uint8_t *dstPtr= dst[0] + dstStride[0]*srcSliceY;
2033 const uint8_t *srcPtr= src[0]; 2033 const uint8_t *srcPtr= src[0];
2034 2034
2035 if (!usePal(srcFormat)) 2035 if (usePal(srcFormat)) {
2036 av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
2037 sws_format_name(srcFormat), sws_format_name(dstFormat));
2038 else {
2039 switch (dstFormat) { 2036 switch (dstFormat) {
2040 case PIX_FMT_RGB32 : conv = palette8topacked32; break; 2037 case PIX_FMT_RGB32 : conv = palette8topacked32; break;
2041 case PIX_FMT_BGR32 : conv = palette8topacked32; break; 2038 case PIX_FMT_BGR32 : conv = palette8topacked32; break;
2042 case PIX_FMT_BGR32_1: conv = palette8topacked32; break; 2039 case PIX_FMT_BGR32_1: conv = palette8topacked32; break;
2043 case PIX_FMT_RGB32_1: conv = palette8topacked32; break; 2040 case PIX_FMT_RGB32_1: conv = palette8topacked32; break;
2044 case PIX_FMT_RGB24 : conv = palette8topacked24; break; 2041 case PIX_FMT_RGB24 : conv = palette8topacked24; break;
2045 case PIX_FMT_BGR24 : conv = palette8topacked24; break; 2042 case PIX_FMT_BGR24 : conv = palette8topacked24; break;
2046 default: av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n", 2043 }
2047 sws_format_name(srcFormat), sws_format_name(dstFormat)); break; 2044 }
2048 } 2045
2049 } 2046 if (!conv)
2050 2047 av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
2051 if (conv) 2048 sws_format_name(srcFormat), sws_format_name(dstFormat));
2049 else {
2052 for (i=0; i<srcSliceH; i++) { 2050 for (i=0; i<srcSliceH; i++) {
2053 conv(srcPtr, dstPtr, c->srcW, (uint8_t *) c->pal_rgb); 2051 conv(srcPtr, dstPtr, c->srcW, (uint8_t *) c->pal_rgb);
2054 srcPtr+= srcStride[0]; 2052 srcPtr+= srcStride[0];
2055 dstPtr+= dstStride[0]; 2053 dstPtr+= dstStride[0];
2056 } 2054 }
2055 }
2057 2056
2058 return srcSliceH; 2057 return srcSliceH;
2059 } 2058 }
2060 2059
2061 /* {RGB,BGR}{15,16,24,32,32_1} -> {RGB,BGR}{15,16,24,32} */ 2060 /* {RGB,BGR}{15,16,24,32,32_1} -> {RGB,BGR}{15,16,24,32} */