Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
x393
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
x393
Commits
36d6441e
Commit
36d6441e
authored
Jun 19, 2015
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modifying table write in compressor chian modules
parent
40c24bfb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
8 deletions
+12
-8
focus_sharp393.v
compressor_jp/focus_sharp393.v
+4
-3
jp_channel.v
compressor_jp/jp_channel.v
+8
-5
No files found.
compressor_jp/focus_sharp393.v
View file @
36d6441e
...
...
@@ -29,6 +29,7 @@
//TODO: Modify to work with other modes (now only on color)
module
focus_sharp393
(
input
clk
,
// pixel clock, posedge
input
clk2x
,
// 2x pixel clock
input
en
,
// enable (0 resets)
input
mclk
,
// system clock to write tables
input
tser_we
,
// enable write to a table
...
...
@@ -176,7 +177,7 @@ module focus_sharp393(
reg
[
2
:
0
]
clksync
;
wire
csync
=
clksync
[
2
]
;
always
@
(
posedge
sclk
)
begin
always
@
(
posedge
clk2x
)
begin
clksync
[
2
:
0
]
<=
{
(
clksync
[
1
]
==
clksync
[
0
])
,
clksync
[
0
]
,
clkdiv2
};
end
...
...
@@ -188,7 +189,7 @@ module focus_sharp393(
assign
mult_a
[
17
:
0
]
=
use_coef
?
{
1'b0
,
tdo
[
15
:
0
]
,
1'b0
}:
mult_s
[
17
:
0
]
;
assign
mult_b
[
17
:
0
]
=
use_coef
?
{
d1
[
10
:
0
]
,{
7
{
d1
[
0
]
}}}:
mult_s
[
17
:
0
]
;
always
@
(
posedge
sclk
)
begin
always
@
(
posedge
clk2x
)
begin
filt_sel
[
3
:
0
]
<=
filt_sel0
[
3
:
0
]
;
if
(
clksync
[
2
])
d1
[
11
:
0
]
<=
di_d
[
11
:
0
]
;
start2
[
8
:
0
]
<=
{
start2
[
7
:
0
]
,
start
&&
csync
};
...
...
@@ -273,7 +274,7 @@ module focus_sharp393(
reg
[
17
:
0
]
mult_a_r
;
reg
[
17
:
0
]
mult_b_r
;
assign
mult_p
=
mult_p_r
;
always
@
(
posedge
sclk
)
begin
always
@
(
posedge
clk2x
)
begin
mult_a_r
<=
mult_a
;
mult_b_r
<=
mult_b
;
mult_p_r
<=
mult_a_r
*
mult_b_r
;
...
...
compressor_jp/jp_channel.v
View file @
36d6441e
...
...
@@ -422,12 +422,15 @@ module jp_channel#(
wire
[
31
:
0
]
hifreq
;
// output[31:0] reg accumulated high frequency components in a frame sub-window
focus_sharp393
focus_sharp393_i
(
.
clk
(
xclk
)
,
// input
.
clk
(
xclk
)
,
// input - pixel clock
.
clk2x
(
xclk2x
)
,
// input 2x pixel clock
.
en
(
frame_en
)
,
// input
.
sclk
(
mclk
)
,
// input system clock: twe, ta,tdi - valid @negedge (ra, tdi - 2 cycles ahead)
.
twe
(
twfe
)
,
// input enable write to a table
.
ta
(
ta
[
9
:
0
])
,
// input[9:0] table address
.
tdi
(
tdi
)
,
// input[15:0] table data in (8 LSBs - quantization data)
.
mclk
(
mclk
)
,
// input system clock, twqe, twce, ta,tdi - valid @posedge (ra, tdi - 2 cycles ahead (was negedge)
.
tser_we
(
tser_fe
)
,
// input - write to a quantization table
.
tser_a_not_d
(
tser_a_not_d
)
,
// input - address/not data to tables
.
tser_d
(
tser_d
)
,
// input[7:0] - byte-wide data to tables
.
mode
(
cmprs_fmode_this
[
1
:
0
])
,
// input[1:0] focus mode (combine image with focus info) - 0 - none, 1 - replace, 2 - combine all, 3 - combine woi
.
firsti
(
color_first
)
,
// input first macroblock
.
lasti
(
color_last
)
,
// input last macroblock
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment