URL
https://opencores.org/ocsvn/mkjpeg/mkjpeg/trunk
Subversion Repositories mkjpeg
Compare Revisions
- This comparison shows the changes necessary to convert path
/mkjpeg/trunk/tb
- from Rev 28 to Rev 32
- ↔ Reverse comparison
Rev 28 → Rev 32
/wave.do
414,21 → 414,26
add wave -noupdate -divider quantizer |
add wave -noupdate -format Logic /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/rst |
add wave -noupdate -format Logic /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/clk |
add wave -noupdate -format Literal -radix decimal /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/di |
add wave -noupdate -format Literal /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/di |
add wave -noupdate -format Logic /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/divalid |
add wave -noupdate -format Literal -radix decimal /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/do |
add wave -noupdate -format Literal /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/qdata |
add wave -noupdate -format Literal /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/qwaddr |
add wave -noupdate -format Logic /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/qwren |
add wave -noupdate -format Literal /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/cmp_idx |
add wave -noupdate -format Literal /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/do |
add wave -noupdate -format Logic /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/dovalid |
add wave -noupdate -format Literal /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/romaddr_s |
add wave -noupdate -format Literal /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/slv_romaddr_s |
add wave -noupdate -format Literal /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/romdatao_s |
add wave -noupdate -format Literal -radix decimal /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/di_d1 |
add wave -noupdate -format Literal -radix unsigned /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/divisor_s |
add wave -noupdate -format Literal /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/divisor_s |
add wave -noupdate -format Literal /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/remainder_s |
add wave -noupdate -format Literal -radix decimal /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/do_s |
add wave -noupdate -format Literal /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/do_s |
add wave -noupdate -format Logic /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/round_s |
add wave -noupdate -format Literal /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/di_d1 |
add wave -noupdate -format Literal /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/pipeline_reg |
add wave -noupdate -format Literal /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/sign_bit_pipe |
add wave -noupdate -format Literal /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/pipeline_reg |
add wave -noupdate -format Literal -radix decimal /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/do_rdiv |
add wave -noupdate -format Literal /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/do_rdiv |
add wave -noupdate -format Logic /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/table_select |
add wave -noupdate -divider r_divider |
add wave -noupdate -format Logic /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/r_divider/rst |
add wave -noupdate -format Logic /jpeg_tb/u_jpegenc/u_zz_top/u_quantizer/r_divider/clk |
655,7 → 660,7
add wave -noupdate -format Logic /jpeg_tb/u_jpegenc/u_outmux/ram_wren |
add wave -noupdate -format Literal /jpeg_tb/u_jpegenc/u_outmux/ram_wraddr |
TreeUpdate [SetDefaultTree] |
WaveRestoreCursors {{Cursor 4} {4522517 ps} 0} |
WaveRestoreCursors {{Cursor 4} {45000815232 ps} 0} |
configure wave -namecolwidth 150 |
configure wave -valuecolwidth 55 |
configure wave -justifyvalue left |
670,4 → 675,4
configure wave -timeline 0 |
configure wave -timelineunits ps |
update |
WaveRestoreZoom {4322687 ps} {4579293 ps} |
WaveRestoreZoom {45000756225 ps} {45001012831 ps} |
/header.hex
33,10 → 33,10
00 |
02 |
11 |
00 |
01 |
03 |
11 |
00 |
01 |
FF |
DB |
00 |
92,6 → 92,75
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
FF |
DB |
00 |
43 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
01 |
/vhdl/HostBFM.vhd
279,7 → 279,7
type ROMQ_TYPE is array (0 to 64-1) |
of unsigned(7 downto 0); |
|
constant qrom : ROMQ_TYPE := |
constant qrom_lum : ROMQ_TYPE := |
( |
-- 100% |
--others => X"01" |
303,10 → 303,10
--X"1C", X"1E", X"1F", X"1E" |
|
-- 75% |
--X"08", X"06", X"06", X"07", X"06", X"05", X"08", X"07", X"07", X"07", X"09", X"09", X"08", X"0A", X"0C", X"14", |
--X"0D", X"0C", X"0B", X"0B", X"0C", X"19", X"12", X"13", X"0F", X"14", X"1D", X"1A", X"1F", X"1E", X"1D", X"1A", |
--X"1C", X"1C", X"20", X"24", X"2E", X"27", X"20", X"22", X"2C", X"23", X"1C", X"1C", X"28", X"37", X"29", X"2C", |
--X"30", X"31", X"34", X"34", X"34", X"1F", X"27", X"39", X"3D", X"38", X"32", X"3C", X"2E", X"33", X"34", X"32" |
X"08", X"06", X"06", X"07", X"06", X"05", X"08", X"07", X"07", X"07", X"09", X"09", X"08", X"0A", X"0C", X"14", |
X"0D", X"0C", X"0B", X"0B", X"0C", X"19", X"12", X"13", X"0F", X"14", X"1D", X"1A", X"1F", X"1E", X"1D", X"1A", |
X"1C", X"1C", X"20", X"24", X"2E", X"27", X"20", X"22", X"2C", X"23", X"1C", X"1C", X"28", X"37", X"29", X"2C", |
X"30", X"31", X"34", X"34", X"34", X"1F", X"27", X"39", X"3D", X"38", X"32", X"3C", X"2E", X"33", X"34", X"32" |
|
-- 15 % |
--X"35", X"25", X"28", X"2F", |
324,9 → 324,22
--X"FF", X"FF", X"FF", X"FF", |
--X"FF", X"CE", X"FF", X"FF", |
--X"FF", X"FF", X"FF", X"FF", |
--X"FF", X"FF", X"FF", X"FF" |
--X"FF", X"FF", X"FF", X"FF" |
|
-- 50% |
--X"10", X"0B", X"0C", X"0E", X"0C", X"0A", X"10", X"0E", |
--X"0D", X"0E", X"12", X"11", X"10", X"13", X"18", X"28", |
--X"1A", X"18", X"16", X"16", X"18", X"31", X"23", X"25", |
--X"1D", X"28", X"3A", X"33", X"3D", X"3C", X"39", X"33", |
--X"38", X"37", X"40", X"48", X"5C", X"4E", X"40", X"44", |
--X"57", X"45", X"37", X"38", X"50", X"6D", X"51", X"57", |
--X"5F", X"62", X"67", X"68", X"67", X"3E", X"4D", X"71", |
--X"79", X"70", X"64", X"78", X"5C", X"65", X"67", X"63" |
); |
|
constant qrom_chr : ROMQ_TYPE := |
( |
-- 50% for luminance! but used as chrominance, TODO!! |
X"10", X"0B", X"0C", X"0E", X"0C", X"0A", X"10", X"0E", |
X"0D", X"0E", X"12", X"11", X"10", X"13", X"18", X"28", |
X"1A", X"18", X"16", X"16", X"18", X"31", X"23", X"25", |
366,17 → 379,25
host_read(CLK, X"0000_0004", data_read, |
OPB_ABus, OPB_BE, OPB_DBus_out, OPB_RNW, OPB_select, OPB_XferAck); |
|
-- write quantization table |
-- write luminance quantization table |
for i in 0 to 64-1 loop |
data_write := X"0000_00" & qrom(i); |
data_write := X"0000_00" & qrom_lum(i); |
addr := X"0000_0100" + to_unsigned(4*i,32); |
-- SOF & num_comps |
host_write(CLK, addr, data_write, |
OPB_ABus, OPB_BE, OPB_DBus_in, OPB_RNW, OPB_select, OPB_XferAck); |
|
end loop; |
|
|
-- write chrominance quantization table |
for i in 0 to 64-1 loop |
data_write := X"0000_00" & qrom_chr(i); |
addr := X"0000_0200" + to_unsigned(4*i,32); |
host_write(CLK, addr, data_write, |
OPB_ABus, OPB_BE, OPB_DBus_in, OPB_RNW, OPB_select, OPB_XferAck); |
|
end loop; |
|
|
|
data_write := to_unsigned(1,32) + shift_left(to_unsigned(3,32),1); |
|