Release 20231204.

MiSTer-unstable-nightlies · Dec 4, 2023 · c9866e6 · c9866e6
2 parents 7a34593 + efbfae9
commit c9866e6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/releases/ao486_20231204.rbf b/releases/ao486_20231204.rbf
diff --git a/sys/vga_out.sv b/sys/vga_out.sv
@@ -16,14 +16,16 @@ module vga_out
 	output reg    csync_o
 );
 
-wire [5:0] red   = din[23:18];
-wire [5:0] green = din[15:10];
-wire [5:0] blue  = din[7:2];
+wire [7:0] red   = din[23:16];
+wire [7:0] green = din[15:8];
+wire [7:0] blue  = din[7:0];
 
 // http://marsee101.blog19.fc2.com/blog-entry-2311.html
-// Y  =  16 + 0.257*R + 0.504*G + 0.098*B (Y  =  0.299*R + 0.587*G + 0.114*B)
-// Pb = 128 - 0.148*R - 0.291*G + 0.439*B (Pb = -0.169*R - 0.331*G + 0.500*B)
-// Pr = 128 + 0.439*R - 0.368*G - 0.071*B (Pr =  0.500*R - 0.419*G - 0.081*B)
+
+
+// Y  =       0.301*R + 0.586*G + 0.113*B (Y  =  0.299*R + 0.587*G + 0.114*B)
+// Pb = 128 - 0.168*R - 0.332*G + 0.500*B (Pb = -0.169*R - 0.331*G + 0.500*B)
+// Pr = 128 + 0.500*R - 0.418*G - 0.082*B (Pr =  0.500*R - 0.419*G - 0.081*B)
 
 reg  [7:0] y, pb, pr;
 reg [23:0] rgb;
@@ -36,25 +38,25 @@ always @(posedge clk) begin
 	reg hsync2, vsync2, csync2;
 	reg hsync1, vsync1, csync1;
 
-	y_1r  <= 19'd04096 + ({red, 8'd0} + {red, 3'd0});
-	pb_1r <= 19'd32768 - ({red, 7'd0} + {red, 4'd0} + {red, 3'd0});
-	pr_1r <= 19'd32768 + ({red, 8'd0} + {red, 7'd0} + {red, 6'd0});
+	y_1r <= {red, 6'd0} + {red, 3'd0} + {red, 2'd0} + red;
+	pb_1r <= 19'd32768 - ({red, 5'd0} + {red, 3'd0} + {red, 1'd0});
+	pr_1r <= 19'd32768 + {red, 7'd0};
 
-	y_1g  <= {green, 9'd0} + {green, 2'd0};
-	pb_1g <= {green, 8'd0} + {green, 5'd0} + {green, 3'd0};
-	pr_1g <= {green, 8'd0} + {green, 6'd0} + {green, 5'd0} + {green, 4'd0} + {green, 3'd0};
+	y_1g  <= {green, 7'd0} + {green, 4'd0} + {green, 2'd0} + {green, 1'd0};
+	pb_1g <= {green, 6'd0} + {green, 4'd0} + {green, 2'd0} + green;
+	pr_1g <= {green, 6'd0} + {green, 5'd0} + {green, 3'd0} + {green, 1'd0};
 
-	y_1b  <= {blue, 6'd0} + {blue, 5'd0} + {blue, 2'd0};
-	pb_1b <= {blue, 8'd0} + {blue, 7'd0} + {blue, 6'd0};
-	pr_1b <= {blue, 6'd0} + {blue, 3'd0};
+	y_1b  <= {blue, 4'd0} + {blue, 3'd0} + {blue, 2'd0} + blue;
+	pb_1b <= {blue, 7'd0};
+	pr_1b <= {blue, 4'd0} + {blue, 2'd0} + blue;
 
 	y_2  <= y_1r  + y_1g  + y_1b;
 	pb_2 <= pb_1r - pb_1g + pb_1b;
 	pr_2 <= pr_1r - pr_1g - pr_1b;
 
-	y  <= ( y_2[18] ||  !y_2[17:12]) ? 8'd16 : (y_2[17:8] > 235) ? 8'd235 :  y_2[15:8];
-	pb <= (pb_2[18] || !pb_2[17:12]) ? 8'd16 : (&pb_2[17:12])    ? 8'd240 : pb_2[15:8];
-	pr <= (pr_2[18] || !pr_2[17:12]) ? 8'd16 : (&pr_2[17:12])    ? 8'd240 : pr_2[15:8];
+	y  <= y_2[18] ? 8'd0 : y_2[16] ? 8'd255 :  y_2[15:8];
+	pb <= pb_2[18] ? 8'd0 : pb_2[16] ? 8'd255 : pb_2[15:8];
+	pr <= pr_2[18] ? 8'd0 : pr_2[16] ? 8'd255 : pr_2[15:8];
 
 	hsync_o <= hsync2; hsync2 <= hsync1; hsync1 <= hsync;
 	vsync_o <= vsync2; vsync2 <= vsync1; vsync1 <= vsync;