X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbccmodels.C;h=dc5c2af1e1d0c5feae4e796c6999cc2561b59eff;hb=38cb4182e11e57fc426bede3825e825e9d61433b;hp=7afaab7ad780fc935e74b132f69e56070f757207;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/bccmodels.C b/cinelerra-5.1/guicast/bccmodels.C
index 7afaab7a..dc5c2af1 100644
--- a/cinelerra-5.1/guicast/bccmodels.C
+++ b/cinelerra-5.1/guicast/bccmodels.C
@@ -51,11 +51,14 @@ int BC_CModels::components(int colormodel)
 	case BC_YUVA8888:     return 4;
 	case BC_YUV161616:    return 3;
 	case BC_YUVA16161616: return 4;
+	case BC_AYUV16161616: return 4;
 	case BC_YUV101010:    return 3;
 	case BC_RGB_FLOAT:    return 3;
 	case BC_RGBA_FLOAT:   return 4;
 	case BC_RGB_FLOATP:   return 3;
 	case BC_RGBA_FLOATP:  return 4;
+	case BC_GREY8:        return 1;
+	case BC_GREY16:       return 1;
 	}
 	return 0;
 }
@@ -84,11 +87,14 @@ int BC_CModels::calculate_pixelsize(int colormodel)
 	case BC_YUVA8888:     return 4;
 	case BC_YUV161616:    return 6;
 	case BC_YUVA16161616: 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_GREY8:        return 1;
+	case BC_GREY16:       return 2;
 // Planar
 	case BC_YUV420P:      return 1;
 	case BC_YUV420PI:     return 1;
@@ -119,10 +125,13 @@ int BC_CModels::calculate_max(int colormodel)
 	case BC_YUVA8888:     return 0xff;
 	case BC_YUV161616:    return 0xffff;
 	case BC_YUVA16161616: return 0xffff;
+	case BC_AYUV16161616: return 0xffff;
 	case BC_RGB_FLOAT:    return 1;
 	case BC_RGBA_FLOAT:   return 1;
 	case BC_RGB_FLOATP:   return 1;
 	case BC_RGBA_FLOATP:  return 1;
+	case BC_GREY8:        return 0xff;
+	case BC_GREY16:       return 0xffff;
 	}
 	return 0;
 }
@@ -165,6 +174,7 @@ void BC_CModels::to_text(char *string, int cmodel)
 	case BC_YUVA8888:     strcpy(string, "YUVA-8 Bit");  break;
 	case BC_YUV161616:    strcpy(string, "YUV-16 Bit");  break;
 	case BC_YUVA16161616: strcpy(string, "YUVA-16 Bit"); break;
+	case BC_AYUV16161616: strcpy(string, "AYUV-16 Bit"); break;
 	case BC_RGB_FLOAT:    strcpy(string, "RGB-FLOAT");   break;
 	case BC_RGBA_FLOAT:   strcpy(string, "RGBA-FLOAT");  break;
 	case BC_RGB_FLOATP:   strcpy(string, "RGB-FLOATP");  break;
@@ -187,6 +197,7 @@ int BC_CModels::from_text(const char *text)
 	if(!strcasecmp(text, "YUVA-8 Bit"))  return BC_YUVA8888;
 	if(!strcasecmp(text, "YUV-16 Bit"))  return BC_YUV161616;
 	if(!strcasecmp(text, "YUVA-16 Bit")) return BC_YUVA16161616;
+	if(!strcasecmp(text, "AYUV-16 Bit")) return BC_AYUV16161616;
 	return BC_RGB888;
 }
 
@@ -228,6 +239,7 @@ int BC_CModels::is_yuv(int colormodel)
 	case BC_YUVA8888:
 	case BC_YUV161616:
 	case BC_YUVA16161616:
+	case BC_AYUV16161616:
 	case BC_YUV422:
 	case BC_UVY422:
 	case BC_YUV101010:
@@ -239,6 +251,8 @@ int BC_CModels::is_yuv(int colormodel)
 	case BC_YUV444P:
 	case BC_YUV411P:
 	case BC_YUV410P:
+	case BC_GREY8:
+	case BC_GREY16:
 		return 1;
 	}
 	return 0;