summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-04-19 00:42:02 (UTC)
committer mickeyl <mickeyl>2003-04-19 00:42:02 (UTC)
commitb8ac94f049b5a2de9a3567ee60dd98139321a0cf (patch) (side-by-side diff)
tree83c78cd36515fa6d00795dd4ec8b611aef96391a
parent724bb4ef15cd02a360e49de9c67847a19d5ca832 (diff)
downloadopie-b8ac94f049b5a2de9a3567ee60dd98139321a0cf.zip
opie-b8ac94f049b5a2de9a3567ee60dd98139321a0cf.tar.gz
opie-b8ac94f049b5a2de9a3567ee60dd98139321a0cf.tar.bz2
remove crappy undocumented and useless code stealing me hours diving into yet understanding nada
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/camera/jpegtoavi/CHANGELOG7
-rw-r--r--noncore/multimedia/camera/jpegtoavi/COPYING341
-rw-r--r--noncore/multimedia/camera/jpegtoavi/README49
-rw-r--r--noncore/multimedia/camera/jpegtoavi/avifmt.h116
-rw-r--r--noncore/multimedia/camera/jpegtoavi/byteswap.h31
-rw-r--r--noncore/multimedia/camera/jpegtoavi/jpegtoavi.c349
6 files changed, 0 insertions, 893 deletions
diff --git a/noncore/multimedia/camera/jpegtoavi/CHANGELOG b/noncore/multimedia/camera/jpegtoavi/CHANGELOG
deleted file mode 100644
index a54b960..0000000
--- a/noncore/multimedia/camera/jpegtoavi/CHANGELOG
+++ b/dev/null
@@ -1,7 +0,0 @@
-18/03/03
-
-1. (BUG*) reported size in -fsz mode was 8 bytes too small
-2. (NEW) added -f switch for specifying the frame rate in fps
-3. (BUG*) some DWORDs weren't being converted to little-endian
-4. (NEW) added --version switch
-5. *** VERSION 1.2 frozen *** \ No newline at end of file
diff --git a/noncore/multimedia/camera/jpegtoavi/COPYING b/noncore/multimedia/camera/jpegtoavi/COPYING
deleted file mode 100644
index afd5a94..0000000
--- a/noncore/multimedia/camera/jpegtoavi/COPYING
+++ b/dev/null
@@ -1,341 +0,0 @@
-
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the 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 Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/noncore/multimedia/camera/jpegtoavi/README b/noncore/multimedia/camera/jpegtoavi/README
deleted file mode 100644
index 6a0057f..0000000
--- a/noncore/multimedia/camera/jpegtoavi/README
+++ b/dev/null
@@ -1,49 +0,0 @@
-JPEGTOAVI
-by Phillip Bruce
-
-
-I. Introduction
-
-In the tradition of the Unix computing philosophy, here is
-yet another operator that does one simple task, namely the
-creation of an AVI MJPEG file given a list of JPEG/JFIF files.
-
-I had some difficulty in performing this extremely simple task
-in Linux, mostly because it is so simple and all of the existing
-code to do it lie at the bottom of complicated and more ambitious
-projects--e.g. xawtv, avifile, etc. I then had to waste
-time reading M$ docs and xawtv source to find out how to do it.
-
-
-II. Installation
-
-The code is pretty basic, and so it should be pretty easy to
-install: "make all" compiles the program, "make install"
-installs it. If you want the files to reside in some directory
-besides /usr/local/bin and /usr/local/man, edit "Makefile".
-
-
-II. Usage
-
-There are three basic modes of operation:
-
-1. jpegtoavi per_usec width height img1 [img2 ... imgN]
-2. jpegtoavi -f fps width height img1 [img2 ... imgN]
-3. jpegtoavi -fsz img1 [img2 .. imgN]
-
-The first two print an AVI to STDOUT using the width and height
-parameters and the images named in chronological order. (No
-checks are made on the validity of the JPEG/JFIFs or their
-dimensions.) The first mode specifies the frame rate in
-terms of the period in microseconds for each frame, whereas
-the second specifies frames per second.
-
-The third mode was added to give size hints during the transfer
-of AVIs without the use of a temporary file. Instead of
-generating the AVI it outputs the size in bytes that of the AVI
-that could have been generated.
-
-
-III. Contact, Bug Reports, and Suggestions
-
-Send them to me at dI77IHd@yahoo.com \ No newline at end of file
diff --git a/noncore/multimedia/camera/jpegtoavi/avifmt.h b/noncore/multimedia/camera/jpegtoavi/avifmt.h
deleted file mode 100644
index 53ce60d..0000000
--- a/noncore/multimedia/camera/jpegtoavi/avifmt.h
+++ b/dev/null
@@ -1,116 +0,0 @@
-#ifndef _AVIFMT_HH_
-#define _AVIFMT_HH_
-
-/* 4 bytes */
-typedef int WORD;
-typedef unsigned int DWORD;
-/* 1 byte */
-typedef char BYTE;
-
-
-/* flags for use in flags in AVI_avih */
-const DWORD AVIF_HASINDEX=0x00000010; /* index at end of file */
-const DWORD AVIF_MUSTUSEINDEX=0x00000020;
-const DWORD AVIF_ISINTERLEAVED=0x00000100;
-const DWORD AVIF_TRUSTCKTYPE=0x00000800;
-const DWORD AVIF_WASCAPTUREFILE=0x00010000;
-const DWORD AVIF_COPYRIGHTED=0x00020000;
-
-
-struct AVI_avih {
- DWORD us_per_frame; // frame display rate (or 0L)
- DWORD max_bytes_per_sec; // max. transfer rate
- DWORD padding; // pad to multiples of this size;
- // normally 2K.
- DWORD flags;
- DWORD tot_frames; // # frames in file
- DWORD init_frames;
- DWORD streams;
- DWORD buff_sz;
- DWORD width;
- DWORD height;
- DWORD reserved[4];
-};
-
-
-struct AVI_strh {
- unsigned char type[4]; /* stream type */
- unsigned char handler[4];
- DWORD flags;
- DWORD priority;
- DWORD init_frames; /* initial frames (???) */
- DWORD scale;
- DWORD rate;
- DWORD start;
- DWORD length;
- DWORD buff_sz; /* suggested buffer size */
- DWORD quality;
- DWORD sample_sz;
- /*
- DWORD frame[4];
- XXX 16 bytes ? */
-};
-
-
-struct AVI_strf { /* == BitMapInfoHeader */
- DWORD sz;
- DWORD width;
- DWORD height;
- DWORD planes_bit_cnt;
- unsigned char compression[4];
- DWORD image_sz;
- DWORD xpels_meter;
- DWORD ypels_meter;
- DWORD num_colors; /* used colors */
- DWORD imp_colors; /* important colors */
- /* may be more for some codecs */
-};
-
-
-struct AVI_list_hdr {
- unsigned char id[4];
- DWORD sz;
- unsigned char type[4];
-};
-
-
-struct AVI_list_odml {
- struct AVI_list_hdr list_hdr;
-
- unsigned char id[4];
- DWORD sz;
- DWORD frames;
-};
-
-
-struct AVI_list_strl {
- struct AVI_list_hdr list_hdr;
-
- /* chunk strh */
- unsigned char strh_id[4];
- DWORD strh_sz;
- struct AVI_strh strh;
-
- /* chunk strf */
- unsigned char strf_id[4];
- DWORD strf_sz;
- struct AVI_strf strf;
-
- /* list odml */
- struct AVI_list_odml list_odml;
-};
-
-
-struct AVI_list_hdrl {
- struct AVI_list_hdr list_hdr;
-
- /* chunk avih */
- unsigned char avih_id[4];
- DWORD avih_sz;
- struct AVI_avih avih;
-
- /* list strl */
- struct AVI_list_strl strl;
-};
-
-#endif
diff --git a/noncore/multimedia/camera/jpegtoavi/byteswap.h b/noncore/multimedia/camera/jpegtoavi/byteswap.h
deleted file mode 100644
index 17ab6cc..0000000
--- a/noncore/multimedia/camera/jpegtoavi/byteswap.h
+++ b/dev/null
@@ -1,31 +0,0 @@
-#ifndef _BYTESWAP_H_
-#define _BYTESWAP_H_
-
-#include <endian.h>
-#include <sys/types.h>
-
-#ifndef BYTE_ORDER
-# error "Aiee: BYTE_ORDER not defined\n";
-#endif
-
-#define SWAP2(x) (((x>>8) & 0x00ff) |\
- ((x<<8) & 0xff00))
-
-#define SWAP4(x) (((x>>24) & 0x000000ff) |\
- ((x>>8) & 0x0000ff00) |\
- ((x<<8) & 0x00ff0000) |\
- ((x<<24) & 0xff000000))
-
-#if BYTE_ORDER==BIG_ENDIAN
-# define LILEND2(a) SWAP2((a))
-# define LILEND4(a) SWAP4((a))
-# define BIGEND2(a) (a)
-# define BIGEND4(a) (a)
-#else
-# define LILEND2(a) (a)
-# define LILEND4(a) (a)
-# define BIGEND2(a) SWAP2((a))
-# define BIGEND4(a) SWAP4((a))
-#endif
-
-#endif
diff --git a/noncore/multimedia/camera/jpegtoavi/jpegtoavi.c b/noncore/multimedia/camera/jpegtoavi/jpegtoavi.c
deleted file mode 100644
index 10a2f81..0000000
--- a/noncore/multimedia/camera/jpegtoavi/jpegtoavi.c
+++ b/dev/null
@@ -1,349 +0,0 @@
-/*
-
- A simple converter of JPEGs to an AVI-MJPEG animation.
-
- USAGE:
- 1. jpegtoavi {usec per img} {img width} {img height}
- {img1 .. imgN}
- (writes AVI file to stdout)
-
- 2. jpegtoavi -f {fps} {img width} {img height}
- {img1 .. imgN}
- (same as #1 but with period specified in terms of fps)
-
- 3. jpegtoavi -fsz {img1 .. imgN}
- (writes sz in bytes of such an AVI file to stdout)
-*/
-
-#define _LARGEFILE_SOURCE
-#define _LARGEFILE64_SOURCE
-
-#include <stdio.h>
-#include "avifmt.h"
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include "byteswap.h"
-#include <stdlib.h>
-
-
-/*
- spc: indicating file sz in bytes, -1 on error
-*/
-off_t file_sz(char *fn)
-{
- struct stat s;
- if(stat(fn,&s)==-1)
- return -1;
- return s.st_size;
-}
-
-
-/*
- spc: returning sum of sizes of named JPEGs, -1 on error;
- file sizes adjusted to multiple of 4-bytes
- pos: szarray, if non-0, contains true sizes of files
-*/
-off_t img_array_sz(char **img,int imgsz,DWORD *szarray)
-{
- off_t tmp,ret=0;
- int i=0;
- for(;i<imgsz;++i) {
- if((tmp=file_sz(img[i]))==-1)
- return -1;
- if(szarray)
- szarray[i]=(DWORD)tmp;
- tmp+=((4-(tmp%4))%4);
- ret+=tmp;
- }
- return ret;
-}
-
-
-/*
- spc: printing 4 byte word in little-endian fmt
-*/
-void print_quartet(unsigned int i)
-{
- putchar(i%0x100); i/=0x100;
- putchar(i%0x100); i/=0x100;
- putchar(i%0x100); i/=0x100;
- putchar(i%0x100);
-}
-
-
-inline void show_help(int argc,char **argv)
-{
- fprintf(stderr,"USAGE: jpegtoavi {usec per img} {img width} {img height} {img1 .. imgN}\n");
- fprintf(stderr," jpegtoavi -f {fps} {img width} {img height} {img1 .. imgN}\n");
- fprintf(stderr," jpegtoavi --fsz {img1 .. imgN}\n");
-}
-
-
-int main(int argc,char **argv)
-{
- DWORD per_usec=1;
- DWORD width;
- DWORD height;
- DWORD frames=1;
- unsigned int fps;
- unsigned short img0;
- off64_t jpg_sz_64,riff_sz_64;
- long jpg_sz=1;
- const off64_t MAX_RIFF_SZ=2147483648LL; /* 2 Gb limit */
- DWORD riff_sz;
-
- int fd,f;
- long nbr,nbw,tnbw=0;
- char buff[512];
- DWORD *szarray=0;
- DWORD *offsets=0;
- off_t mfsz,remnant;
-
- struct AVI_list_hdrl hdrl={
- /* header */
- {
- {'L','I','S','T'},
- LILEND4(sizeof(struct AVI_list_hdrl)-8),
- {'h','d','r','l'}
- },
-
- /* chunk avih */
- {'a','v','i','h'},
- LILEND4(sizeof(struct AVI_avih)),
- {
- LILEND4(per_usec),
- LILEND4(1000000*(jpg_sz/frames)/per_usec),
- LILEND4(0),
- LILEND4(AVIF_HASINDEX),
- LILEND4(frames),
- LILEND4(0),
- LILEND4(1),
- LILEND4(0),
- LILEND4(width),
- LILEND4(height),
- {LILEND4(0),LILEND4(0),LILEND4(0),LILEND4(0)}
- },
-
- /* list strl */
- {
- {
- {'L','I','S','T'},
- LILEND4(sizeof(struct AVI_list_strl)-8),
- {'s','t','r','l'}
- },
-
- /* chunk strh */
- {'s','t','r','h'},
- LILEND4(sizeof(struct AVI_strh)),
- {
- {'v','i','d','s'},
- {'M','J','P','G'},
- LILEND4(0),
- LILEND4(0),
- LILEND4(0),
- LILEND4(per_usec),
- LILEND4(1000000),
- LILEND4(0),
- LILEND4(frames),
- LILEND4(0),
- LILEND4(0),
- LILEND4(0)
- },
-
- /* chunk strf */
- {'s','t','r','f'},
- sizeof(struct AVI_strf),
- {
- LILEND4(sizeof(struct AVI_strf)),
- LILEND4(width),
- LILEND4(height),
- LILEND4(1+24*256*256),
- {'M','J','P','G'},
- LILEND4(width*height*3),
- LILEND4(0),
- LILEND4(0),
- LILEND4(0),
- LILEND4(0)
- },
-
- /* list odml */
- {
- {
- {'L','I','S','T'},
- LILEND4(16),
- {'o','d','m','l'}
- },
- {'d','m','l','h'},
- LILEND4(4),
- LILEND4(frames)
- }
- }
- };
-
- /* parsing command line arguments */
- if(argc<2) {
- show_help(argc,argv);
- return -1;
- }
- else if(argc==2 && strcmp(argv[1],"--version")==0) {
- printf("jpegtoavi v%d.%d\n",VERSION_MAJ,VERSION_MIN);
- return 0;
- }
- else if(argc<3) {
- show_help(argc,argv);
- return -1;
- }
- else if(strcmp(argv[1],"-fsz")==0) {
- img0=2;
- }
- else if(strcmp(argv[1],"-f")==0) {
- if(argc<6 || sscanf(argv[2],"%u",&fps)!=1
- || fps==0
- || sscanf(argv[3],"%u",&width)!=1
- || sscanf(argv[4],"%u",&height)!=1) {
- show_help(argc,argv);
- return -1;
- }
- else {
- per_usec=1000000/fps;
- img0=5;
- }
- }
- else if(argc<5 || sscanf(argv[1],"%u",&per_usec)!=1
- || sscanf(argv[2],"%u",&width)!=1
- || sscanf(argv[3],"%u",&height)!=1) {
- show_help(argc,argv);
- return -1;
- }
- else {
- img0=4;
- }
- frames=argc-img0;
-
- /* getting image, riff sizes */
- if(img0!=2) {
- if((szarray=(DWORD *)malloc(frames*sizeof(DWORD)))==0) {
- fprintf(stderr,"malloc error");
- free(offsets);
- return -5;
- }
- }
- jpg_sz_64=img_array_sz(&argv[img0],frames,szarray);
- if(jpg_sz_64==-1) {
- fprintf(stderr,"couldn't determine size of images\n");
- return -2;
- }
- riff_sz_64=sizeof(struct AVI_list_hdrl)+4+4+jpg_sz_64
- +8*frames+8+8+16*frames;
- if(riff_sz_64>=MAX_RIFF_SZ) {
- fprintf(stderr,"RIFF would exceed 2 Gb limit\n");
- return -3;
- }
- jpg_sz=(long)jpg_sz_64;
- riff_sz=(DWORD)riff_sz_64;
-
- /* printing RIFF size and quitting */
- if(img0==2) {
- printf("%lu\n",(unsigned long)riff_sz+8UL);
- return 0;
- }
-
- /* printing AVI.. riff hdr */
- printf("RIFF");
- print_quartet(riff_sz);
- printf("AVI ");
-
- /* list hdrl */
- hdrl.avih.us_per_frame=LILEND4(per_usec);
- hdrl.avih.max_bytes_per_sec=LILEND4(1000000*(jpg_sz/frames)
- /per_usec);
- hdrl.avih.tot_frames=LILEND4(frames);
- hdrl.avih.width=LILEND4(width);
- hdrl.avih.height=LILEND4(height);
- hdrl.strl.strh.scale=LILEND4(per_usec);
- hdrl.strl.strh.rate=LILEND4(1000000);
- hdrl.strl.strh.length=LILEND4(frames);
- hdrl.strl.strf.width=LILEND4(width);
- hdrl.strl.strf.height=LILEND4(height);
- hdrl.strl.strf.image_sz=LILEND4(width*height*3);
- hdrl.strl.list_odml.frames=LILEND4(frames);
- fwrite(&hdrl,sizeof(hdrl),1,stdout);
-
- /* list movi */
- printf("LIST");
- print_quartet(jpg_sz+8*frames+4);
- printf("movi");
-
- if((offsets=(DWORD *)malloc(frames*sizeof(DWORD)))==0) {
- fprintf(stderr,"malloc error");
- return -4;
- }
-
- for(f=img0;f<argc;++f) {
- printf("00db");
- mfsz=szarray[f-img0];
- remnant=(4-(mfsz%4))%4;
- print_quartet(mfsz+remnant);
- szarray[f-img0]+=remnant;
- if(f==img0) {
- offsets[0]=4;
- }
- else {
- offsets[f-img0]=offsets[f-img0-1]+szarray[f-img0-1]+8;
- }
- if((fd=open(argv[f],O_RDONLY))<0) {
- fprintf(stderr,"couldn't open file!\n");
- free(offsets);
- free(szarray);
- return -6;
- }
- nbw=0;
-
- if((nbr=read(fd,buff,6))!=6) {
- fprintf(stderr,"error\n");
- free(offsets);
- free(szarray);
- return -7;
- }
- fwrite(buff,nbr,1,stdout);
- read(fd,buff,4);
- fwrite("AVI1",4,1,stdout);
- nbw=10;
-
- while((nbr=read(fd,buff,512))>0) {
- fwrite(buff,nbr,1,stdout);
- nbw+=nbr;
- }
- if(remnant>0) {
- fwrite(buff,remnant,1,stdout);
- nbw+=remnant;
- }
- tnbw+=nbw;
- close(fd);
- }
- if(tnbw!=jpg_sz) {
- fprintf(stderr,"error writing images (wrote %ld bytes, expected %ld bytes)\n",
- tnbw,jpg_sz);
- free(offsets);
- free(szarray);
- return -8;
- }
-
- // indices
- printf("idx1");
- print_quartet(16*frames);
- for(f=0;f<frames;++f) {
- printf("00db");
- print_quartet(18);
- print_quartet(offsets[f]);
- print_quartet(szarray[f]);
- }
-
- free(offsets);
- free(szarray);
- return 0;
-}
-