pre release mods and add

LICENSE

@@ -0,0 +1,280 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                          675 Mass Ave, Cambridge, MA 02139, 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

README

@@ -0,0 +1,64 @@
+
+ATPDEC README (Thierry Leconte 2003)
+
+DESCRIPTION
+Atpdec is a open source program that decode images transmitted by POES
+NOAA weather satellite serie.
+These satellites transmit continuously, among other things, medium resolution images
+of the earth on 137Mhz.
+These transmitions could be easely received with
+an inexpensive antenna and dedicated receiver.
+Output from such a receiver, is an audio signal that could be recorded
+into a soundfile with any soundcard.
+
+Atpdec will convert these sounfiles into .png images.
+
+For each soundfile up to 4 images could be generated :
+1) Raw image : contains the 2 transmitted channel images  + telemetry and synchro pulses.
+	Raw image is not calibrated, so it could be too dark or too light depending of
+	the recording level.
+2) Calibrated channel A image
+3) Calibrated channel B image
+4) False color image
+
+Input soundfiles must be mono signal sampled at 11025 Hz.
+Atpdec use libsnd to read soundfile, so any sound file format supported by libsnd
+could be read.(Only tested with .wav file).
+
+COMPILATION
+
+Atpdec is written in plain standart C and must be very portable.
+It was only tested on Linux Suse 8.2, but must work on any Unix platform.
+Just adapt the Makefile and type make (sorry no configure). 
+
+atpdec use libsnd, libpng and libm
+snd.h and png.h header must be present on your system.
+If they are not on standard path, edit the include path in the Makefile.
+
+USAGE
+
+atpdec [options] soundfile
+
+-c file.png
+Use a given colormap for false color generation. Default : Internal colormap.
+-i [r|a|b|c]
+Toggle raw (r) , channel A (a) , channel B (b) or false color (c) output.
+Default : "abc"
+-d directory
+Optional images destination directory. Default : sounfile directory.
+-s Output 8bits grayscale images for chanel A|B and raw images. Default :16bits
+
+Generated image are in png format, 16 or 8bits greyscale for raw and channel A|B images,
+24bits RVB for false color.
+Image names are soundfilename-x.png, where x is :
+	-r for raw images
+	-satellite instrument number (1,2,3A,3B,4,5) for channel A|B images
+	-c for false colors.
+
+	
+EXAMPLE
+atpdec -d test -i ac 09121333.wav
+
+Will process the 09121333.wav file and  generate channel A test/09121333-2.png and false color test/09121333-c.png image files.
+
+

TODO

@@ -0,0 +1,14 @@
+ATPDEC TODO List
+
+- Could be useful to read data directly from /dev/dsp
+
+- False color generation give various results , from good to very poor.
+  Temperature calibration for IR channel could be helpful in this area.
+
+- GUI : I'm not a GUI man , but if someone want to do the job ....
+
+- Optimisation : Don't do anything in order to run fast. There is plenty
+  possibility to increase performance (but on my 1.7GHz celeron , it's
+  already faster than real time...)
+
+

atpdec.1

@@ -2,7 +2,8 @@
 .SH NAME
 atpdec
 .SH OVERVIEW
-atpdec is a decoder for NOAA ATP images. It takes soundfiles recorded from an ATP receiver and convert them into .png images.
+atpdec is a decoder for NOAA weather satellite images (ATP).
+It takes soundfiles recorded from an ATP receiver and convert them into .png images.
 .SH SYNOPSIS
 .B atpdec
 .I "[options]" soundfiles ...
@@ -19,11 +20,52 @@ Default : "abc"
 .TP
 .br
 .B \-d directory
-Optional images destination directory. Default : sounfile directory.
+Optional images destination directory. Default : soundfile directory.
+.TP
+.br
+.B \-s
+Output 8bits grayscale image for channel A|B and raw images. Default  : 16bits images.
+
+Generated image are in png format, 16 or 8bits greyscale for raw and channel A|B images,
+24bits RVB for false color.
+Image names are soundfilename-x.png, where x is :
+        -r for raw images
+        -satellite instrument number (1,2,3A,3B,4,5) for channel A|B images
+        -c for false colors.
+
+
+.SH DESCRIPTION
+Atpdec is a open source program that decode images transmitted by POES
+NOAA weather satellite serie.
+These satellites transmit continuously, among other things, medium resolution
+images of the earth on 137Mhz.
+These transmitions could be easely received with
+an inexpensive antenna and dedicated receiver.
+Output from such a receiver, is an audio signal that could be recorded
+into a soundfile with any soundcard.
+
+Atpdec will convert these sounfiles into .png images.
+
+For each soundfile up to 4 images could be generated :
+1) Raw image : contains the 2 transmitted channel images  + telemetry and synchro pulses.
+        Raw image is not calibrated, so it could be too dark or too light depending of
+        the recording level.
+
+2) Calibrated channel A image
+
+3) Calibrated channel B image
+
+4) False color image
+
+Input soundfiles must be mono signal sampled at 11025 Hz.
+Atpdec use libsnd to read soundfile, so any sound file format supported by libsnd
+could be read.
+
+
 .SH EXAMPLE
 atpdec -d image -i ac *.wav
 
 .br
 Will process all .wav files in the current directory, generate only channel A and false color images and put them in the image directory.
 .SH AUTHOR
