COCO3_20240124
Updated framework.
This commit is contained in:
1 parent
00c42274fd
commit
5d93c0501f
7 files changed
+1933
-66
No files matched your search
+28
-4
@@ -226,7 +226,7 @@ video_calc video_calc
|
|||||||
.new_vmode(new_vmode),
|
.new_vmode(new_vmode),
|
||||||
.video_rotated(video_rotated),
|
.video_rotated(video_rotated),
|
||||||
|
|
||||||
.par_num(byte_cnt[3:0]),
|
.par_num(byte_cnt[4:0]),
|
||||||
.dout(vc_dout)
|
.dout(vc_dout)
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -502,7 +502,7 @@ always@(posedge clk_sys) begin : uio_block
|
|||||||
'h22: RTC[(byte_cnt-6'd1)<<4 +:16] <= io_din;
|
'h22: RTC[(byte_cnt-6'd1)<<4 +:16] <= io_din;
|
||||||
|
|
||||||
//Video res.
|
//Video res.
|
||||||
'h23: if(!byte_cnt[MAX_W:4]) io_dout <= vc_dout;
|
'h23: if(!byte_cnt[MAX_W:5]) io_dout <= vc_dout;
|
||||||
|
|
||||||
//RTC
|
//RTC
|
||||||
'h24: TIMESTAMP[(byte_cnt-6'd1)<<4 +:16] <= io_din;
|
'h24: TIMESTAMP[(byte_cnt-6'd1)<<4 +:16] <= io_din;
|
||||||
@@ -872,7 +872,7 @@ module video_calc
|
|||||||
input new_vmode,
|
input new_vmode,
|
||||||
input video_rotated,
|
input video_rotated,
|
||||||
|
|
||||||
input [3:0] par_num,
|
input [4:0] par_num,
|
||||||
output reg [15:0] dout
|
output reg [15:0] dout
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -893,6 +893,9 @@ always @(posedge clk_sys) begin
|
|||||||
13: dout <= vid_vtime_hdmi[31:16];
|
13: dout <= vid_vtime_hdmi[31:16];
|
||||||
14: dout <= vid_ccnt[15:0];
|
14: dout <= vid_ccnt[15:0];
|
||||||
15: dout <= vid_ccnt[31:16];
|
15: dout <= vid_ccnt[31:16];
|
||||||
|
16: dout <= vid_pixrep;
|
||||||
|
17: dout <= vid_de_h;
|
||||||
|
18: dout <= vid_de_v;
|
||||||
default dout <= 0;
|
default dout <= 0;
|
||||||
endcase
|
endcase
|
||||||
end
|
end
|
||||||
@@ -902,24 +905,44 @@ reg [31:0] vid_vcnt = 0;
|
|||||||
reg [31:0] vid_ccnt = 0;
|
reg [31:0] vid_ccnt = 0;
|
||||||
reg [7:0] vid_nres = 0;
|
reg [7:0] vid_nres = 0;
|
||||||
reg [1:0] vid_int = 0;
|
reg [1:0] vid_int = 0;
|
||||||
|
reg [7:0] vid_pixrep;
|
||||||
|
reg [15:0] vid_de_h;
|
||||||
|
reg [7:0] vid_de_v;
|
||||||
|
|
||||||
always @(posedge clk_vid) begin
|
always @(posedge clk_vid) begin
|
||||||
integer hcnt;
|
integer hcnt;
|
||||||
integer vcnt;
|
integer vcnt;
|
||||||
integer ccnt;
|
integer ccnt;
|
||||||
reg old_vs= 0, old_de = 0, old_vmode = 0;
|
reg [7:0] pcnt;
|
||||||
|
reg [7:0] de_v;
|
||||||
|
reg [15:0] de_h;
|
||||||
|
reg old_vs = 0, old_hs = 0, old_hs_vclk = 0, old_de = 0, old_de_vclk = 0, old_de1 = 0, old_vmode = 0;
|
||||||
reg [3:0] resto = 0;
|
reg [3:0] resto = 0;
|
||||||
reg calch = 0;
|
reg calch = 0;
|
||||||
|
|
||||||
if(calch & de) ccnt <= ccnt + 1;
|
if(calch & de) ccnt <= ccnt + 1;
|
||||||
|
pcnt <= pcnt + 1'd1;
|
||||||
|
|
||||||
|
old_hs_vclk <= hs;
|
||||||
|
de_h <= de_h + 1'd1;
|
||||||
|
if(old_hs_vclk & ~hs) de_h <= 1;
|
||||||
|
|
||||||
|
old_de_vclk <= de;
|
||||||
|
if(calch & ~old_de_vclk & de) vid_de_h <= de_h;
|
||||||
|
|
||||||
if(ce_pix) begin
|
if(ce_pix) begin
|
||||||
old_vs <= vs;
|
old_vs <= vs;
|
||||||
|
old_hs <= hs;
|
||||||
old_de <= de;
|
old_de <= de;
|
||||||
|
old_de1 <= old_de;
|
||||||
|
pcnt <= 1;
|
||||||
|
|
||||||
if(~vs & ~old_de & de) vcnt <= vcnt + 1;
|
if(~vs & ~old_de & de) vcnt <= vcnt + 1;
|
||||||
if(calch & de) hcnt <= hcnt + 1;
|
if(calch & de) hcnt <= hcnt + 1;
|
||||||
if(old_de & ~de) calch <= 0;
|
if(old_de & ~de) calch <= 0;
|
||||||
|
if(~old_de1 & old_de) vid_pixrep <= pcnt;
|
||||||
|
if(old_hs & ~hs) de_v <= de_v + 1'd1;
|
||||||
|
if(calch & ~old_de & de) vid_de_v <= de_v;
|
||||||
|
|
||||||
if(old_vs & ~vs) begin
|
if(old_vs & ~vs) begin
|
||||||
vid_int <= {vid_int[0],f1};
|
vid_int <= {vid_int[0],f1};
|
||||||
@@ -939,6 +962,7 @@ always @(posedge clk_vid) begin
|
|||||||
hcnt <= 0;
|
hcnt <= 0;
|
||||||
ccnt <= 0;
|
ccnt <= 0;
|
||||||
calch <= 1;
|
calch <= 1;
|
||||||
|
de_v <= 0;
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
+1776
File diff suppressed because it is too large.
Load diff
@@ -4,3 +4,4 @@ set_global_assignment -name QIP_FILE [file join $::quartus(qip_path) p
|
|||||||
set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) pll_cfg.v ]
|
set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) pll_cfg.v ]
|
||||||
set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) pll_cfg/altera_pll_reconfig_core.v ]
|
set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) pll_cfg/altera_pll_reconfig_core.v ]
|
||||||
set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) pll_cfg/altera_pll_reconfig_top.v ]
|
set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) pll_cfg/altera_pll_reconfig_top.v ]
|
||||||
|
set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) pll_cfg_hdmi.v ]
|
||||||
@@ -2,3 +2,4 @@ set_global_assignment -name QIP_FILE rtl/pll.qip
|
|||||||
set_global_assignment -name QIP_FILE [file join $::quartus(qip_path) pll_hdmi.qip ]
|
set_global_assignment -name QIP_FILE [file join $::quartus(qip_path) pll_hdmi.qip ]
|
||||||
set_global_assignment -name QIP_FILE [file join $::quartus(qip_path) pll_audio.qip ]
|
set_global_assignment -name QIP_FILE [file join $::quartus(qip_path) pll_audio.qip ]
|
||||||
set_global_assignment -name QIP_FILE [file join $::quartus(qip_path) pll_cfg.qip ]
|
set_global_assignment -name QIP_FILE [file join $::quartus(qip_path) pll_cfg.qip ]
|
||||||
|
set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) pll_cfg_hdmi.v ]
|
||||||
+64
-41
@@ -519,17 +519,6 @@ cyclonev_hps_interface_peripheral_uart uart
|
|||||||
.txd(uart_txd)
|
.txd(uart_txd)
|
||||||
);
|
);
|
||||||
|
|
||||||
wire aspi_sck,aspi_mosi,aspi_ss,aspi_miso;
|
|
||||||
cyclonev_hps_interface_peripheral_spi_master spi
|
|
||||||
(
|
|
||||||
.sclk_out(aspi_sck),
|
|
||||||
.txd(aspi_mosi), // mosi
|
|
||||||
.rxd(aspi_miso), // miso
|
|
||||||
|
|
||||||
.ss_0_n(aspi_ss),
|
|
||||||
.ss_in_n(1)
|
|
||||||
);
|
|
||||||
|
|
||||||
wire [63:0] f2h_irq = {video_sync,HDMI_TX_VS};
|
wire [63:0] f2h_irq = {video_sync,HDMI_TX_VS};
|
||||||
cyclonev_hps_interface_interrupts interrupts
|
cyclonev_hps_interface_interrupts interrupts
|
||||||
(
|
(
|
||||||
@@ -635,11 +624,13 @@ ddr_svc ddr_svc
|
|||||||
.ram_write(ram2_write),
|
.ram_write(ram2_write),
|
||||||
.ram_bcnt(ram2_bcnt),
|
.ram_bcnt(ram2_bcnt),
|
||||||
|
|
||||||
|
`ifndef MISTER_DISABLE_ALSA
|
||||||
.ch0_addr(alsa_address),
|
.ch0_addr(alsa_address),
|
||||||
.ch0_burst(1),
|
.ch0_burst(1),
|
||||||
.ch0_data(alsa_readdata),
|
.ch0_data(alsa_readdata),
|
||||||
.ch0_req(alsa_req),
|
.ch0_req(alsa_req),
|
||||||
.ch0_ready(alsa_ready),
|
.ch0_ready(alsa_ready),
|
||||||
|
`endif
|
||||||
|
|
||||||
.ch1_addr(pal_addr),
|
.ch1_addr(pal_addr),
|
||||||
.ch1_burst(128),
|
.ch1_burst(128),
|
||||||
@@ -1023,13 +1014,11 @@ reg [5:0] adj_address;
|
|||||||
reg [31:0] adj_data;
|
reg [31:0] adj_data;
|
||||||
|
|
||||||
`ifndef MISTER_DEBUG_NOHDMI
|
`ifndef MISTER_DEBUG_NOHDMI
|
||||||
pll_cfg pll_cfg
|
pll_cfg_hdmi pll_cfg_hdmi
|
||||||
(
|
(
|
||||||
.mgmt_clk(FPGA_CLK1_50),
|
.mgmt_clk(FPGA_CLK1_50),
|
||||||
.mgmt_reset(reset_req),
|
.mgmt_reset(reset_req),
|
||||||
.mgmt_waitrequest(cfg_waitrequest),
|
.mgmt_waitrequest(cfg_waitrequest),
|
||||||
.mgmt_read(0),
|
|
||||||
.mgmt_readdata(),
|
|
||||||
.mgmt_write(cfg_write),
|
.mgmt_write(cfg_write),
|
||||||
.mgmt_address(cfg_address),
|
.mgmt_address(cfg_address),
|
||||||
.mgmt_writedata(cfg_data),
|
.mgmt_writedata(cfg_data),
|
||||||
@@ -1194,11 +1183,12 @@ always @(posedge clk_vid) begin
|
|||||||
end
|
end
|
||||||
|
|
||||||
dv_de1 <= !{hss,dv_hs_osd} && vde;
|
dv_de1 <= !{hss,dv_hs_osd} && vde;
|
||||||
dv_hs1 <= csync_en ? dv_cs_osd : dv_hs_osd;
|
|
||||||
dv_vs1 <= dv_vs_osd;
|
|
||||||
end
|
end
|
||||||
|
|
||||||
dv_d1 <= dv_data_osd;
|
dv_d1 <= dv_data_osd;
|
||||||
|
dv_hs1 <= csync_en ? dv_cs_osd : dv_hs_osd;
|
||||||
|
dv_vs1 <= dv_vs_osd;
|
||||||
|
|
||||||
dv_d2 <= dv_d1;
|
dv_d2 <= dv_d1;
|
||||||
dv_de2 <= dv_de1;
|
dv_de2 <= dv_de1;
|
||||||
dv_hs2 <= dv_hs1;
|
dv_hs2 <= dv_hs1;
|
||||||
@@ -1333,6 +1323,33 @@ osd vga_osd
|
|||||||
wire vga_cs_osd;
|
wire vga_cs_osd;
|
||||||
csync csync_vga(clk_vid, vga_hs_osd, vga_vs_osd, vga_cs_osd);
|
csync csync_vga(clk_vid, vga_hs_osd, vga_vs_osd, vga_cs_osd);
|
||||||
|
|
||||||
|
`ifndef MISTER_DISABLE_YC
|
||||||
|
reg pal_en;
|
||||||
|
reg yc_en;
|
||||||
|
reg cvbs;
|
||||||
|
reg [16:0] ColorBurst_Range;
|
||||||
|
reg [39:0] PhaseInc;
|
||||||
|
wire [23:0] yc_o;
|
||||||
|
wire yc_hs, yc_vs, yc_cs;
|
||||||
|
|
||||||
|
yc_out yc_out
|
||||||
|
(
|
||||||
|
.clk(clk_vid),
|
||||||
|
.PAL_EN(pal_en),
|
||||||
|
.CVBS(cvbs),
|
||||||
|
.PHASE_INC(PhaseInc),
|
||||||
|
.COLORBURST_RANGE(ColorBurst_Range),
|
||||||
|
.hsync(vga_hs_osd),
|
||||||
|
.vsync(vga_vs_osd),
|
||||||
|
.csync(vga_cs_osd),
|
||||||
|
.dout(yc_o),
|
||||||
|
.din(vga_data_osd),
|
||||||
|
.hsync_o(yc_hs),
|
||||||
|
.vsync_o(yc_vs),
|
||||||
|
.csync_o(yc_cs)
|
||||||
|
);
|
||||||
|
`endif
|
||||||
|
|
||||||
`ifndef MISTER_DUAL_SDRAM
|
`ifndef MISTER_DUAL_SDRAM
|
||||||
wire VGA_DISABLE;
|
wire VGA_DISABLE;
|
||||||
wire [23:0] vgas_o;
|
wire [23:0] vgas_o;
|
||||||
@@ -1368,31 +1385,6 @@ csync csync_vga(clk_vid, vga_hs_osd, vga_vs_osd, vga_cs_osd);
|
|||||||
);
|
);
|
||||||
|
|
||||||
`ifndef MISTER_DISABLE_YC
|
`ifndef MISTER_DISABLE_YC
|
||||||
reg pal_en;
|
|
||||||
reg yc_en;
|
|
||||||
reg cvbs;
|
|
||||||
reg [16:0] ColorBurst_Range;
|
|
||||||
reg [39:0] PhaseInc;
|
|
||||||
wire [23:0] yc_o;
|
|
||||||
wire yc_hs, yc_vs, yc_cs;
|
|
||||||
|
|
||||||
yc_out yc_out
|
|
||||||
(
|
|
||||||
.clk(clk_vid),
|
|
||||||
.PAL_EN(pal_en),
|
|
||||||
.CVBS(cvbs),
|
|
||||||
.PHASE_INC(PhaseInc),
|
|
||||||
.COLORBURST_RANGE(ColorBurst_Range),
|
|
||||||
.hsync(vga_hs_osd),
|
|
||||||
.vsync(vga_vs_osd),
|
|
||||||
.csync(vga_cs_osd),
|
|
||||||
.dout(yc_o),
|
|
||||||
.din(vga_data_osd),
|
|
||||||
.hsync_o(yc_hs),
|
|
||||||
.vsync_o(yc_vs),
|
|
||||||
.csync_o(yc_cs)
|
|
||||||
);
|
|
||||||
|
|
||||||
assign {vga_o, vga_hs, vga_vs, vga_cs } = ~yc_en ? {vga_o_t, vga_hs_t, vga_vs_t, vga_cs_t } : {yc_o, yc_hs, yc_vs, yc_cs };
|
assign {vga_o, vga_hs, vga_vs, vga_cs } = ~yc_en ? {vga_o_t, vga_hs_t, vga_vs_t, vga_cs_t } : {yc_o, yc_hs, yc_vs, yc_cs };
|
||||||
`else
|
`else
|
||||||
assign {vga_o, vga_hs, vga_vs, vga_cs } = {vga_o_t, vga_hs_t, vga_vs_t, vga_cs_t } ;
|
assign {vga_o, vga_hs, vga_vs, vga_cs } = {vga_o_t, vga_hs_t, vga_vs_t, vga_cs_t } ;
|
||||||
@@ -1477,8 +1469,10 @@ audio_out audio_out
|
|||||||
.core_l(audio_l),
|
.core_l(audio_l),
|
||||||
.core_r(audio_r),
|
.core_r(audio_r),
|
||||||
|
|
||||||
|
`ifndef MISTER_DISABLE_ALSA
|
||||||
.alsa_l(alsa_l),
|
.alsa_l(alsa_l),
|
||||||
.alsa_r(alsa_r),
|
.alsa_r(alsa_r),
|
||||||
|
`endif
|
||||||
|
|
||||||
.i2s_bclk(HDMI_SCLK),
|
.i2s_bclk(HDMI_SCLK),
|
||||||
.i2s_lrclk(HDMI_LRCLK),
|
.i2s_lrclk(HDMI_LRCLK),
|
||||||
@@ -1491,6 +1485,18 @@ audio_out audio_out
|
|||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
|
`ifndef MISTER_DISABLE_ALSA
|
||||||
|
wire aspi_sck,aspi_mosi,aspi_ss,aspi_miso;
|
||||||
|
cyclonev_hps_interface_peripheral_spi_master spi
|
||||||
|
(
|
||||||
|
.sclk_out(aspi_sck),
|
||||||
|
.txd(aspi_mosi), // mosi
|
||||||
|
.rxd(aspi_miso), // miso
|
||||||
|
|
||||||
|
.ss_0_n(aspi_ss),
|
||||||
|
.ss_in_n(1)
|
||||||
|
);
|
||||||
|
|
||||||
wire [28:0] alsa_address;
|
wire [28:0] alsa_address;
|
||||||
wire [63:0] alsa_readdata;
|
wire [63:0] alsa_readdata;
|
||||||
wire alsa_ready;
|
wire alsa_ready;
|
||||||
@@ -1517,6 +1523,7 @@ alsa alsa
|
|||||||
.pcm_l(alsa_l),
|
.pcm_l(alsa_l),
|
||||||
.pcm_r(alsa_r)
|
.pcm_r(alsa_r)
|
||||||
);
|
);
|
||||||
|
`endif
|
||||||
|
|
||||||
//////////////// User I/O (USB 3.0 connector) /////////////////////////
|
//////////////// User I/O (USB 3.0 connector) /////////////////////////
|
||||||
|
|
||||||
@@ -1758,6 +1765,21 @@ module sync_fix
|
|||||||
assign sync_out = sync_in ^ pol;
|
assign sync_out = sync_in ^ pol;
|
||||||
|
|
||||||
reg pol;
|
reg pol;
|
||||||
|
always @(posedge clk) begin
|
||||||
|
reg [31:0] cnt;
|
||||||
|
reg s1,s2;
|
||||||
|
|
||||||
|
s1 <= sync_in;
|
||||||
|
s2 <= s1;
|
||||||
|
cnt <= s2 ? (cnt - 1) : (cnt + 1);
|
||||||
|
|
||||||
|
if(~s2 & s1) begin
|
||||||
|
cnt <= 0;
|
||||||
|
pol <= cnt[31];
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
/*
|
||||||
always @(posedge clk) begin
|
always @(posedge clk) begin
|
||||||
integer pos = 0, neg = 0, cnt = 0;
|
integer pos = 0, neg = 0, cnt = 0;
|
||||||
reg s1,s2;
|
reg s1,s2;
|
||||||
@@ -1773,6 +1795,7 @@ always @(posedge clk) begin
|
|||||||
|
|
||||||
pol <= pos > neg;
|
pol <= pos > neg;
|
||||||
end
|
end
|
||||||
|
*/
|
||||||
|
|
||||||
endmodule
|
endmodule
|
||||||
|
|
||||||
|
|||||||
+20
-18
@@ -16,14 +16,16 @@ module vga_out
|
|||||||
output reg csync_o
|
output reg csync_o
|
||||||
);
|
);
|
||||||
|
|
||||||
wire [5:0] red = din[23:18];
|
wire [7:0] red = din[23:16];
|
||||||
wire [5:0] green = din[15:10];
|
wire [7:0] green = din[15:8];
|
||||||
wire [5:0] blue = din[7:2];
|
wire [7:0] blue = din[7:0];
|
||||||
|
|
||||||
// http://marsee101.blog19.fc2.com/blog-entry-2311.html
|
// 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 [7:0] y, pb, pr;
|
||||||
reg [23:0] rgb;
|
reg [23:0] rgb;
|
||||||
@@ -36,25 +38,25 @@ always @(posedge clk) begin
|
|||||||
reg hsync2, vsync2, csync2;
|
reg hsync2, vsync2, csync2;
|
||||||
reg hsync1, vsync1, csync1;
|
reg hsync1, vsync1, csync1;
|
||||||
|
|
||||||
y_1r <= 19'd04096 + ({red, 8'd0} + {red, 3'd0});
|
y_1r <= {red, 6'd0} + {red, 3'd0} + {red, 2'd0} + red;
|
||||||
pb_1r <= 19'd32768 - ({red, 7'd0} + {red, 4'd0} + {red, 3'd0});
|
pb_1r <= 19'd32768 - ({red, 5'd0} + {red, 3'd0} + {red, 1'd0});
|
||||||
pr_1r <= 19'd32768 + ({red, 8'd0} + {red, 7'd0} + {red, 6'd0});
|
pr_1r <= 19'd32768 + {red, 7'd0};
|
||||||
|
|
||||||
y_1g <= {green, 9'd0} + {green, 2'd0};
|
y_1g <= {green, 7'd0} + {green, 4'd0} + {green, 2'd0} + {green, 1'd0};
|
||||||
pb_1g <= {green, 8'd0} + {green, 5'd0} + {green, 3'd0};
|
pb_1g <= {green, 6'd0} + {green, 4'd0} + {green, 2'd0} + green;
|
||||||
pr_1g <= {green, 8'd0} + {green, 6'd0} + {green, 5'd0} + {green, 4'd0} + {green, 3'd0};
|
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};
|
y_1b <= {blue, 4'd0} + {blue, 3'd0} + {blue, 2'd0} + blue;
|
||||||
pb_1b <= {blue, 8'd0} + {blue, 7'd0} + {blue, 6'd0};
|
pb_1b <= {blue, 7'd0};
|
||||||
pr_1b <= {blue, 6'd0} + {blue, 3'd0};
|
pr_1b <= {blue, 4'd0} + {blue, 2'd0} + blue;
|
||||||
|
|
||||||
y_2 <= y_1r + y_1g + y_1b;
|
y_2 <= y_1r + y_1g + y_1b;
|
||||||
pb_2 <= pb_1r - pb_1g + pb_1b;
|
pb_2 <= pb_1r - pb_1g + pb_1b;
|
||||||
pr_2 <= pr_1r - pr_1g - pr_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];
|
y <= y_2[18] ? 8'd0 : y_2[16] ? 8'd255 : y_2[15:8];
|
||||||
pb <= (pb_2[18] || !pb_2[17:12]) ? 8'd16 : (&pb_2[17:12]) ? 8'd240 : pb_2[15:8];
|
pb <= pb_2[18] ? 8'd0 : pb_2[16] ? 8'd255 : pb_2[15:8];
|
||||||
pr <= (pr_2[18] || !pr_2[17:12]) ? 8'd16 : (&pr_2[17:12]) ? 8'd240 : pr_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;
|
hsync_o <= hsync2; hsync2 <= hsync1; hsync1 <= hsync;
|
||||||
vsync_o <= vsync2; vsync2 <= vsync1; vsync1 <= vsync;
|
vsync_o <= vsync2; vsync2 <= vsync1; vsync1 <= vsync;
|
||||||
|
|||||||
+43
-3
@@ -173,7 +173,7 @@ sys_umul #(12,12) mul(CLK_VIDEO,mul_start,mul_run, mul_arg1,mul_arg2,mul_res);
|
|||||||
wire [11:0] wideres = mul_res[11:0] + hsize;
|
wire [11:0] wideres = mul_res[11:0] + hsize;
|
||||||
|
|
||||||
always @(posedge CLK_VIDEO) begin
|
always @(posedge CLK_VIDEO) begin
|
||||||
reg [11:0] oheight,wres;
|
reg [11:0] oheight,htarget,wres;
|
||||||
reg [12:0] arxf,aryf;
|
reg [12:0] arxf,aryf;
|
||||||
reg [3:0] cnt;
|
reg [3:0] cnt;
|
||||||
reg narrow;
|
reg narrow;
|
||||||
@@ -188,11 +188,18 @@ always @(posedge CLK_VIDEO) begin
|
|||||||
else if(~div_start & ~div_run & ~mul_start & ~mul_run) begin
|
else if(~div_start & ~div_run & ~mul_start & ~mul_run) begin
|
||||||
cnt <= cnt + 1'd1;
|
cnt <= cnt + 1'd1;
|
||||||
case(cnt)
|
case(cnt)
|
||||||
|
// example ideal and non-ideal cases:
|
||||||
|
// [1] 720x400 4:3 VGA 80x25 text-mode (non-square pixels)
|
||||||
|
// [2] 640x480 4:3 VGA graphics mode (square pixels)
|
||||||
|
// [3] 512x512 4:3 X68000 graphics mode (non-square pixels)
|
||||||
0: begin
|
0: begin
|
||||||
div_num <= HDMI_HEIGHT;
|
div_num <= HDMI_HEIGHT;
|
||||||
div_den <= vsize;
|
div_den <= vsize;
|
||||||
div_start <= 1;
|
div_start <= 1;
|
||||||
end
|
end
|
||||||
|
// [1] 1080 / 400 -> 2
|
||||||
|
// [2] 1080 / 480 -> 2
|
||||||
|
// [3] 1080 / 512 -> 2
|
||||||
|
|
||||||
1: if(!div_res[11:0]) begin
|
1: if(!div_res[11:0]) begin
|
||||||
// screen resolution is lower than video resolution.
|
// screen resolution is lower than video resolution.
|
||||||
@@ -206,6 +213,9 @@ always @(posedge CLK_VIDEO) begin
|
|||||||
mul_arg2 <= div_res[11:0];
|
mul_arg2 <= div_res[11:0];
|
||||||
mul_start <= 1;
|
mul_start <= 1;
|
||||||
end
|
end
|
||||||
|
// [1] 1080 / 400 * 400 -> 800
|
||||||
|
// [2] 1080 / 480 * 480 -> 960
|
||||||
|
// [3] 1080 / 512 * 512 -> 1024
|
||||||
|
|
||||||
2: begin
|
2: begin
|
||||||
oheight <= mul_res[11:0];
|
oheight <= mul_res[11:0];
|
||||||
@@ -219,24 +229,39 @@ always @(posedge CLK_VIDEO) begin
|
|||||||
mul_arg2 <= arx_i;
|
mul_arg2 <= arx_i;
|
||||||
mul_start <= 1;
|
mul_start <= 1;
|
||||||
end
|
end
|
||||||
|
// [1] 1080 / 400 * 400 * 4 -> 3200
|
||||||
|
// [2] 1080 / 480 * 480 * 4 -> 3840
|
||||||
|
// [3] 1080 / 512 * 512 * 4 -> 4096
|
||||||
|
|
||||||
4: begin
|
4: begin
|
||||||
div_num <= mul_res;
|
div_num <= mul_res;
|
||||||
div_den <= ary_i;
|
div_den <= ary_i;
|
||||||
div_start <= 1;
|
div_start <= 1;
|
||||||
end
|
end
|
||||||
|
// [1] 1080 / 480 * 480 * 4 / 3 -> 1066
|
||||||
|
// [2] 1080 / 480 * 480 * 4 / 3 -> 1280
|
||||||
|
// [3] 1080 / 512 * 512 * 4 / 3 -> 1365
|
||||||
|
// saved as htarget
|
||||||
|
|
||||||
5: begin
|
5: begin
|
||||||
|
htarget <= div_res[11:0];
|
||||||
div_num <= div_res;
|
div_num <= div_res;
|
||||||
div_den <= hsize;
|
div_den <= hsize;
|
||||||
div_start <= 1;
|
div_start <= 1;
|
||||||
end
|
end
|
||||||
|
// computes wide scaling factor as a ceiling division
|
||||||
|
// [1] 1080 / 400 * 400 * 4 / 3 / 720 -> 1
|
||||||
|
// [2] 1080 / 480 * 480 * 4 / 3 / 640 -> 2
|
||||||
|
// [3] 1080 / 512 * 512 * 4 / 3 / 512 -> 2
|
||||||
|
|
||||||
6: begin
|
6: begin
|
||||||
mul_arg1 <= hsize;
|
mul_arg1 <= hsize;
|
||||||
mul_arg2 <= div_res[11:0] ? div_res[11:0] : 12'd1;
|
mul_arg2 <= div_res[11:0] ? div_res[11:0] : 12'd1;
|
||||||
mul_start <= 1;
|
mul_start <= 1;
|
||||||
end
|
end
|
||||||
|
// [1] 1080 / 400 * 400 * 4 / 3 / 720 * 720 -> 720
|
||||||
|
// [2] 1080 / 480 * 480 * 4 / 3 / 640 * 640 -> 1280
|
||||||
|
// [3] 1080 / 512 * 512 * 4 / 3 / 512 * 512 -> 1024
|
||||||
|
|
||||||
7: if(mul_res <= HDMI_WIDTH) begin
|
7: if(mul_res <= HDMI_WIDTH) begin
|
||||||
cnt <= 10;
|
cnt <= 10;
|
||||||
@@ -247,17 +272,32 @@ always @(posedge CLK_VIDEO) begin
|
|||||||
div_den <= hsize;
|
div_den <= hsize;
|
||||||
div_start <= 1;
|
div_start <= 1;
|
||||||
end
|
end
|
||||||
|
// [1] 1920 / 720 -> 2
|
||||||
|
// [2] 1920 / 640 -> 3
|
||||||
|
// [3] 1920 / 512 -> 3
|
||||||
|
|
||||||
9: begin
|
9: begin
|
||||||
mul_arg1 <= hsize;
|
mul_arg1 <= hsize;
|
||||||
mul_arg2 <= div_res[11:0] ? div_res[11:0] : 12'd1;
|
mul_arg2 <= div_res[11:0] ? div_res[11:0] : 12'd1;
|
||||||
mul_start <= 1;
|
mul_start <= 1;
|
||||||
end
|
end
|
||||||
|
// [1] 1920 / 720 * 720 -> 1440
|
||||||
|
// [2] 1920 / 640 * 640 -> 1920
|
||||||
|
// [3] 1920 / 512 * 512 -> 1536
|
||||||
|
|
||||||
10: begin
|
10: begin
|
||||||
narrow <= ((div_num[11:0] - mul_res[11:0]) <= (wideres - div_num[11:0])) || (wideres > HDMI_WIDTH);
|
narrow <= ((htarget - mul_res[11:0]) <= (wideres - htarget)) || (wideres > HDMI_WIDTH);
|
||||||
wres <= wideres;
|
wres <= mul_res[11:0] == htarget ? mul_res[11:0] : wideres;
|
||||||
end
|
end
|
||||||
|
// [1] 1066 - 720 = 346 <= 1440 - 1066 = 374 || 1440 > 1920 -> true
|
||||||
|
// [2] 1280 - 1280 = 0 <= 1920 - 1280 = 640 || 1920 > 1920 -> true
|
||||||
|
// [3] 1365 - 1024 = 341 <= 1536 - 1365 = 171 || 1536 > 1920 -> false
|
||||||
|
// 1. narrow flag is true when mul_res[11:0] narrow width is closer to
|
||||||
|
// htarget aspect ratio target width or when wideres wider width
|
||||||
|
// does not fit to the screen.
|
||||||
|
// 2. wres becomes wideres only when mul_res[11:0] narrow width not equal
|
||||||
|
// to target width, meaning it is not optimal for source aspect ratio.
|
||||||
|
// otherwise it is set to narrow width that is optimal.
|
||||||
|
|
||||||
11: begin
|
11: begin
|
||||||
case(SCALE)
|
case(SCALE)
|
||||||
|
|||||||
Reference in new issue
Block a user