[Pkg-spca5xx-devel] r234 - in /spcaview/trunk: ./ debian/ debian/patches/ http-java-applet/
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Wed Jan 2 10:05:49 UTC 2008
Author: kelmo-guest
Date: Wed Jan 2 10:05:49 2008
New Revision: 234
URL: http://svn.debian.org/wsvn/pkg-spca5xx/?sc=1&rev=234
Log:
start package from scratch again (almost), total overhaul and new upstream release.
Added:
spcaview/trunk/debian/docs
spcaview/trunk/debian/manpages
- copied, changed from r233, spcaview/trunk/debian/spcaview.manpages
spcaview/trunk/debian/patches/
spcaview/trunk/debian/patches/00_spcaview_manpage.patch
spcaview/trunk/debian/patches/01_spcacat_manpage.patch
spcaview/trunk/debian/patches/02_spcaserv_manpage.patch
spcaview/trunk/debian/patches/10_see_compile_warnings.patch
spcaview/trunk/debian/patches/11_videoOk_is_int.patch
spcaview/trunk/debian/patches/12_use_libjpeg_is_unused.patch
spcaview/trunk/debian/patches/13_default_to_grabber.patch
spcaview/trunk/debian/patches/14_switch_handle_sdl_stuff.patch
spcaview/trunk/debian/patches/15_spcaPlay_unused_vars.patch
spcaview/trunk/debian/patches/series
spcaview/trunk/debian/prepare-upstream-tarball (with props)
Removed:
spcaview/trunk/debian/README.Debian
spcaview/trunk/debian/spcacat.1
spcaview/trunk/debian/spcacat.install
spcaview/trunk/debian/spcacat.manpages
spcaview/trunk/debian/spcaserv.1
spcaview/trunk/debian/spcaserv.install
spcaview/trunk/debian/spcaserv.manpages
spcaview/trunk/debian/spcaview.1
spcaview/trunk/debian/spcaview.install
spcaview/trunk/debian/spcaview.manpages
spcaview/trunk/http-java-applet/
Modified:
spcaview/trunk/Changelog
spcaview/trunk/README
spcaview/trunk/debian/changelog
spcaview/trunk/debian/control
spcaview/trunk/debian/rules
spcaview/trunk/jconfig.h
spcaview/trunk/picture.c
spcaview/trunk/spcav4l.c
spcaview/trunk/spcav4l.h
spcaview/trunk/spcaview.c
spcaview/trunk/tcputils.h
spcaview/trunk/utils.c
spcaview/trunk/version.h
Modified: spcaview/trunk/Changelog
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/Changelog?rev=234&op=diff
==============================================================================
--- spcaview/trunk/Changelog (original)
+++ spcaview/trunk/Changelog Wed Jan 2 10:05:49 2008
@@ -1,4 +1,14 @@
/************* Changelog spcaview *****************/
+06/11/2006:
+version 1.1.8
+ Add bridge pac7311 pac207 vc0321 vc0323
+06/11/2006:
+version 1.1.7
+ FIX broken s key feature !! Who know it was broken ??
+ FIX 160x120 jpeg decoder for 422 stream
+28/08/2006:
+version 1.1.6
+ Add Flicker filters 50Hz 60Hz No flickers Thanks Serge A. Suchkov
10/12/2005:
version 1.1.5rc2
Add ioctl to spcav4l.c spcav4l.h
Modified: spcaview/trunk/README
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/README?rev=234&op=diff
==============================================================================
--- spcaview/trunk/README (original)
+++ spcaview/trunk/README Wed Jan 2 10:05:49 2008
@@ -132,6 +132,7 @@
key w contrast down
key s screenshoot
key j autoexposure ON/OFF (with some webcams)
+ key l Flicker filter 50/60/No
key h frame rate down
key g frame rate up
key d quality up (with some webcams)
Modified: spcaview/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/debian/changelog?rev=234&op=diff
==============================================================================
--- spcaview/trunk/debian/changelog (original)
+++ spcaview/trunk/debian/changelog Wed Jan 2 10:05:49 2008
@@ -1,43 +1,5 @@
-spcaview (20051212-2) UNRELEASED; urgency=low
+spcaview (20071224.dfsg-1) UNRELEASED; urgency=low
- [ Otavio Salvador ]
- * Bump Standards-Version to 3.7.2 (no changes).
+ * Initial Release. (Closes: #304820)
- -- Otavio Salvador <otavio at debian.org> Fri, 2 Jun 2006 10:36:17 -0300
-
-spcaview (20051212-1) unstable; urgency=low
-
- [Kel Modderman]
- * New upstream release.
- * Package produces a binary for each spca5xx tool (spcaview, spcacat,
- spcaview).
- * Bumped debhelper compat level to 5, and build-depend on debhelper
- (>=5.0.0).
- * Tidy up control descriptions for each package.
- * Add manpages for spcacat and spcaserv.
- * Small fixes to spcaview manpage.
- * Remove typo from debian/copyright.
-
- -- Kel Modderman <kelrin at tpg.com.au> Thu, 2 Mar 2006 19:54:40 +1000
-
-spcaview (20051001-1) unstable; urgency=low
-
- [Kel Modderman]
- * New upstream release.
- * Add Build-Depends on libsdl-dev.
- * Use install target of upstream Makefile.
- - package now includes the entire spca5xx toolchain
- - remove spcaview.install
- - add dirs
- - modify rules
- * Ammend short description of binary package.
- * Add watch file.
-
- -- Kel Modderman <kelrin at tpg.com.au> Wed, 12 Oct 2005 21:20:06 +1000
-
-spcaview (20050918-1) unstable; urgency=low
-
- * Initial Release (closes: #304820)
-
- -- Stephen Birch <sgbirch at imsmail.org> Fri, 30 Sep 2005 12:00:47 +0100
-
+ -- Kel Modderman <kel at otaku42.de> Wed, 02 Jan 2008 18:12:17 +1000
Modified: spcaview/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/debian/control?rev=234&op=diff
==============================================================================
--- spcaview/trunk/debian/control (original)
+++ spcaview/trunk/debian/control Wed Jan 2 10:05:49 2008
@@ -1,33 +1,21 @@
Source: spcaview
-Section: misc
+Section: graphics
Priority: optional
Maintainer: Debian spca5xx Maintainers <pkg-spca5xx-devel at lists.alioth.debian.org>
-Uploaders: Stephen Birch <sgbirch at imsmail.org>, Kel Modderman <kelrin at tpg.com.au>, Otavio Salvador <otavio at debian.org>, Itay Ben-Yaacov <nib_maps at yahoo.com>
-Build-Depends: cdbs, debhelper (>= 5.0.0), libsdl-dev
-Standards-Version: 3.7.2
+Uploaders: Stephen Birch <sgbirch at imsmail.org>, Kel Modderman <kel at otaku42.de>, Otavio Salvador <otavio at debian.org>
+Build-Depends: cdbs, debhelper (>= 5), quilt, libsdl-dev
+Standards-Version: 3.7.3
Package: spcaview
Architecture: any
Depends: ${shlibs:Depends}
-Recommends: spcacat, spcaserv
-Description: spca5xx tool for viewing webcam video
- Video recorder and viewer with sound. This package works with the spca5xx
- based webcam with the raw jpeg feature. Spcaview is also able to connect a
- TCP stream from a spacserv server. All decoding is done in user
- space.
-
-Package: spcacat
-Architecture: any
-Depends: ${shlibs:Depends}
-Recommends: spcaserv, spcaview
-Description: spca5xx tool for grabbing pictures from a webcam
- Video frame grabber. This package works with the spca5xx based webcams with
- the raw jpeg feature. All decoding is done in user space.
-
-Package: spcaserv
-Architecture: any
-Depends: ${shlibs:Depends}
-Recommends: spcacat, spcaview
-Description: spca5xx tool for broadcasting a webcam stream over a network
- Video stream server. This package works with the spca5xx based webcams with
- the raw jpeg feature. All decoding is done in user space.
+Description: A set of webcam tools viewing, grabbing and broadcasting webcam video
+ This package provides a set of three tools for manipulating webcams supported
+ by the gspca Linux kernel module (and some others).
+ .
+ spcaview is a video recorder and viewer with sound. spcaview is also able to
+ connect a TCP stream from a spacserv server.
+ .
+ spcacat is a simple video frame grabber.
+ .
+ spcaserv is a multithreaded video streaming server over TCP.
Added: spcaview/trunk/debian/docs
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/debian/docs?rev=234&op=file
==============================================================================
--- spcaview/trunk/debian/docs (added)
+++ spcaview/trunk/debian/docs Wed Jan 2 10:05:49 2008
@@ -1,0 +1,1 @@
+README
Copied: spcaview/trunk/debian/manpages (from r233, spcaview/trunk/debian/spcaview.manpages)
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/debian/manpages?rev=234&op=diff
==============================================================================
--- spcaview/trunk/debian/spcaview.manpages (original)
+++ spcaview/trunk/debian/manpages Wed Jan 2 10:05:49 2008
@@ -1,2 +1,3 @@
-debian/spcaview.1
-
+spcacat.1
+spcaserv.1
+spcaview.1
Added: spcaview/trunk/debian/patches/00_spcaview_manpage.patch
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/debian/patches/00_spcaview_manpage.patch?rev=234&op=file
==============================================================================
--- spcaview/trunk/debian/patches/00_spcaview_manpage.patch (added)
+++ spcaview/trunk/debian/patches/00_spcaview_manpage.patch Wed Jan 2 10:05:49 2008
@@ -1,0 +1,101 @@
+--- /dev/null
++++ b/spcaview.1
+@@ -0,0 +1,98 @@
++.\" Hey, EMACS: -*- nroff -*-
++.\" First parameter, NAME, should be all caps
++.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
++.\" other parameters are allowed: see man(7), man(1)
++.TH SPCAVIEW 1 "September 29, 2005"
++.\" Please adjust this date whenever revising the manpage.
++.\"
++.\" Some roff macros, for reference:
++.\" .nh disable hyphenation
++.\" .hy enable hyphenation
++.\" .ad l left justify
++.\" .ad b justify to both left and right margins
++.\" .nf disable filling
++.\" .fi enable filling
++.\" .br insert line break
++.\" .sp <n> insert n+1 empty lines
++.\" for manpage-specific macros, see man(7)
++.SH NAME
++spcaview \- spca5xx tool for viewing webcam video
++.SH SYNOPSIS
++.B spcaview
++.RI [OPTIONS]
++.SH DESCRIPTION
++.B spcaview
++is a program intended to test the USB camera drivers in spca5xx
++although the tool can also display video from a standard v4l device
++and may also be useful in other applications. It is also able to
++connect a TCP stream from a spacserv server.
++.SH OPTIONS
++A summary of options is included below.
++.TP
++.B \-h
++Show summary of options.
++.TP
++.B \-d /dev/videoX
++use /dev/videoX device
++.TP
++.B \-n
++normalization 0->pal 2->secam 1->ntsc
++.TP
++.B \-c
++input channels 0..9 exclude 4 and 5
++.TP
++.B \-v
++disable video output for raw recording
++.TP
++.B \-j
++disable video output and userspace decoding
++.TP
++.B \-z
++compress yuv420p video output with DPSH encoder
++.TP
++.B \-g
++use read method for grab instead mmap
++.TP
++.B \-l
++use input size 640x480 (default: 320x480)
++.TP
++.B \-s <width>x<height>
++use specified input size
++.TP
++.B \-m <width>x<height>
++use specified ouput size
++.TP
++.B \-a [0|1|2]
++audio, 0 -> nosound 1-> microphone 2-> mixer output
++.TP
++.B \-f format
++video format yuv others options are r16 r24 r32 yuv jpg. (default: yuv)
++.TP
++.B \-b
++enable automatic brightness adjustment
++.TP
++.B \-t
++print statistics
++.TP
++.B \-p x
++getPicture every x seconds
++.TP
++.B \-p x with \-o outfile
++getPicture every x seconds and record in outfile
++.TP
++.B \-w Address:Port
++read from Address xxx.xxx.xxx.xxx:Port
++.TP
++.B \-N x
++take a x pictures and exit if p is not set p = 1 second
++s
++.SH SEE ALSO
++.BR spcacat(1), spcaserv(1), http://mxhaard.free.fr/sview.html
++.SH AUTHOR
++spcaview was written by Michel Xhaard <mxhaard at free.fr>.
++See
++.B /usr/share/doc/spcaview/copyright
++for the list of people of contributed to spcaview.
++.PP
++This manual page was written by Stephen Birch <sgbirch at imsmail.org>,
++for the Debian project (but may be used by others).
Added: spcaview/trunk/debian/patches/01_spcacat_manpage.patch
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/debian/patches/01_spcacat_manpage.patch?rev=234&op=file
==============================================================================
--- spcaview/trunk/debian/patches/01_spcacat_manpage.patch (added)
+++ spcaview/trunk/debian/patches/01_spcacat_manpage.patch Wed Jan 2 10:05:49 2008
@@ -1,0 +1,51 @@
+--- /dev/null
++++ b/spcacat.1
+@@ -0,0 +1,48 @@
++.TH SPCACAT 1 "March 02, 2006"
++.SH NAME
++spcacat \- spca5xx tool for grabbing pictures from a webcam
++.SH SYNOPSIS
++.B spcacat
++.RI [OPTIONS]
++.SH DESCRIPTION
++.B spcacat
++is a simple picture grabber, using the jpeg compressor or embedded jpeg
++software encoder of the hardware.
++.SH OPTIONS
++A summary of options is included below.
++.TP
++.B \-h
++Show summary of options.
++.TP
++.B \-d /dev/videoX
++use /dev/videoX device (default is /dev/video0)
++.TP
++.B \-g
++use read method for grab instead of mmap
++.TP
++.B \-f [r16|r24|r32|jpg|yuv]
++video format (default is yuv)
++.TP
++.B \-s <width>x<height>
++use specified input size
++.TP
++.B \-P /dev/partportX
++use /dev/partportX device
++.TP
++.B \-p Xms
++take a picture every X milliseconds (minimum is 50ms)
++.TP
++.B \-N
++take a N pictures and stop (with Xms interval as specified by the -p option)
++.TP
++.B \-o overwrite picture, each picture produced with the same name (SpacPict.jpg)
++.SH SEE ALSO
++.BR spcaview(1), spcaserv(1)
++.SH AUTHOR
++spcacat was written by Michel Xhaard <mxhaard at free.fr>.
++See
++.B /usr/share/doc/spcacat/copyright
++for the list of people of contributed to spcacat.
++.PP
++This manual page was written by Kel Modderman <kelrin at tpg.com.au>,
++for the Debian project (but may be used by others).
Added: spcaview/trunk/debian/patches/02_spcaserv_manpage.patch
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/debian/patches/02_spcaserv_manpage.patch?rev=234&op=file
==============================================================================
--- spcaview/trunk/debian/patches/02_spcaserv_manpage.patch (added)
+++ spcaview/trunk/debian/patches/02_spcaserv_manpage.patch Wed Jan 2 10:05:49 2008
@@ -1,0 +1,46 @@
+--- /dev/null
++++ b/spcaserv.1
+@@ -0,0 +1,43 @@
++.TH SPCASERV 1 "March 02, 2006"
++.SH NAME
++spcaserv \- spca5xx tool for broadcasting a webcam stream over a network
++.SH SYNOPSIS
++.B spcaserv
++.RI [OPTIONS]
++.SH DESCRIPTION
++.B spcaserv
++is a multithread streaming server over TCP, using the jpeg compressor or
++embedded jpeg software encoder of the hardware.
++.SH OPTIONS
++A summary of options is included below.
++.TP
++.B \-h
++Show summary of options.
++.TP
++.B \-d /dev/videoX
++use /dev/videoX device (default is /dev/video0)
++.TP
++.B \-g
++use read method for grab instead of mmap
++.TP
++.B \-f [r16|r24|r32|jpg|yuv]
++video format (default is yuv)
++.TP
++.B \-s <width>x<height>
++use specified input size
++.TP
++.B \-P /dev/partportX
++use /dev/partportX device
++.TP
++.B \-w port
++tcp port to serve webcam stream
++.SH SEE ALSO
++.BR spcaview(1), spcaserv(1)
++.SH AUTHOR
++spcaserv was written by Michel Xhaard <mxhaard at free.fr>.
++See
++.B /usr/share/doc/spcaserv/copyright
++for the list of people of contributed to spcaserv.
++.PP
++This manual page was written by Kel Modderman <kelrin at tpg.com.au>,
++for the Debian project (but may be used by others).
Added: spcaview/trunk/debian/patches/10_see_compile_warnings.patch
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/debian/patches/10_see_compile_warnings.patch?rev=234&op=file
==============================================================================
--- spcaview/trunk/debian/patches/10_see_compile_warnings.patch (added)
+++ spcaview/trunk/debian/patches/10_see_compile_warnings.patch Wed Jan 2 10:05:49 2008
@@ -1,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -13,6 +13,8 @@
+ SDLLIBS = $(shell sdl-config --libs)
+ SDLFLAGS = $(shell sdl-config --cflags)
+
++WARNINGS= -Wall
++
+ SERVFLAGS= -O2 -DLINUX $(WARNINGS)
+ MATH_LIB=-lm
+ SERVLIBS= $(MATH_LIB) -lpthread
Added: spcaview/trunk/debian/patches/11_videoOk_is_int.patch
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/debian/patches/11_videoOk_is_int.patch?rev=234&op=file
==============================================================================
--- spcaview/trunk/debian/patches/11_videoOk_is_int.patch (added)
+++ spcaview/trunk/debian/patches/11_videoOk_is_int.patch Wed Jan 2 10:05:49 2008
@@ -1,0 +1,11 @@
+--- a/spcaview.c
++++ b/spcaview.c
+@@ -84,7 +84,7 @@
+ static int Oneshoot = 1;
+ static int numshoot = 0;
+ static int modshoot = 0;
+-static videoOk = 0;
++static int videoOk = 0;
+ /* picture structure */
+ typedef struct pictstruct{
+ unsigned char *data;
Added: spcaview/trunk/debian/patches/12_use_libjpeg_is_unused.patch
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/debian/patches/12_use_libjpeg_is_unused.patch?rev=234&op=file
==============================================================================
--- spcaview/trunk/debian/patches/12_use_libjpeg_is_unused.patch (added)
+++ spcaview/trunk/debian/patches/12_use_libjpeg_is_unused.patch Wed Jan 2 10:05:49 2008
@@ -1,0 +1,10 @@
+--- a/spcaview.c
++++ b/spcaview.c
+@@ -311,7 +311,6 @@
+ char fourcc[4] = "MJPG";
+
+ char *sizestring = NULL;
+- int use_libjpeg = 1;
+ char *separateur;
+ char *mode = NULL;
+ /*********************************/
Added: spcaview/trunk/debian/patches/13_default_to_grabber.patch
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/debian/patches/13_default_to_grabber.patch?rev=234&op=file
==============================================================================
--- spcaview/trunk/debian/patches/13_default_to_grabber.patch (added)
+++ spcaview/trunk/debian/patches/13_default_to_grabber.patch Wed Jan 2 10:05:49 2008
@@ -1,0 +1,25 @@
+--- a/spcaview.c
++++ b/spcaview.c
+@@ -582,17 +582,17 @@
+ spcaPlay (inputfile, owidth, oheight);
+ }
+ break;
+- case GRABBER:
++ case CLIENT:
++ {
++ spcaClient(AdIp,ports,owidth,oheight, statOn);
++ }
++ default:
+ {
+ /* spcaview grabber */
+ spcaGrab (outputfile,fourcc , videodevice, image_width,image_height, format, owidth, oheight,
+ grabMethod, videoOn, audioout, videocomp, autobright, statOn, decodeOn);
+ }
+ break;
+- case CLIENT:
+- {
+- spcaClient(AdIp,ports,owidth,oheight, statOn);
+- }
+
+
+
Added: spcaview/trunk/debian/patches/14_switch_handle_sdl_stuff.patch
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/debian/patches/14_switch_handle_sdl_stuff.patch?rev=234&op=file
==============================================================================
--- spcaview/trunk/debian/patches/14_switch_handle_sdl_stuff.patch (added)
+++ spcaview/trunk/debian/patches/14_switch_handle_sdl_stuff.patch Wed Jan 2 10:05:49 2008
@@ -1,0 +1,20 @@
+--- a/spcaview.c
++++ b/spcaview.c
+@@ -790,6 +790,8 @@
+ case SDLK_q:
+ quit =0;
+ break;
++ default:
++ break;
+ }
+ break;
+ case SDL_QUIT:
+@@ -812,6 +814,8 @@
+ case SDLK_q:
+ quit =0;
+ break;
++ default:
++ break;
+ }
+ break;
+ case SDL_QUIT:
Added: spcaview/trunk/debian/patches/15_spcaPlay_unused_vars.patch
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/debian/patches/15_spcaPlay_unused_vars.patch?rev=234&op=file
==============================================================================
--- spcaview/trunk/debian/patches/15_spcaPlay_unused_vars.patch (added)
+++ spcaview/trunk/debian/patches/15_spcaPlay_unused_vars.patch Wed Jan 2 10:05:49 2008
@@ -1,0 +1,38 @@
+--- a/spcaview.c
++++ b/spcaview.c
+@@ -881,7 +881,6 @@
+ SDL_Surface *pscreen;
+ SDL_Event sdlevent;
+ unsigned char *p = NULL;
+- unsigned char *pp = NULL;
+ int image_width = IMAGE_WIDTH;
+ int image_height = IMAGE_HEIGHT;
+ int owidth = width;
+@@ -894,18 +893,11 @@
+ long audiorate;
+ int audiobits;
+ int audioformat;
+- unsigned char *tmp = NULL; // don't forget the Till lesson
+ unsigned char *dpshDest = NULL;
+ u_int8_t *jpegData = NULL; // Till lesson a good pointer is a pointer NULL
+ int jpegSize;
+ int framecount = 0;
+ /*********************************/
+- /* file input output */
+- char *outputfile = NULL;
+- static char Picture[80];
+- char fourcc[4] = "MJPG";
+- FILE *foutpict;
+- /*********************************/
+ /* Starting Flags */
+ int run = 1;
+ int quit = 1;
+@@ -928,7 +920,7 @@
+ int maxsound = 0;
+ /*********************************/
+ /* misc index */
+- int i,j,k;
++ int i;
+ int testbpp = 16;
+ RingBuffer.ptread =0;
+ RingBuffer.ptwrite =0;
Added: spcaview/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/debian/patches/series?rev=234&op=file
==============================================================================
--- spcaview/trunk/debian/patches/series (added)
+++ spcaview/trunk/debian/patches/series Wed Jan 2 10:05:49 2008
@@ -1,0 +1,9 @@
+00_spcaview_manpage.patch
+01_spcacat_manpage.patch
+02_spcaserv_manpage.patch
+10_see_compile_warnings.patch
+11_videoOk_is_int.patch
+12_use_libjpeg_is_unused.patch
+13_default_to_grabber.patch
+14_switch_handle_sdl_stuff.patch
+15_spcaPlay_unused_vars.patch
Added: spcaview/trunk/debian/prepare-upstream-tarball
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/debian/prepare-upstream-tarball?rev=234&op=file
==============================================================================
--- spcaview/trunk/debian/prepare-upstream-tarball (added)
+++ spcaview/trunk/debian/prepare-upstream-tarball Wed Jan 2 10:05:49 2008
@@ -1,0 +1,35 @@
+#!/bin/sh -e
+
+# The aim of this script is to remove the http-java-applet folder from the
+# upstream spcaview distribution, which contains binary jar files and java
+# class files that do not have an appropriate license for distribution.
+#
+# The INSTALL file is a symlink to README, so may as well remove it too, to
+# avoid problems with VCS.
+#
+# Copyright:
+# (C) 2006 Adam Cécile
+# (C) 2008 Kel Modderman <kel at otaku42.de>
+#
+# License:
+# GPLv2 or any later version
+
+if [ ! -f "${1}" ]; then
+ echo "Usage: ${0} spcaview-XXXX.tar.gz"
+fi
+
+TMP=$(mktemp -p /tmp -d spcaview.XXXX)
+trap "{ rm -rf ${TMP}; }" exit
+
+TAR=$(readlink --canonicalize ${1})
+NAME=$(echo ${TAR} | sed -n 's|.*/\(spcaview-[^\.]\+\)\.tar\.gz$|\1|p')
+DFSG=$(echo ${TAR} | sed -n 's|^\(.*\)\.tar\.gz$|\1\.dfsg\.tar\.gz|p')
+
+zcat "${TAR}" | tar --directory="${TMP}" \
+ --exclude=http-java-applet \
+ --exclude=INSTALL \
+ -xf-
+
+tar --directory="${TMP}" -czf "${DFSG}" "${NAME}"
+
+echo "Finished preparing ${DFSG}"
Propchange: spcaview/trunk/debian/prepare-upstream-tarball
------------------------------------------------------------------------------
svn:executable = *
Modified: spcaview/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/debian/rules?rev=234&op=diff
==============================================================================
--- spcaview/trunk/debian/rules (original)
+++ spcaview/trunk/debian/rules Wed Jan 2 10:05:49 2008
@@ -1,4 +1,66 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/quilt/quilt.make
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+build: build-stamp
+
+build-stamp: $(QUILT_STAMPFN)
+ dh_testdir
+
+ $(MAKE)
+
+ touch build-stamp
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ $(MAKE) clean
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ $(MAKE) install BIN=debian/spcaview/usr/bin/
+
+# Build architecture-independent files here.
+binary-indep: build install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs Changelog
+ dh_installdocs
+ dh_install
+ dh_installman
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Modified: spcaview/trunk/jconfig.h
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/jconfig.h?rev=234&op=diff
==============================================================================
--- spcaview/trunk/jconfig.h (original)
+++ spcaview/trunk/jconfig.h Wed Jan 2 10:05:49 2008
@@ -8,15 +8,19 @@
#define VIDEO_PALETTE_JPEG 21
#define SWAP_RGB 1
int bpp;
+/* our own ioctl */
struct video_param {
int chg_para;
#define CHGABRIGHT 1
#define CHGQUALITY 2
+#define CHGLIGHTFREQ 3
#define CHGTINTER 4
__u8 autobright;
__u8 quality;
__u16 time_interval;
-};
+ __u8 light_freq;
+};
+
/* Our private ioctl */
#define SPCAGVIDIOPARAM _IOR('v',BASE_VIDIOCPRIVATE + 1,struct video_param)
#define SPCASVIDIOPARAM _IOW('v',BASE_VIDIOCPRIVATE + 2,struct video_param)
@@ -29,8 +33,9 @@
YUYV,
GREY,
GBRG,
-};
-
+ UNOW,
+};
+#if 0
#define BRIDGE_SPCA505 0
#define BRIDGE_SPCA506 1
#define BRIDGE_SPCA501 2
@@ -52,6 +57,34 @@
#define BRIDGE_MR97311 18
#define MAX_BRIDGE 19
+#endif
+
+enum {
+ BRIDGE_SPCA505 = 0,
+ BRIDGE_SPCA506,
+ BRIDGE_SPCA501,
+ BRIDGE_SPCA508,
+ BRIDGE_SPCA504,
+ BRIDGE_SPCA500,
+ BRIDGE_SPCA504B,
+ BRIDGE_SPCA533,
+ BRIDGE_SPCA504C,
+ BRIDGE_SPCA561,
+ BRIDGE_SPCA536,
+ BRIDGE_SONIX,
+ BRIDGE_ZC3XX,
+ BRIDGE_CX11646,
+ BRIDGE_TV8532,
+ BRIDGE_ETOMS,
+ BRIDGE_SN9CXXX,
+ BRIDGE_MR97311,
+ BRIDGE_PAC207,
+ BRIDGE_VC0321,
+ BRIDGE_VC0323,
+ BRIDGE_PAC7311,
+ BRIDGE_UNKNOW,
+ MAX_BRIDGE,
+};
struct palette_list {
int num;
const char *name;
@@ -61,7 +94,7 @@
int num;
const char *name;
};
-
+#if 0
static struct bridge_list Blist[]={
{BRIDGE_SPCA505,"SPCA505"},
@@ -85,6 +118,35 @@
{BRIDGE_MR97311,"MR97311"},
{-1,NULL}
};
+#endif
+
+static struct bridge_list Blist[]={
+
+ {BRIDGE_SPCA505,"SPCA505"},
+ {BRIDGE_SPCA506,"SPCA506"},
+ {BRIDGE_SPCA501,"SPCA501"},
+ {BRIDGE_SPCA508,"SPCA508"},
+ {BRIDGE_SPCA504,"SPCA504"},
+ {BRIDGE_SPCA500,"SPCA500"},
+ {BRIDGE_SPCA504B,"SPCA504B"},
+ {BRIDGE_SPCA533,"SPCA533"},
+ {BRIDGE_SPCA504C,"SPCA504C"},
+ {BRIDGE_SPCA561,"SPCA561"},
+ {BRIDGE_SPCA536,"SPCA536"},
+ {BRIDGE_SONIX,"SN9C102"},
+ {BRIDGE_ZC3XX,"ZC301-2"},
+ {BRIDGE_CX11646,"CX11646"},
+ {BRIDGE_TV8532,"TV8532"},
+ {BRIDGE_ETOMS,"ET61XX51"},
+ {BRIDGE_SN9CXXX,"SN9CXXX"},
+ {BRIDGE_MR97311,"MR97311"},
+ {BRIDGE_PAC207, "PAC207BCA"},
+ {BRIDGE_VC0321, "VC0321"},
+ {BRIDGE_VC0323, "VC0323"},
+ {BRIDGE_PAC7311, "PAC7311"},
+ {BRIDGE_UNKNOW,"UNKNOW"},
+ {-1,NULL}
+};
/* Camera type jpeg yuvy yyuv yuyv grey gbrg*/
static struct palette_list Plist[] ={
{JPEG,"JPEG"},
@@ -108,7 +170,6 @@
(bridge) == BRIDGE_SPCA561 ? spca561_ext_modes : \
(bridge) == BRIDGE_SPCA536 ? spca536_ext_modes : \
(bridge) == BRIDGE_SONIX ? sonix_ext_modes : \
- (bridge) == BRIDGE_ZR364XX ? zr364xx_ext_modes : \
(bridge) == BRIDGE_ZC3XX ? zc3xx_ext_modes : \
(bridge) == BRIDGE_CX11646 ? cx11646_ext_modes : \
(bridge) == BRIDGE_SN9CXXX ? sn9c102p_ext_modes : \
Modified: spcaview/trunk/picture.c
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/picture.c?rev=234&op=diff
==============================================================================
--- spcaview/trunk/picture.c (original)
+++ spcaview/trunk/picture.c Wed Jan 2 10:05:49 2008
@@ -76,18 +76,18 @@
if(mode == PICTWRD)
snprintf(filename,13,"%s",name);
if (mode == PICTURE || mode == PICTWRD){
- foutpict = fopen (filename, "wb");
+ foutpict = fopen (filename, "wb");
}
if (format == VIDEO_PALETTE_JPEG)
{
sizeout = get_jpegsize( src,sizein);
if (mode == PICTURE || mode == PICTWRD){
- printf (" picture jpeg %s\n", filename);
- fwrite (src, sizeof (char), sizeout, foutpict);
- fclose (foutpict);
+ printf (" picture jpeg %s\n", filename);
+ fwrite (src, sizeof (char), sizeout, foutpict);
+ fclose (foutpict);
} else {
if(AVI_write_frame ( fd,(unsigned char *) src,sizeout) < 0)
- printf ("write error on avi out \n");
+ printf ("GetjpegPicture write error on avi out \n");
}
}
else
Modified: spcaview/trunk/spcav4l.c
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/spcav4l.c?rev=234&op=diff
==============================================================================
--- spcaview/trunk/spcav4l.c (original)
+++ spcaview/trunk/spcav4l.c Wed Jan 2 10:05:49 2008
@@ -45,13 +45,16 @@
{BRIDGE_SPCA561,"SPCA561"},
{BRIDGE_SPCA536,"SPCA536"},
{BRIDGE_SONIX,"SN9C102"},
- {BRIDGE_ZR364XX,"ZR364XX"},
{BRIDGE_ZC3XX,"ZC301-2"},
{BRIDGE_CX11646,"CX11646"},
{BRIDGE_TV8532,"TV8532"},
{BRIDGE_ETOMS,"ET61XX51"},
{BRIDGE_SN9CXXX,"SN9CXXX"},
{BRIDGE_MR97311,"MR97311"},
+ {BRIDGE_PAC207, "PAC207BCA"},
+ {BRIDGE_VC0321, "VC0321"},
+ {BRIDGE_VC0323, "VC0323"},
+ {BRIDGE_PAC7311, "PAC7311"},
{BRIDGE_UNKNOW,"UNKNOW"},
{-1,NULL}
};
@@ -823,7 +826,7 @@
for (i = 0; i < MAX_BRIDGE -1; i++)
{
size = strlen (Blist[i].name) ;
- printf ("is_spca %s \n",Blist[i].name);
+ // printf ("is_spca %s \n",Blist[i].name);
if (strncmp (BridgeName, Blist[i].name, size) == 0)
{
find = i;
@@ -852,6 +855,7 @@
i = YYUV;
break;
case BRIDGE_SPCA501:
+ case BRIDGE_VC0321:
i = YUYV;
break;
case BRIDGE_SPCA508:
@@ -863,17 +867,19 @@
case BRIDGE_SPCA504B:
case BRIDGE_SPCA533:
case BRIDGE_SPCA504C:
- case BRIDGE_ZR364XX:
case BRIDGE_ZC3XX:
case BRIDGE_CX11646:
case BRIDGE_SN9CXXX:
- case BRIDGE_MR97311:
+ case BRIDGE_MR97311:
+ case BRIDGE_VC0323:
+ case BRIDGE_PAC7311:
i = JPEG;
break;
case BRIDGE_ETOMS:
case BRIDGE_SONIX:
case BRIDGE_SPCA561:
case BRIDGE_TV8532:
+ case BRIDGE_PAC207:
i = GBRG;
break;
default:
Modified: spcaview/trunk/spcav4l.h
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/spcav4l.h?rev=234&op=diff
==============================================================================
--- spcaview/trunk/spcav4l.h (original)
+++ spcaview/trunk/spcav4l.h Wed Jan 2 10:05:49 2008
@@ -93,13 +93,16 @@
BRIDGE_SPCA561,
BRIDGE_SPCA536,
BRIDGE_SONIX,
- BRIDGE_ZR364XX,
BRIDGE_ZC3XX,
BRIDGE_CX11646,
BRIDGE_TV8532,
BRIDGE_ETOMS,
BRIDGE_SN9CXXX,
BRIDGE_MR97311,
+ BRIDGE_PAC207,
+ BRIDGE_VC0321,
+ BRIDGE_VC0323,
+ BRIDGE_PAC7311,
BRIDGE_UNKNOW,
MAX_BRIDGE,
};
Modified: spcaview/trunk/spcaview.c
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/spcaview.c?rev=234&op=diff
==============================================================================
--- spcaview/trunk/spcaview.c (original)
+++ spcaview/trunk/spcaview.c Wed Jan 2 10:05:49 2008
@@ -239,7 +239,7 @@
status = pthread_mutex_unlock (&mypict->mutex);
if (status != 0) {fprintf(stderr,"Unlock error!\n"); exit(-1);}
/******* EXIT the MONITOR ************/
-// printf("Condition was accept, data.value=%d\n",pictFlag);
+//printf("Condition was accept, data.value=%d\n",pictFlag);
}
return NULL;
@@ -1265,6 +1265,40 @@
spcaPrintParam (fd,videoparam);
}
+
+static void spcaSetLightFrequency(int fd, struct video_param * videoparam, int light_freq)
+{
+ videoparam->chg_para = CHGLIGHTFREQ;
+ videoparam->light_freq = light_freq;
+ if(ioctl(fd,SPCASVIDIOPARAM, videoparam) == -1){
+ printf ("light freqency error !!\n");
+ } else
+ spcaPrintParam (fd,videoparam);
+}
+
+static int spcaSwitchLightFrequency(int fd, struct video_param * videoparam)
+{
+ int light_freq;
+ if(ioctl(fd,SPCAGVIDIOPARAM, videoparam) == -1){
+ printf ("wrong spca5xx device\n");
+ } else {
+ light_freq = videoparam->light_freq;
+ if(light_freq == 50)
+ light_freq +=10;
+ else if(light_freq == 60)
+ light_freq = 0;
+ else if(light_freq == 0)
+ light_freq = 50;
+ if(light_freq)
+ printf ("Current light frequency filter: %d Hz\n", light_freq);
+ else
+ printf ("Current light frequency filter: NoFliker\n");
+ spcaSetLightFrequency(fd,videoparam,light_freq);
+ }
+ return light_freq;
+}
+
+
static void spcaSetTimeInterval(int fd, struct video_param *videoparam, unsigned short time)
{
if (time < 1000) {
@@ -1293,8 +1327,8 @@
if(ioctl(fd,SPCAGVIDIOPARAM, videoparam) == -1){
printf ("wrong spca5xx device\n");
} else
- printf("quality %d autoexpo %d Timeframe %d \n",
- videoparam->quality,videoparam->autobright,videoparam->time_interval);
+ printf("quality %d autoexpo %d Timeframe %d lightfreq %d\n",
+ videoparam->quality,videoparam->autobright,videoparam->time_interval, videoparam->light_freq);
}
static void qualityUp(int fd,struct video_param *videoparam)
{
@@ -1639,7 +1673,9 @@
// SDL_PauseAudioIn(0); // start record
initAudio = 1;
}
- }
+ } else
+ mypict.mode = PICTURE;
+
/* Allocate tmp buffer for one frame. */
@@ -1660,16 +1696,8 @@
if (interval && videoOn){
// set_timer(interval);
- /* allocate the buffer for photos */
-
- if (outputfile) {
- mypict.mode = AVIPICT;
- } else {
- mypict.mode = PICTURE;
- }
-
SDL_SetTimer((Uint32) interval,callback_timer);
- }
+ }
i = 0;
while (run && Oneshoot) {
@@ -1715,6 +1743,7 @@
synctime = SDL_GetTicks ();
/*here the frame is in tmp ready to used */
if (pictFlag){
+ // printf("get Picture condition \n");
wstatus = pthread_mutex_lock (&mypict.mutex);
if (wstatus != 0) {fprintf(stderr,"Lock error!\n"); exit(-1);}
memcpy (mypict.data,tmp,frame_size);
@@ -1883,6 +1912,7 @@
case SDLK_s:
/* should get the next frame available */
pictFlag = 1;
+ printf ("\nPicture asked\n");
break;
case SDLK_v:
videopict.colour += 0x200; // = saturation ?
@@ -1919,6 +1949,9 @@
case SDLK_f:
qualityDown(fd, &videoparam); //decrease quality
break;
+ case SDLK_l:
+ spcaSwitchLightFrequency(fd, &videoparam); //switch light frequency filter
+ break;
case SDLK_q:
printf ("\nStop asked\n");
run = 0;
@@ -2221,7 +2254,7 @@
resize16 (pict,dst,owidth,oheight,width,height) ;
free(dst);
}
-
+#if 0
static int
isSpcaChip (const char *BridgeName)
{
@@ -2268,7 +2301,7 @@
case BRIDGE_SPCA533:
case BRIDGE_SPCA504C:
case BRIDGE_SPCA536:
- case BRIDGE_ZR364XX:
+// case BRIDGE_ZR364XX:
case BRIDGE_ZC3XX:
case BRIDGE_CX11646:
case BRIDGE_SN9CXXX:
@@ -2289,7 +2322,85 @@
}
return i;
}
-
+ #endif
+ static int
+isSpcaChip (const char *BridgeName)
+{
+ int i = -1;
+ int find = -1;
+ int size = 0;
+
+ /* Spca506 return more with channel video, cut it */
+
+ /* return Bridge otherwhise -1 */
+ for (i = 0; i < MAX_BRIDGE -1; i++)
+ {
+ size = strlen (Blist[i].name) ;
+ // printf ("is_spca %s \n",Blist[i].name);
+ if (strncmp (BridgeName, Blist[i].name, size) == 0)
+ {
+ find = i;
+ break;
+ }
+ }
+
+ return find;
+}
+
+static int
+getStreamId (const char *BridgeName)
+{
+ int i = -1;
+ int match = -1;
+/* return Stream_id otherwhise -1 */
+ if ((match = isSpcaChip (BridgeName)) < 0)
+ {
+ printf ("Not an Spca5xx Camera !!\n");
+ return match;
+ }
+ switch (match)
+ {
+ case BRIDGE_SPCA505:
+ case BRIDGE_SPCA506:
+ i = YYUV;
+ break;
+ case BRIDGE_SPCA501:
+ case BRIDGE_VC0321:
+ i = YUYV;
+ break;
+ case BRIDGE_SPCA508:
+ i = YUVY;
+ break;
+ case BRIDGE_SPCA536:
+ case BRIDGE_SPCA504:
+ case BRIDGE_SPCA500:
+ case BRIDGE_SPCA504B:
+ case BRIDGE_SPCA533:
+ case BRIDGE_SPCA504C:
+ case BRIDGE_ZC3XX:
+ case BRIDGE_CX11646:
+ case BRIDGE_SN9CXXX:
+ case BRIDGE_MR97311:
+ case BRIDGE_VC0323:
+ case BRIDGE_PAC7311:
+ i = JPEG;
+ break;
+ case BRIDGE_ETOMS:
+ case BRIDGE_SONIX:
+ case BRIDGE_SPCA561:
+ case BRIDGE_TV8532:
+ case BRIDGE_PAC207:
+ i = GBRG;
+ break;
+ default:
+ i = UNOW; // -1;
+ printf ("Unable to find a StreamId !!\n");
+ break;
+
+ }
+ return i;
+}
+
static int
probeSize (const char *BridgeName, int *width, int *height)
{ int bridge = -1;
Modified: spcaview/trunk/tcputils.h
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/tcputils.h?rev=234&op=diff
==============================================================================
--- spcaview/trunk/tcputils.h (original)
+++ spcaview/trunk/tcputils.h Wed Jan 2 10:05:49 2008
@@ -23,7 +23,7 @@
#ifndef TCPUTILS_H
#define TCPUTILS_H
-
+#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
Modified: spcaview/trunk/utils.c
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/utils.c?rev=234&op=diff
==============================================================================
--- spcaview/trunk/utils.c (original)
+++ spcaview/trunk/utils.c Wed Jan 2 10:05:49 2008
@@ -560,8 +560,8 @@
intheight = getword();
intwidth = getword();
- if ((intheight & 15) || (intwidth & 15)){
-
+ //if ((intheight & 15) || (intwidth & 15)){
+ if ((intheight & 7) || (intwidth & 15)){
err = ERR_BAD_WIDTH_OR_HEIGHT;
goto error;
}
Modified: spcaview/trunk/version.h
URL: http://svn.debian.org/wsvn/pkg-spca5xx/spcaview/trunk/version.h?rev=234&op=diff
==============================================================================
--- spcaview/trunk/version.h (original)
+++ spcaview/trunk/version.h Wed Jan 2 10:05:49 2008
@@ -1,2 +1,2 @@
- char version[] = "Spcaview version: 1.1.5 date: 12:12:2005 (C) mxhaard at magic.fr\0";
+ char version[] = "Spcaview version: 1.1.8 date: 25:12:2007 (C) mxhaard at magic.fr\0";
More information about the Pkg-spca5xx-devel
mailing list