X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fclip.h;h=00337442116c006443f2824e6572217fd7d8ab22;hb=0a0a29dd9e484b5622b46173d51bb6cefc0a5da4;hp=4246f2ecdb0c43d408d94b76c84c065f78a0c90e;hpb=77815ec03df6a03ed75433e8cf8ae1e83fb76d6e;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/clip.h b/cinelerra-5.1/guicast/clip.h
index 4246f2ec..00337442 100644
--- a/cinelerra-5.1/guicast/clip.h
+++ b/cinelerra-5.1/guicast/clip.h
@@ -43,38 +43,59 @@
 #define TO_RAD(x) ((x) * 2 * M_PI / 360)
 #define TO_DEG(x) ((x) * 360 / 2 / M_PI)
 
+static inline int bmin(int a, int b) { return a < b ? a : b; }
+static inline float bmin(float a, float b) { return a < b ? a : b; }
+static inline double bmin(double a, double b) { return a < b ? a : b; }
+static inline int bmax(int a, int b) { return a > b ? a : b; }
+static inline float bmax(float a, float b) { return a > b ? a : b; }
+static inline double bmax(double a, double b) { return a > b ? a : b; }
+
 static inline int bclip(int &iv, int imn, int imx) {
-        return iv < imn ? imn : iv > imx ? imx : iv;
+	return iv < imn ? imn : iv > imx ? imx : iv;
 }
 static inline float bclip(float &fv, float fmn, float fmx) {
-        return fv < fmn ? fmn : fv > fmx ? fmx : fv;
+	return fv < fmn ? fmn : fv > fmx ? fmx : fv;
 }
 static inline double bclip(double &dv, double dmn, double dmx) {
-        return dv < dmn ? dmn : dv > dmx ? dmx : dv;
+	return dv < dmn ? dmn : dv > dmx ? dmx : dv;
 }
 static inline void bclamp(int &iv, int imn, int imx) {
-        if( iv < imn ) iv = imn; else if( iv > imx ) iv = imx;
+	if( iv < imn ) iv = imn; else if( iv > imx ) iv = imx;
 }
 static inline void bclamp(float &fv, float fmn, float fmx) {
-        if( fv < fmn ) fv = fmn; else if( fv > fmx ) fv = fmx;
+	if( fv < fmn ) fv = fmn; else if( fv > fmx ) fv = fmx;
 }
 static inline void bclamp(double &dv, double dmn, double dmx) {
-        if( dv < dmn ) dv = dmn; else if( dv > dmx ) dv = dmx;
+	if( dv < dmn ) dv = dmn; else if( dv > dmx ) dv = dmx;
+}
+static inline void bc_rgb2yuv(float r, float g, float b, float &y, float &u, float &v)
+{ //bt601, jpeg, unclipped
+	y =  0.29900*r + 0.58700*g + 0.11400*b;
+	u = -0.16874*r - 0.33126*g + 0.50000*b + 0.5;
+	v =  0.50000*r - 0.41869*g - 0.08131*b + 0.5;
 }
 static inline void bc_rgb2yuv(int r, int g, int b, int &y, int &u, int &v, int max=255)
+{ // clipped
+	float mx = max, fr = r/mx, fg = g/mx, fb = b/mx, fy, fu, fv;
+	bc_rgb2yuv(fr,fg,fb, fy,fu,fv);
+	y = (int)(fy * mx + 0.5);  bclamp(y,0,max);
+	u = (int)(fu * mx + 0.5);  bclamp(u,0,max);
+	v = (int)(fv * mx + 0.5);  bclamp(v,0,max);
+}
+static inline void bc_yuv2rgb(float y, float u, float v, float &r, float &g, float &b)
 { //bt601, jpeg, unclipped
-	double mx = max, rr = r/mx, gg = g/mx, bb = b/mx;
-	y = (int)(( 0.29900*rr + 0.58700*gg + 0.11400*bb)       * mx + 0.5);
-	u = (int)((-0.16874*rr - 0.33126*gg + 0.50000*bb + 0.5) * mx + 0.5);
-	v = (int)(( 0.50000*rr - 0.41869*gg - 0.08131*bb + 0.5) * mx + 0.5);
+	r = y + 1.40200*v;
+	g = y - 0.34414*u - 0.71414*v;
+	b = y + 1.77200*u;
 }
 static inline void bc_yuv2rgb(int y, int u, int v, int &r, int &g, int &b, int max=255)
-{
+{ // clipped
 	int ofs = (max + 1) / 2;
-	double mx = max, yy = y/mx, uu = (u-ofs)/mx, vv = (v-ofs)/mx;
-	r = (int)((yy + 1.40200*vv)              * mx + 0.5);
-	g = (int)((yy - 0.34414*uu - 0.71414*vv) * mx + 0.5);
-	b = (int)((yy + 1.77200*uu)              * mx + 0.5);
+	float mx = max, fy = y/mx, fu = (u-ofs)/mx, fv = (v-ofs)/mx, fr, fg, fb;
+	bc_yuv2rgb(fy,fu,fv, fr,fg,fb);
+	r = (int)(fr * mx + 0.5);  bclamp(r,0,max);
+	g = (int)(fg * mx + 0.5);  bclamp(g,0,max);
+	b = (int)(fb * mx + 0.5);  bclamp(b,0,max);
 }
 
 #endif