change composer to chroma only - no src alpha blend, resize about pref, new expanders...

[goodguy/history.git] / cinelerra-5.1 / guicast / bccmodels.C

diff --git a/cinelerra-5.1/guicast/bccmodels.C b/cinelerra-5.1/guicast/bccmodels.C
index 5d3da1ec5e058aa8333fbce24581b55860b77fef..13df1c31ad11ee0ab7c7b5de7177dc45520a59bb 100644 (file)
--- a/cinelerra-5.1/guicast/bccmodels.C
+++ b/cinelerra-5.1/guicast/bccmodels.C
@@ -58,12 +58,17 @@ int BC_CModels::components(int colormodel)
        case BC_VYU888:
                return 3;
        case BC_RGBA8888:
+       case BC_RGBX8888:
        case BC_ARGB8888:
        case BC_ABGR8888:
        case BC_RGBA16161616:
+       case BC_RGBX16161616:
        case BC_RGBA_FLOAT:
+       case BC_RGBX_FLOAT:
        case BC_YUVA8888:
+       case BC_YUVX8888:
        case BC_YUVA16161616:
+       case BC_YUVX16161616:
        case BC_UYVA8888:
        case BC_AYUV16161616:
                return 4;
@@ -96,18 +101,23 @@ int BC_CModels::calculate_pixelsize(int colormodel)
        case BC_ARGB8888:     return 4;
        case BC_ABGR8888:     return 4;
        case BC_RGBA8888:     return 4;
+       case BC_RGBX8888:     return 4;
        case BC_RGB161616:    return 6;
        case BC_RGBA16161616: return 8;
+       case BC_RGBX16161616: return 8;
        case BC_YUV888:       return 3;
        case BC_YUVA8888:     return 4;
+       case BC_YUVX8888:     return 4;
        case BC_YUV161616:    return 6;
        case BC_YUVA16161616: return 8;
+       case BC_YUVX16161616: return 8;
        case BC_AYUV16161616: return 8;
        case BC_YUV101010:    return 4;
        case BC_VYU888:       return 3;
        case BC_UYVA8888:     return 4;
        case BC_RGB_FLOAT:    return 12;
        case BC_RGBA_FLOAT:   return 16;
+       case BC_RGBX_FLOAT:   return 16;
        case BC_GREY8:        return 1;
        case BC_GREY16:       return 2;
 // Planar
@@ -135,15 +145,20 @@ int BC_CModels::calculate_max(int colormodel)
        case BC_A_FLOAT:      return 1;
        case BC_RGB888:       return 0xff;
        case BC_RGBA8888:     return 0xff;
+       case BC_RGBX8888:     return 0xff;
        case BC_RGB161616:    return 0xffff;
        case BC_RGBA16161616: return 0xffff;
+       case BC_RGBX16161616: return 0xffff;
        case BC_YUV888:       return 0xff;
        case BC_YUVA8888:     return 0xff;
+       case BC_YUVX8888:     return 0xff;
        case BC_YUV161616:    return 0xffff;
        case BC_YUVA16161616: return 0xffff;
+       case BC_YUVX16161616: return 0xffff;
        case BC_AYUV16161616: return 0xffff;
        case BC_RGB_FLOAT:    return 1;
        case BC_RGBA_FLOAT:   return 1;
+       case BC_RGBX_FLOAT:   return 1;
        case BC_RGB_FLOATP:   return 1;
        case BC_RGBA_FLOATP:  return 1;
        case BC_GREY8:        return 0xff;
@@ -242,6 +257,7 @@ int BC_CModels::is_float(int colormodel)
        switch(colormodel) {
        case BC_RGB_FLOAT:
        case BC_RGBA_FLOAT:
+       case BC_RGBX_FLOAT:
        case BC_RGB_FLOATP:
        case BC_RGBA_FLOATP:
                return 1;
@@ -255,8 +271,10 @@ int BC_CModels::is_yuv(int colormodel)
        switch(colormodel) {
        case BC_YUV888:
        case BC_YUVA8888:
+       case BC_YUVX8888:
        case BC_YUV161616:
        case BC_YUVA16161616:
+       case BC_YUVX16161616:
        case BC_AYUV16161616:
        case BC_YUV422:
        case BC_UVY422: