URL
https://opencores.org/ocsvn/mkjpeg/mkjpeg/trunk
Subversion Repositories mkjpeg
Compare Revisions
- This comparison shows the changes necessary to convert path
/mkjpeg/branches
- from Rev 14 to Rev 15
- ↔ Reverse comparison
Rev 14 → Rev 15
/main/license-gpl-3.0.txt
File deleted
/main/design/huffman/Huffman.vhd
89,6 → 89,7
signal state : T_STATE; |
signal rle_buf_sel_s : std_logic; |
signal word_reg : unsigned(C_M-1 downto 0); |
signal word2_reg : unsigned(C_M-1 downto 0); |
signal bit_ptr : unsigned(5 downto 0); |
signal num_fifo_wrs : unsigned(2 downto 0); |
signal VLI_ext : unsigned(15 downto 0); |
128,6 → 129,8
signal VLC_size_d : unsigned(4 downto 0); |
signal VLI_ext_d : unsigned(15 downto 0); |
signal VLI_ext_size_d : unsigned(4 downto 0); |
signal pad_reg : std_logic; |
signal pad_byte : std_logic_vector(7 downto 0); |
|
------------------------------------------------------------------------------- |
-- Architecture: begin |
339,6 → 342,10
fifo_wbyte <= (others => '0'); |
end case; |
|
if pad_reg = '1' then |
fifo_wbyte <= pad_byte; |
end if; |
|
-- last byte write |
if fifo_wrt_cnt + 1 = num_fifo_wrs then |
ready_HFW <= '1'; |
373,8 → 380,11
VLC_size_d <= (others => '0'); |
VLI_ext_d <= (others => '0'); |
VLI_ext_size_d <= (others => '0'); |
word2_reg <= (others => '0'); |
elsif CLK'event and CLK = '1' then |
ready_pb <= '0'; |
ready_pb <= '0'; |
pad_reg <= '0'; |
word2_reg <= word_reg; |
|
VLC_plus_VLI_size <= resize(VLC_size,5) + resize(VLI_ext_size,5); |
VLC_d <= VLC; |
402,6 → 412,9
elsif i < VLC_plus_VLI_size then |
word_reg(to_integer(word_idx(i))) <= VLI_ext_d(to_integer(vlx_idx(i))); |
end if; |
elsif ready_HFW = '1' then |
-- shift word reg left to skip bytes already written to FIFO |
word_reg <= shift_left(word2_reg, to_integer(num_fifo_wrs & "000")); |
end if; |
end loop; |
|
423,7 → 436,7
-- HandleFifoWrites completed |
elsif ready_HFW = '1' then |
-- shift word reg left to skip bytes already written to FIFO |
word_reg <= shift_left(word_reg, to_integer(num_fifo_wrs & "000")); |
--word_reg <= shift_left(word_reg, to_integer(num_fifo_wrs & "000")); |
-- adjust bit pointer after some bytes were written to FIFO |
-- modulo 8 operation |
bit_ptr <= bit_ptr - (num_fifo_wrs & "000"); |
433,7 → 446,7
if rle_fifo_empty = '1' then |
-- end of segment |
if bit_ptr - (num_fifo_wrs & "000") /= 0 and last_block = '1' then |
state <= PAD; |
state <= PAD; |
else |
ready_pb <= '1'; |
state <= IDLE; |
444,15 → 457,22
-- end of segment which requires bit padding |
when PAD => |
if HFW_running = '0' then |
-- 1's bit padding to integer number of bytes |
--word_reg(C_M-1-to_integer(bit_ptr) downto |
-- C_M-to_integer(bit_ptr)-8) <= (others => '1'); |
-- 1's bit padding to integer number of bytes |
--for i in 0 to C_M-1 loop |
-- if i < 8 then |
-- word_reg(C_M-1-to_integer(bit_ptr)-i) <= '1'; |
-- end if; |
--end loop; |
|
for i in 0 to C_M-1 loop |
if i < 8 then |
word_reg(C_M-1-to_integer(bit_ptr)-i) <= '1'; |
for i in 0 to 7 loop |
if i < bit_ptr then |
pad_byte(7-i) <= word_reg(C_M-1-i); |
else |
pad_byte(7-i) <= '1'; |
end if; |
end loop; |
|
pad_reg <= '1'; |
|
bit_ptr <= to_unsigned(8, bit_ptr'length); |
|
460,7 → 480,8
HFW_running <= '1'; |
elsif ready_HFW = '1' then |
bit_ptr <= (others => '0'); |
HFW_running <= '0'; |
HFW_running <= '0'; |
pad_reg <= '0'; |
|
ready_pb <= '1'; |
state <= IDLE; |
/main/design/common/JPEG_PKG.vhd
28,7 → 28,7
|
constant C_HDR_SIZE : integer := 338; |
|
constant C_MAX_LINE_WIDTH : integer := 640; |
constant C_MAX_LINE_WIDTH : integer := 1280; |
|
type T_SM_SETTINGS is record |
x_cnt : unsigned(15 downto 0); |
/main/license-lgpl-3.0.txt
0,0 → 1,165
GNU LESSER GENERAL PUBLIC LICENSE |
Version 3, 29 June 2007 |
|
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> |
Everyone is permitted to copy and distribute verbatim copies |
of this license document, but changing it is not allowed. |
|
|
This version of the GNU Lesser General Public License incorporates |
the terms and conditions of version 3 of the GNU General Public |
License, supplemented by the additional permissions listed below. |
|
0. Additional Definitions. |
|
As used herein, "this License" refers to version 3 of the GNU Lesser |
General Public License, and the "GNU GPL" refers to version 3 of the GNU |
General Public License. |
|
"The Library" refers to a covered work governed by this License, |
other than an Application or a Combined Work as defined below. |
|
An "Application" is any work that makes use of an interface provided |
by the Library, but which is not otherwise based on the Library. |
Defining a subclass of a class defined by the Library is deemed a mode |
of using an interface provided by the Library. |
|
A "Combined Work" is a work produced by combining or linking an |
Application with the Library. The particular version of the Library |
with which the Combined Work was made is also called the "Linked |
Version". |
|
The "Minimal Corresponding Source" for a Combined Work means the |
Corresponding Source for the Combined Work, excluding any source code |
for portions of the Combined Work that, considered in isolation, are |
based on the Application, and not on the Linked Version. |
|
The "Corresponding Application Code" for a Combined Work means the |
object code and/or source code for the Application, including any data |
and utility programs needed for reproducing the Combined Work from the |
Application, but excluding the System Libraries of the Combined Work. |
|
1. Exception to Section 3 of the GNU GPL. |
|
You may convey a covered work under sections 3 and 4 of this License |
without being bound by section 3 of the GNU GPL. |
|
2. Conveying Modified Versions. |
|
If you modify a copy of the Library, and, in your modifications, a |
facility refers to a function or data to be supplied by an Application |
that uses the facility (other than as an argument passed when the |
facility is invoked), then you may convey a copy of the modified |
version: |
|
a) under this License, provided that you make a good faith effort to |
ensure that, in the event an Application does not supply the |
function or data, the facility still operates, and performs |
whatever part of its purpose remains meaningful, or |
|
b) under the GNU GPL, with none of the additional permissions of |
this License applicable to that copy. |
|
3. Object Code Incorporating Material from Library Header Files. |
|
The object code form of an Application may incorporate material from |
a header file that is part of the Library. You may convey such object |
code under terms of your choice, provided that, if the incorporated |
material is not limited to numerical parameters, data structure |
layouts and accessors, or small macros, inline functions and templates |
(ten or fewer lines in length), you do both of the following: |
|
a) Give prominent notice with each copy of the object code that the |
Library is used in it and that the Library and its use are |
covered by this License. |
|
b) Accompany the object code with a copy of the GNU GPL and this license |
document. |
|
4. Combined Works. |
|
You may convey a Combined Work under terms of your choice that, |
taken together, effectively do not restrict modification of the |
portions of the Library contained in the Combined Work and reverse |
engineering for debugging such modifications, if you also do each of |
the following: |
|
a) Give prominent notice with each copy of the Combined Work that |
the Library is used in it and that the Library and its use are |
covered by this License. |
|
b) Accompany the Combined Work with a copy of the GNU GPL and this license |
document. |
|
c) For a Combined Work that displays copyright notices during |
execution, include the copyright notice for the Library among |
these notices, as well as a reference directing the user to the |
copies of the GNU GPL and this license document. |
|
d) Do one of the following: |
|
0) Convey the Minimal Corresponding Source under the terms of this |
License, and the Corresponding Application Code in a form |
suitable for, and under terms that permit, the user to |
recombine or relink the Application with a modified version of |
the Linked Version to produce a modified Combined Work, in the |
manner specified by section 6 of the GNU GPL for conveying |
Corresponding Source. |
|
1) Use a suitable shared library mechanism for linking with the |
Library. A suitable mechanism is one that (a) uses at run time |
a copy of the Library already present on the user's computer |
system, and (b) will operate properly with a modified version |
of the Library that is interface-compatible with the Linked |
Version. |
|
e) Provide Installation Information, but only if you would otherwise |
be required to provide such information under section 6 of the |
GNU GPL, and only to the extent that such information is |
necessary to install and execute a modified version of the |
Combined Work produced by recombining or relinking the |
Application with a modified version of the Linked Version. (If |
you use option 4d0, the Installation Information must accompany |
the Minimal Corresponding Source and Corresponding Application |
Code. If you use option 4d1, you must provide the Installation |
Information in the manner specified by section 6 of the GNU GPL |
for conveying Corresponding Source.) |
|
5. Combined Libraries. |
|
You may place library facilities that are a work based on the |
Library side by side in a single library together with other library |
facilities that are not Applications and are not covered by this |
License, and convey such a combined library under terms of your |
choice, if you do both of the following: |
|
a) Accompany the combined library with a copy of the same work based |
on the Library, uncombined with any other library facilities, |
conveyed under the terms of this License. |
|
b) Give prominent notice with the combined library that part of it |
is a work based on the Library, and explaining where to find the |
accompanying uncombined form of the same work. |
|
6. Revised Versions of the GNU Lesser General Public License. |
|
The Free Software Foundation may publish revised and/or new versions |
of the GNU Lesser General Public License from time to time. Such new |
versions will be similar in spirit to the present version, but may |
differ in detail to address new problems or concerns. |
|
Each version is given a distinguishing version number. If the |
Library as you received it specifies that a certain numbered version |
of the GNU Lesser General Public License "or any later version" |
applies to it, you have the option of following the terms and |
conditions either of that published version or of any later version |
published by the Free Software Foundation. If the Library as you |
received it does not specify a version number of the GNU Lesser |
General Public License, you may choose any version of the GNU Lesser |
General Public License ever published by the Free Software Foundation. |
|
If the Library as you received it specifies that a proxy can decide |
whether future versions of the GNU Lesser General Public License shall |
apply, that proxy's public statement of acceptance of any version is |
permanent authorization for you to choose that version for the |
Library. |