-Thierry Leconte
+Thierry Leconte (2003)

main.c

@@ -61,9 +61,9 @@ return(sf_read_float(inwav,sample,nb));
 }
 
 png_text text_ptr[2]={
-{ PNG_TEXT_COMPRESSION_NONE, "Software", "Created by Thierry Leconte's atpdec",35 }
+{ PNG_TEXT_COMPRESSION_NONE, "Software", "atpdec (Thierry Leconte)",35 }
 };
-static int ImageOut(char *filename,float **prow,int nrow,int width,int offset)
+static int ImageOut(char *filename,float **prow,int nrow,int depth,int width,int offset)
 {
 FILE *pngfile;
 png_infop info_ptr;
@@ -91,7 +91,7 @@ info_ptr = png_create_info_struct(png_ptr);
 
 png_init_io(png_ptr,pngfile);
 png_set_IHDR(png_ptr, info_ptr, width, nrow,
-       8, PNG_COLOR_TYPE_GRAY, PNG_INTERLACE_NONE,
+       depth, PNG_COLOR_TYPE_GRAY, PNG_INTERLACE_NONE,
        PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
 
 png_set_text(png_ptr, info_ptr, text_ptr, 1);
@@ -100,7 +100,7 @@ printf("Writing %s\n",filename);
 png_write_info(png_ptr,info_ptr);
 for(n=0;n<nrow;n++) {
 	float *pixelv;
-	png_byte pixel[2080];
+	png_byte pixel[2*2080];
 	int	i;
 
 	pixelv=prow[n];
@@ -108,7 +108,14 @@ for(n=0;n<nrow;n++) {
 		float pv;
 
 		pv=pixelv[i+offset];
-		pixel[i]=(png_byte)(pv*255.0);
+		switch(depth) {
+		case 8 :
+			pixel[i]=(png_byte)(pv*255.0);
+			break;
+		case 16 :
+			((unsigned short*)pixel)[i]=htons((unsigned short)(pv*65535.0));
+			break;
+		}
 	}
 	png_write_row(png_ptr,pixel);
 }
@@ -285,13 +292,14 @@ char *pngdirname=NULL;
 char imgopt[20]="abc";
 float *prow[3000];
 const char *chid[6]={ "1","2","3A","4","5","3B"};
+int depth=16;
 int n,nrow;
 int ch;
 int c;
 
 
 opterr=0;
-while ((c=getopt(argc,argv,"c:d:i:"))!=EOF) {
+while ((c=getopt(argc,argv,"c:d:i:s"))!=EOF) {
 	switch(c) {
 		case 'd':
 			pngdirname=optarg;
@@ -302,6 +310,9 @@ while ((c=getopt(argc,argv,"c:d:i:"))!=EOF) {
 		case 'i':
 			strcpy(imgopt,optarg);
 			break;
+		case 's':
+			depth=8;
+			break;
 	}
 }
 
@@ -336,7 +347,7 @@ sf_close(inwav);
 /* raw image */
 if(strchr(imgopt,(int)'r')!=NULL){
 sprintf(pngfilename,"%s/%s.png",pngdirname,name);
-ImageOut(pngfilename,prow,nrow,2080,0);
+ImageOut(pngfilename,prow,nrow,depth,2080,0);
 }
 
 /* Channel A */
@@ -346,7 +357,7 @@ if(((strchr(imgopt,(int)'a')!=NULL) || (strchr(imgopt,(int)'c')!=NULL))) {
 		a=1;
 		if(strchr(imgopt,(int)'a')!=NULL) {
 		sprintf(pngfilename,"%s/%s-%s.png",pngdirname,name,chid[ch]);
-		ImageOut(pngfilename,prow,nrow,954,85);
+		ImageOut(pngfilename,prow,nrow,depth,954,85);
 		}
 	}
 }
@@ -358,7 +369,7 @@ if(((strchr(imgopt,(int)'b')!=NULL) || (strchr(imgopt,(int)'c')!=NULL))) {
 		b=1;
 		if(strchr(imgopt,(int)'b')!=NULL) {
 		sprintf(pngfilename,"%s/%s-%s.png",pngdirname,name,chid[ch]);
-		ImageOut(pngfilename,prow,nrow,954,1125);
+		ImageOut(pngfilename,prow,nrow,depth,954,1125);
 		}
 	}
 }