Ticket #5923: ycc.diff

libavutil/pixdesc.c

@@ -646 +646 @@
         },
         .flags = PIX_FMT_BE,
     },
+    [PIX_FMT_YCC420P] = {
+        .name = "ycc420p",
+        .nb_components= 3,
+        .log2_chroma_w= 1,
+        .log2_chroma_h= 1,
+        .comp = {
+            {0,0,1,0,7},        /* Y */
+            {1,0,1,0,7},        /* U */
+            {2,0,1,0,7},        /* V */
+        },
+    },
 };
 
 int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc)

libavutil/pixfmt.h

@@ -124 +124 @@
     PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
     PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
     PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+
+    PIX_FMT_YCC420P,   ///< planar YCC 4:2:0, 12bpp (close to YUV420P but with a different colorspace conversion)
     PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
 };
 

libswscale/yuv2rgb.c

@@ -38 +38 @@
 extern const uint8_t dither_8x8_73[8][8];
 extern const uint8_t dither_8x8_220[8][8];
 
-const int32_t ff_yuv2rgb_coeffs[8][4] = {
+const int32_t ff_yuv2rgb_coeffs[9][4] = {
     {117504, 138453, 13954, 34903}, /* no sequence_display_extension */
     {117504, 138453, 13954, 34903}, /* ITU-R Rec. 709 (1990) */
     {104597, 132201, 25675, 53279}, /* unspecified */
@@ -46 +46 @@
     {104448, 132798, 24759, 53109}, /* FCC */
     {104597, 132201, 25675, 53279}, /* ITU-R Rec. 624-4 System B, G */
     {104597, 132201, 25675, 53279}, /* SMPTE 170M */
-    {117579, 136230, 16907, 35559}  /* SMPTE 240M (1987) */
+    {117579, 136230, 16907, 35559}, /* SMPTE 240M (1987) */
+    {119374, 145352, 28198, 73984}, /* Kodak PhotoCD YCC */
 };
 
 #define LOADCHROMA(i)                               \

libswscale/swscale.c

@@ -156 +156 @@
         || (x)==PIX_FMT_YUV420P16BE   \
         || (x)==PIX_FMT_YUV422P16BE   \
         || (x)==PIX_FMT_YUV444P16BE   \
+        || (x)==PIX_FMT_YCC420P     \
     )
 
 int sws_isSupportedInput(enum PixelFormat pix_fmt)
@@ -2406 +2407 @@
     int usesVFilter, usesHFilter;
     int unscaled, needsDither;
     int srcRange, dstRange;
+    int srcColorspace;
     SwsFilter dummyFilter= {NULL, NULL, NULL, NULL};
 #if ARCH_X86
     if (flags & SWS_CPU_CAPS_MMX)
@@ -2434 +2436 @@
         && (fmt_depth(dstFormat))<24
         && ((fmt_depth(dstFormat))<(fmt_depth(srcFormat)) || (!(isRGB(srcFormat) || isBGR(srcFormat))));
 
+    switch (srcFormat) {
+    case PIX_FMT_YCC420P:
+        srcFormat == PIX_FMT_YUV420P;
+        srcColorspace = SWS_CS_KODAKPHOTOYCC;
+        break;
+    default:
+        srcColorspace = SWS_CS_DEFAULT;
+        break;
+    }
+
     srcRange = handle_jpeg(&srcFormat);
     dstRange = handle_jpeg(&dstFormat);
 
@@ -2532 +2544 @@
     c->chrDstW= -((-dstW) >> c->chrDstHSubSample);
     c->chrDstH= -((-dstH) >> c->chrDstVSubSample);
 
-    sws_setColorspaceDetails(c, ff_yuv2rgb_coeffs[SWS_CS_DEFAULT], srcRange, ff_yuv2rgb_coeffs[SWS_CS_DEFAULT] /* FIXME*/, dstRange, 0, 1<<16, 1<<16);
+    sws_setColorspaceDetails(c, ff_yuv2rgb_coeffs[srcColorspace], srcRange, ff_yuv2rgb_coeffs[SWS_CS_DEFAULT] /* FIXME*/, dstRange, 0, 1<<16, 1<<16);
 
     /* unscaled special cases */
     if (unscaled && !usesHFilter && !usesVFilter && (srcRange == dstRange || isBGR(dstFormat) || isRGB(dstFormat))) {

libswscale/swscale.h

@@ -101 +101 @@
 #define SWS_CS_ITU624         5
 #define SWS_CS_SMPTE170M      5
 #define SWS_CS_SMPTE240M      7
+#define SWS_CS_KODAKPHOTOYCC  8
 #define SWS_CS_DEFAULT        5