Revision 22e8222f

View differences:

libswscale/swscale.c
39 39

  
40 40
/*
41 41
tested special converters (most are tested actually, but I did not write it down ...)
42
 YV12 -> BGR16
42
 YV12 -> BGR12/BGR16
43 43
 YV12 -> YV12
44 44
 BGR15 -> BGR16
45 45
 BGR16 -> BGR16
......
805 805
            }\
806 806
        }\
807 807
        break;\
808
    case PIX_FMT_RGB444BE:\
809
    case PIX_FMT_RGB444LE:\
810
    case PIX_FMT_BGR444BE:\
811
    case PIX_FMT_BGR444LE:\
812
        {\
813
            const int dr1= dither_4x4_16[y&3    ][0];\
814
            const int dg1= dither_4x4_16[y&3    ][1];\
815
            const int db1= dither_4x4_16[(y&3)^3][0];\
816
            const int dr2= dither_4x4_16[y&3    ][1];\
817
            const int dg2= dither_4x4_16[y&3    ][0];\
818
            const int db2= dither_4x4_16[(y&3)^3][1];\
819
            func(uint16_t,0)\
820
                ((uint16_t*)dest)[i2+0]= r[Y1+dr1] + g[Y1+dg1] + b[Y1+db1];\
821
                ((uint16_t*)dest)[i2+1]= r[Y2+dr2] + g[Y2+dg2] + b[Y2+db2];\
822
            }\
823
        }\
824
        break;\
808 825
    case PIX_FMT_RGB8:\
809 826
    case PIX_FMT_BGR8:\
810 827
        {\
libswscale/utils.c
1115 1115
        av_log(c, AV_LOG_INFO, "from %s to %s%s ",
1116 1116
               sws_format_name(srcFormat),
1117 1117
#ifdef DITHER1XBPP
1118
               dstFormat == PIX_FMT_BGR555 || dstFormat == PIX_FMT_BGR565 ? "dithered " : "",
1118
               dstFormat == PIX_FMT_BGR555 || dstFormat == PIX_FMT_BGR565 ||
1119
               dstFormat == PIX_FMT_RGB444BE || dstFormat == PIX_FMT_RGB444LE ||
1120
               dstFormat == PIX_FMT_BGR444BE || dstFormat == PIX_FMT_BGR444LE ? "dithered " : "",
1119 1121
#else
1120 1122
               "",
1121 1123
#endif
......
1184 1186
            av_log(c, AV_LOG_VERBOSE, "using %s YV12->BGR16 converter\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C");
1185 1187
        else if (dstFormat==PIX_FMT_BGR555)
1186 1188
            av_log(c, AV_LOG_VERBOSE, "using %s YV12->BGR15 converter\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C");
1189
        else if (dstFormat == PIX_FMT_RGB444BE || dstFormat == PIX_FMT_RGB444LE ||
1190
                 dstFormat == PIX_FMT_BGR444BE || dstFormat == PIX_FMT_BGR444LE)
1191
            av_log(c, AV_LOG_VERBOSE, "using %s YV12->BGR12 converter\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C");
1187 1192

  
1188 1193
        av_log(c, AV_LOG_VERBOSE, "%dx%d -> %dx%d\n", srcW, srcH, dstW, dstH);
1189 1194
        av_log(c, AV_LOG_DEBUG, "lum srcW=%d srcH=%d dstW=%d dstH=%d xInc=%d yInc=%d\n",

Also available in: Unified diff