Menu
▾
▴
[Iaxclient-cvs] SF.net SVN: iaxclient: [1082] trunk
|
From: <jpg...@us...> - 2007-08-15 16:07:08
|
Revision: 1082
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1082&view=rev
Author: jpgrayson
Date: 2007-08-15 09:07:09 -0700 (Wed, 15 Aug 2007)
Log Message:
-----------
Fixup copyright headers and contributor lists.
Remove trailing whitespace.
Modified Paths:
--------------
trunk/AUTHORS
trunk/lib/audio_alsa.c
trunk/lib/audio_alsa.h
trunk/lib/audio_encode.c
trunk/lib/audio_encode.h
trunk/lib/audio_portaudio.c
trunk/lib/audio_portaudio.h
trunk/lib/codec_alaw.c
trunk/lib/codec_alaw.h
trunk/lib/codec_ffmpeg.c
trunk/lib/codec_ffmpeg.h
trunk/lib/codec_gsm.c
trunk/lib/codec_gsm.h
trunk/lib/codec_h264_vss.c
trunk/lib/codec_h264_vss.h
trunk/lib/codec_ilbc.c
trunk/lib/codec_ilbc.h
trunk/lib/codec_speex.c
trunk/lib/codec_speex.h
trunk/lib/codec_theora.c
trunk/lib/codec_theora.h
trunk/lib/codec_ulaw.c
trunk/lib/codec_ulaw.h
trunk/lib/iaxclient.h
trunk/lib/iaxclient_lib.c
trunk/lib/iaxclient_lib.h
trunk/lib/ringbuffer.c
trunk/lib/ringbuffer.h
trunk/lib/unixfuncs.c
trunk/lib/video.c
trunk/lib/video.h
trunk/lib/videoLib/linux/linuxgrab.c
trunk/lib/videoLib/macosx/macgrab.c
trunk/lib/videoLib/macosx/vdigGrab.c
trunk/lib/videoLib/macosx/vdigGrab.h
trunk/lib/videoLib/readme
trunk/lib/videoLib/video_grab.c
trunk/lib/videoLib/video_grab.h
trunk/lib/videoLib/win32/wingrab.cpp
trunk/lib/winfuncs.c
Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/AUTHORS 2007-08-15 16:07:09 UTC (rev 1082)
@@ -12,3 +12,4 @@
Mihai Balea <mihai at hates dot ms>
Bill Welch <welch1820 at gmail dot com> [Project files for several MS development environments]
Peter Grayson <jpg...@gm...>
+Bill Cholewka <bc...@gm...>
Modified: trunk/lib/audio_alsa.c
===================================================================
--- trunk/lib/audio_alsa.c 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/audio_alsa.c 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,19 +1,15 @@
/*
- * iaxclient_lib: An Inter-Asterisk eXchange communication library
+ * iaxclient: a cross-platform IAX softphone library
*
- * Module: audio_alsa
- * Purpose: Audio code to output to ALSA
- * based on audio_file, originally Developed by: Steve Kann
- * Developed by: Panfilov Dmitry
- * Creation Date: Febr 9, 2006
+ * Copyrights:
+ * Copyright (C) 2006 Panfilov Dmitry
*
+ * Contributors:
+ * Panfilov Dmitry
+ *
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*
- * IAX library Copyright (c) 2001 Linux Support Services
- * IAXlib is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
- *
*/
#include "iaxclient_lib.h"
@@ -30,7 +26,7 @@
}
int alsa_stop_sound(int soundID) {
- return 0;
+ return 0;
}
@@ -42,7 +38,7 @@
return 0;
}
-void alsa_shutdown_audio()
+void alsa_shutdown_audio()
{
return;
}
@@ -55,7 +51,7 @@
long byteread=*nSamples;
static int h;
*nSamples=0;
- snd_pcm_start(stream_in);
+ snd_pcm_start(stream_in);
if(h==1) { h=0; return 0;}
do{
r = snd_pcm_readi(stream_in, samples, byteread);
@@ -77,7 +73,7 @@
int alsa_output(struct iaxc_audio_driver *d, void *samples, int nSamples) {
long r;
- snd_pcm_start(stream_out);
+ snd_pcm_start(stream_out);
while (nSamples > 0) {
r = snd_pcm_writei(stream_out, samples, nSamples);
if (r == -EAGAIN){
@@ -107,7 +103,7 @@
return 0;
}
-int alsa_destroy (struct iaxc_audio_driver *d )
+int alsa_destroy (struct iaxc_audio_driver *d )
{
/* TODO: something should happen here */
return 0;
@@ -137,9 +133,9 @@
short buf[128];
snd_pcm_hw_params_t *hw_params;
snd_pcm_sw_params_t *sw_params;
-
+
if ((err = snd_pcm_open (&stream_out, "default", SND_PCM_STREAM_PLAYBACK, 0)) < 0) {
- fprintf (stderr, "cannot open audio device default (%s)\n",
+ fprintf (stderr, "cannot open audio device default (%s)\n",
snd_strerror (err));
exit (1);
}
@@ -178,9 +174,9 @@
snd_strerror (err));
exit (1);
}
-
+
snd_pcm_sw_params_malloc(&sw_params);
-
+
err = snd_pcm_sw_params_current(stream_out, sw_params);
if (err < 0) {
printf("Unable to determine current swparams for playback: %s\n", snd_strerror(err));
@@ -198,7 +194,7 @@
}
if ((err = snd_pcm_open (&stream_in, "default", SND_PCM_STREAM_CAPTURE, 0)) < 0) {
- fprintf (stderr, "cannot open audio device default (%s)\n",
+ fprintf (stderr, "cannot open audio device default (%s)\n",
snd_strerror (err));
exit (1);
}
@@ -232,7 +228,7 @@
snd_strerror (err));
exit (1);
}
-
+
err = snd_pcm_sw_params_current(stream_in, sw_params);
if (err < 0) {
printf("Unable to determine current swparams for playback: %s\n", snd_strerror(err));
@@ -248,8 +244,8 @@
fprintf(stderr, "Unable to set sw params for playback: %s\n", snd_strerror(err));
return err;
}
-
-
+
+
if ((err = snd_pcm_prepare (stream_in)) < 0) {
fprintf (stderr, "cannot prepare audio interface for use (%s)\n",
snd_strerror (err));
@@ -261,7 +257,7 @@
snd_strerror (err));
exit (1);
}
-
+
d->initialize = alsa_initialize;
d->destroy = alsa_destroy;
d->select_devices = alsa_select_devices;
Modified: trunk/lib/audio_alsa.h
===================================================================
--- trunk/lib/audio_alsa.h 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/audio_alsa.h 2007-08-15 16:07:09 UTC (rev 1082)
@@ -2,14 +2,16 @@
* iaxclient: a cross-platform IAX softphone library
*
* Copyrights:
- * Copyright (C) 2003 HorizonLive.com, (c) 2004, Horizon Wimba, Inc.
+ * Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
* Contributors:
* Steve Kann <st...@st...>
*
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
+
#ifndef _AUDIO_ALSA_H
#define _AUDIO_ALSA_H
Modified: trunk/lib/audio_encode.c
===================================================================
--- trunk/lib/audio_encode.c 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/audio_encode.c 2007-08-15 16:07:09 UTC (rev 1082)
@@ -2,16 +2,16 @@
* iaxclient: a cross-platform IAX softphone library
*
* Copyrights:
- * Copyright (C) 2003 HorizonLive.com, (c) 2004, Horizon Wimba, Inc.
+ * Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
* Contributors:
* Steve Kann <st...@st...>
* Michael Van Donselaar <mv...@va...>
* Shawn Lawrence <sha...@te...>
*
- *
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
#include "iaxclient_lib.h"
Modified: trunk/lib/audio_encode.h
===================================================================
--- trunk/lib/audio_encode.h 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/audio_encode.h 2007-08-15 16:07:09 UTC (rev 1082)
@@ -2,14 +2,16 @@
* iaxclient: a cross-platform IAX softphone library
*
* Copyrights:
- * Copyright (C) 2003 HorizonLive.com, (c) 2004, Horizon Wimba, Inc.
+ * Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
* Contributors:
* Steve Kann <st...@st...>
*
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
+
#ifndef _AUDIO_ENCODE_H
#define _AUDIO_ENCODE_H
Modified: trunk/lib/audio_portaudio.c
===================================================================
--- trunk/lib/audio_portaudio.c 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/audio_portaudio.c 2007-08-15 16:07:09 UTC (rev 1082)
@@ -2,16 +2,16 @@
* iaxclient: a cross-platform IAX softphone library
*
* Copyrights:
- * Copyright (C) 2003 HorizonLive.com, (c) 2004, Horizon Wimba, Inc.
+ * Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
* Contributors:
* Steve Kann <st...@st...>
* Michael Van Donselaar <mv...@va...>
* Shawn Lawrence <sha...@te...>
*
- *
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*
* Module: audio_portaudio
* Purpose: Audio code to provide portaudio driver support for IAX library
@@ -19,7 +19,7 @@
* Creation Date: April 18, 2003
*
* This library uses the PortAudio Portable Audio Library
- * For more information see: http://www.portaudio.com
+ * For more information see: http://www.portaudio.com/
* PortAudio Copyright (c) 1999-2000 Ross Bencina and Phil Burk
*
*/
Modified: trunk/lib/audio_portaudio.h
===================================================================
--- trunk/lib/audio_portaudio.h 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/audio_portaudio.h 2007-08-15 16:07:09 UTC (rev 1082)
@@ -2,14 +2,16 @@
* iaxclient: a cross-platform IAX softphone library
*
* Copyrights:
- * Copyright (C) 2003 HorizonLive.com, (c) 2004, Horizon Wimba, Inc.
+ * Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
* Contributors:
* Steve Kann <st...@st...>
*
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
+
#ifndef _AUDIO_PORTAUDIO_H
#define _AUDIO_PORTAUDIO_H
Modified: trunk/lib/codec_alaw.c
===================================================================
--- trunk/lib/codec_alaw.c 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/codec_alaw.c 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,11 +1,14 @@
/*
- * iaxclient: a portable telephony toolkit
+ * iaxclient: a cross-platform IAX softphone library
*
- * (c) 2004 Cyril VELTER <cyr...@me...>
- * Written by Cyril VELTER <cyr...@me...>
+ * Copyrights:
+ * Copyright (C) 2004 Cyril VELTER
*
+ * Contributors:
+ * Cyril VELTER <cyr...@me...>
+ *
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
#include "codec_alaw.h"
@@ -25,13 +28,13 @@
{
int value;
int segment;
-
+
/* Mask value */
alaw ^= 0x55;
/* Extract and scale value */
value = (alaw & 0x0f) << 4;
-
+
/* Extract segment number */
segment = (alaw & 0x70) >> 4;
@@ -56,9 +59,9 @@
int mask = 0x55;
int segment;
unsigned char alaw;
-
+
static int segments[8] = {0xFF, 0x1FF, 0x3FF, 0x7FF, 0xFFF, 0x1FFF, 0x3FFF, 0x7FFF};
-
+
if (linear >= 0)
{
/* Sign (7th) bit = 1 */
@@ -69,7 +72,7 @@
/* Sign (7th) bit = 0 */
linear = -linear;
}
-
+
/* Find the segment */
for (segment = 0;segment < 8;segment++)
if (linear <= segments[segment])
@@ -77,13 +80,13 @@
/* Combine the sign, segment, and quantization bits. */
- if (segment < 8)
+ if (segment < 8)
{
if (segment < 2)
alaw = (linear >> 4) & 0x0F;
else
alaw = (linear >> (segment + 3)) & 0x0F;
-
+
return ((alaw | (segment << 4)) ^ mask);
}
else
@@ -91,13 +94,13 @@
return (0x7F ^ mask);
}
-static int decode ( struct iaxc_audio_codec *c,
+static int decode ( struct iaxc_audio_codec *c,
int *inlen, unsigned char *in, int *outlen, short *out ) {
struct state *state = (struct state *)(c->decstate);
short *orig_out = out;
short sample;
-
+
if(*inlen == 0) {
int interp_len = 160;
if(*outlen < interp_len) interp_len = *outlen;
@@ -117,7 +120,7 @@
return 0;
}
-static int encode ( struct iaxc_audio_codec *c,
+static int encode ( struct iaxc_audio_codec *c,
int *inlen, short *in, int *outlen, unsigned char *out ) {
while ((*inlen > 0) && (*outlen > 0)) {
@@ -135,7 +138,7 @@
struct iaxc_audio_codec *codec_audio_alaw_new() {
struct iaxc_audio_codec *c = (struct iaxc_audio_codec *)calloc(1, sizeof(struct iaxc_audio_codec));
-
+
if(!c) return c;
strcpy(c->name,"alaw");
Modified: trunk/lib/codec_alaw.h
===================================================================
--- trunk/lib/codec_alaw.h 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/codec_alaw.h 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,11 +1,14 @@
/*
- * iaxclient: a portable telephony toolkit
+ * iaxclient: a cross-platform IAX softphone library
*
- * Written by Cyril VELTER <cyr...@me...>
- * (c) 2004 Cyril VELTER <cyr...@me...>
+ * Copyrights:
+ * Copyright (C) 2004 Cyril VELTER
*
+ * Contributors:
+ * Cyril VELTER <cyr...@me...>
+ *
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
struct iaxc_audio_codec *codec_audio_alaw_new();
Modified: trunk/lib/codec_ffmpeg.c
===================================================================
--- trunk/lib/codec_ffmpeg.c 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/codec_ffmpeg.c 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,13 +1,16 @@
/*
- * iaxclient: a portable telephony toolkit
+ * iaxclient: a cross-platform IAX softphone library
*
+ * Copyrights:
* Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
+ * Contributors:
* Steve Kann <st...@st...>
* Peter Grayson <jpg...@gm...>
*
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*
* A video codec using the ffmpeg library.
*/
Modified: trunk/lib/codec_ffmpeg.h
===================================================================
--- trunk/lib/codec_ffmpeg.h 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/codec_ffmpeg.h 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,15 +1,20 @@
/*
- * iaxclient: a portable telephony toolkit
+ * iaxclient: a cross-platform IAX softphone library
*
- * Copyright (C) 2003-2004, Horizon Wimba, Inc.
+ * Copyrights:
+ * Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
+ * Contributors:
* Steve Kann <st...@st...>
+ * Peter Grayson <jpg...@gm...>
*
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
+ *
+ * A video codec using the ffmpeg library.
*/
-
struct iaxc_video_codec *codec_video_ffmpeg_new(int format, int w, int h, int framerate, int bitrate, int fragsize);
int codec_video_ffmpeg_check_codec(int format);
Modified: trunk/lib/codec_gsm.c
===================================================================
--- trunk/lib/codec_gsm.c 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/codec_gsm.c 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,12 +1,15 @@
/*
- * iaxclient: a portable telephony toolkit
+ * iaxclient: a cross-platform IAX softphone library
*
- * Copyright (C) 2003-2004, Horizon Wimba, Inc.
+ * Copyrights:
+ * Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
+ * Contributors:
* Steve Kann <st...@st...>
*
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
#include "codec_gsm.h"
@@ -32,7 +35,7 @@
}
-static int decode ( struct iaxc_audio_codec *c,
+static int decode ( struct iaxc_audio_codec *c,
int *inlen, unsigned char *in, int *outlen, short *out ) {
struct state * decstate = (struct state *) c->decstate;
@@ -57,7 +60,7 @@
plc_rx(&decstate->plc,out,160);
/* we used 33 bytes of input, and 160 bytes of output */
- *inlen -= 33;
+ *inlen -= 33;
in += 33;
*outlen -= 160;
out += 160;
@@ -66,7 +69,7 @@
return 0;
}
-static int encode ( struct iaxc_audio_codec *c,
+static int encode ( struct iaxc_audio_codec *c,
int *inlen, short *in, int *outlen, unsigned char *out ) {
struct state * encstate = (struct state *) c->encstate;
@@ -77,7 +80,7 @@
gsm_encode(encstate->gsmstate, in, out);
/* we used 160 bytes of input, and 33 bytes of output */
- *inlen -= 160;
+ *inlen -= 160;
in += 160;
*outlen -= 33;
out += 33;
@@ -87,12 +90,12 @@
}
struct iaxc_audio_codec *codec_audio_gsm_new() {
-
+
struct state * encstate;
struct state * decstate;
struct iaxc_audio_codec *c = (struct iaxc_audio_codec *)calloc(sizeof(struct iaxc_audio_codec),1);
-
+
if(!c) return c;
strcpy(c->name,"gsm 06.10");
@@ -107,7 +110,7 @@
c->decstate = calloc(sizeof(struct state),1);
/* leaks a bit on no-memory */
- if(!(c->encstate && c->decstate))
+ if(!(c->encstate && c->decstate))
return NULL;
encstate = (struct state *) c->encstate;
@@ -116,7 +119,7 @@
encstate->gsmstate = gsm_create();
decstate->gsmstate = gsm_create();
- if(!(encstate->gsmstate && decstate->gsmstate))
+ if(!(encstate->gsmstate && decstate->gsmstate))
return NULL;
return c;
Modified: trunk/lib/codec_gsm.h
===================================================================
--- trunk/lib/codec_gsm.h 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/codec_gsm.h 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,12 +1,15 @@
/*
- * iaxclient: a portable telephony toolkit
+ * iaxclient: a cross-platform IAX softphone library
*
- * Copyright (C) 2003-2004, Horizon Wimba, Inc.
+ * Copyrights:
+ * Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
+ * Contributors:
* Steve Kann <st...@st...>
*
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
struct iaxc_audio_codec *codec_audio_gsm_new();
Modified: trunk/lib/codec_h264_vss.c
===================================================================
--- trunk/lib/codec_h264_vss.c 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/codec_h264_vss.c 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,12 +1,15 @@
/*
- * iaxclient: a portable telephony toolkit
+ * iaxclient: a cross-platform IAX softphone library
*
+ * Copyrights:
* Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
+ * Contributors:
* Mihai Balea <mihaiAThatesDOTms>
*
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
#define USE_H264_RTP_FOO
@@ -279,7 +282,7 @@
encoded_ts = (vss_uint)slice.frame_info.timestamp;
#endif
- // If the slice is the first slice in an IDR (key) frame, add the
+ // If the slice is the first slice in an IDR (key) frame, add the
// SPS and PPS headers to allow for decoder (re)initialziation
// This way, a client can connect in the middle of a stream, as soon as
// an IDR frame arrives
Modified: trunk/lib/codec_h264_vss.h
===================================================================
--- trunk/lib/codec_h264_vss.h 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/codec_h264_vss.h 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,12 +1,15 @@
/*
- * iaxclient: a portable telephony toolkit
+ * iaxclient: a cross-platform IAX softphone library
*
+ * Copyrights:
* Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
+ * Contributors:
* Mihai Balea <mihaiAThatesDOTms>
*
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
struct iaxc_video_codec *iaxc_video_codec_h264_new(int format, int w, int h, int framerate, int bitrate, int fragsize);
Modified: trunk/lib/codec_ilbc.c
===================================================================
--- trunk/lib/codec_ilbc.c 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/codec_ilbc.c 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,12 +1,15 @@
/*
- * iaxclient: a portable telephony toolkit
+ * iaxclient: a cross-platform IAX softphone library
*
- * Copyright (C) 2003-2004, Horizon Wimba, Inc.
+ * Copyrights:
+ * Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
+ * Contributors:
* Steve Kann <st...@st...>
*
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
#include "codec_ilbc.h"
@@ -22,7 +25,7 @@
}
-static int decode ( struct iaxc_audio_codec *c,
+static int decode ( struct iaxc_audio_codec *c,
int *inlen, char *in, int *outlen, short *out ) {
float fbuf[240];
@@ -58,7 +61,7 @@
return 0;
}
-static int encode ( struct iaxc_audio_codec *c,
+static int encode ( struct iaxc_audio_codec *c,
int *inlen, short *in, int *outlen, char *out ) {
float fbuf[240];
@@ -83,7 +86,7 @@
struct iaxc_audio_codec *codec_audio_ilbc_new() {
struct iaxc_audio_codec *c = calloc(sizeof(struct iaxc_audio_codec),1);
-
+
if(!c) return c;
strcpy(c->name,"iLBC");
@@ -98,11 +101,11 @@
c->decstate = calloc(sizeof(iLBC_Dec_Inst_t),1);
/* leaks a bit on no-memory */
- if(!(c->encstate && c->decstate))
+ if(!(c->encstate && c->decstate))
return NULL;
- /* the 30 parameters are used for the latest iLBC sources, in
- * http://www.ietf.org/internet-drafts/draft-ietf-avt-ilbc-codec-05.txt
+ /* the 30 parameters are used for the latest iLBC sources, in
+ * http://www.ietf.org/internet-drafts/draft-ietf-avt-ilbc-codec-05.txt
* as used in asterisk-CVS as of 14 Oct 2004 */
initEncode(c->encstate, 30);
initDecode(c->decstate, 30, 1); /* use enhancer */
Modified: trunk/lib/codec_ilbc.h
===================================================================
--- trunk/lib/codec_ilbc.h 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/codec_ilbc.h 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,12 +1,15 @@
/*
- * iaxclient: a portable telephony toolkit
+ * iaxclient: a cross-platform IAX softphone library
*
- * Copyright (C) 2003-2004, Horizon Wimba, Inc.
+ * Copyrights:
+ * Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
+ * Contributors:
* Steve Kann <st...@st...>
*
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
struct iaxc_audio_codec *codec_audio_ilbc_new();
Modified: trunk/lib/codec_speex.c
===================================================================
--- trunk/lib/codec_speex.c 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/codec_speex.c 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,12 +1,15 @@
/*
- * iaxclient: a portable telephony toolkit
+ * iaxclient: a cross-platform IAX softphone library
*
+ * Copyrights:
* Copyright (C) 2003-2004, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
+ * Contributors:
* Steve Kann <st...@st...>
*
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
#include "codec_speex.h"
Modified: trunk/lib/codec_speex.h
===================================================================
--- trunk/lib/codec_speex.h 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/codec_speex.h 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,12 +1,15 @@
/*
- * iaxclient: a portable telephony toolkit
+ * iaxclient: a cross-platform IAX softphone library
*
- * Copyright (C) 2003-2004, Horizon Wimba, Inc.
+ * Copyrights:
+ * Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
+ * Contributors:
* Steve Kann <st...@st...>
*
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
#include "speex/speex.h"
Modified: trunk/lib/codec_theora.c
===================================================================
--- trunk/lib/codec_theora.c 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/codec_theora.c 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,15 +1,16 @@
/*
- * iaxclient: a portable telephony toolkit
+ * iaxclient: a cross-platform IAX softphone library
*
- * Copyright (C) 2003-2005, Horizon Wimba, Inc.
+ * Copyrights:
+ * Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
+ * Contributors:
* Steve Kann <st...@st...>
* Mihai Balea <mihai at hates dot ms>
*
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
- *
- * A video codec using the theora library.
+ * the GNU Lesser (Library) General Public License.
*/
/*
Modified: trunk/lib/codec_theora.h
===================================================================
--- trunk/lib/codec_theora.h 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/codec_theora.h 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,12 +1,16 @@
/*
- * iaxclient: a portable telephony toolkit
+ * iaxclient: a cross-platform IAX softphone library
*
- * Copyright (C) 2003-2004, Horizon Wimba, Inc.
+ * Copyrights:
+ * Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
+ * Contributors:
* Steve Kann <st...@st...>
+ * Mihai Balea <mihai at hates dot ms>
*
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
struct iaxc_video_codec *codec_video_theora_new(int format, int w, int h,
Modified: trunk/lib/codec_ulaw.c
===================================================================
--- trunk/lib/codec_ulaw.c 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/codec_ulaw.c 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,12 +1,15 @@
/*
- * iaxclient: a portable telephony toolkit
+ * iaxclient: a cross-platform IAX softphone library
*
- * Copyright (C) 2003-2004, Horizon Wimba, Inc.
+ * Copyrights:
+ * Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
+ * Contributors:
* Steve Kann <st...@st...>
*
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
#include "codec_ulaw.h"
@@ -20,14 +23,14 @@
static unsigned char lin_2ulaw [16384];
static int initialized=0;
-/* this looks similar to asterisk, but comes from public domain code by craig reese
+/* this looks similar to asterisk, but comes from public domain code by craig reese
I've just followed asterisk's table sizes for lin_2u, and also too lazy to do binary arith to decide which
iterations to skip -- this way we get the same result.. */
static void initialize() {
int i;
/* ulaw_2lin */
- for(i=0;i<256;i++) {
+ for(i=0;i<256;i++) {
int b = ~i;
int exp_lut[8] = {0,132,396,924,1980,4092,8316,16764};
int sign, exponent, mantissa, sample;
@@ -38,10 +41,10 @@
sample = exp_lut[exponent] + (mantissa << (exponent + 3));
if (sign != 0) sample = -sample;
ulaw_2lin[i] = sample;
- }
+ }
/* lin_2ulaw */
- for(i=-32767;i<32768;i+=4) {
+ for(i=-32767;i<32768;i+=4) {
int sample = i;
int exp_lut[256] = {0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,
4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
@@ -73,11 +76,11 @@
mantissa = (sample >> (exponent + 3)) & 0x0F;
ulawbyte = ~(sign | (exponent << 4) | mantissa);
if (ulawbyte == 0) ulawbyte = 0x02; /* optional CCITT trap */
-
- lin_2ulaw[((unsigned short)i) >> 2] = ulawbyte;
- }
-
- initialized = 1;
+
+ lin_2ulaw[((unsigned short)i) >> 2] = ulawbyte;
+ }
+
+ initialized = 1;
}
static void destroy ( struct iaxc_audio_codec *c) {
@@ -85,7 +88,7 @@
}
-static int decode ( struct iaxc_audio_codec *c,
+static int decode ( struct iaxc_audio_codec *c,
int *inlen, unsigned char *in, int *outlen, short *out ) {
struct state *state = (struct state *)c->decstate;
short *orig_out = out;
@@ -109,7 +112,7 @@
return 0;
}
-static int encode ( struct iaxc_audio_codec *c,
+static int encode ( struct iaxc_audio_codec *c,
int *inlen, short *in, int *outlen, unsigned char *out ) {
while ((*inlen > 0) && (*outlen > 0)) {
@@ -124,7 +127,7 @@
struct iaxc_audio_codec *codec_audio_ulaw_new() {
struct iaxc_audio_codec *c = (struct iaxc_audio_codec *)calloc(sizeof(struct iaxc_audio_codec),1);
-
+
if(!c) return c;
if(!initialized) initialize();
Modified: trunk/lib/codec_ulaw.h
===================================================================
--- trunk/lib/codec_ulaw.h 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/codec_ulaw.h 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,12 +1,15 @@
/*
- * iaxclient: a portable telephony toolkit
+ * iaxclient: a cross-platform IAX softphone library
*
- * Copyright (C) 2003-2004, Horizon Wimba, Inc.
+ * Copyrights:
+ * Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
+ * Contributors:
* Steve Kann <st...@st...>
*
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
struct iaxc_audio_codec *codec_audio_ulaw_new();
Modified: trunk/lib/iaxclient.h
===================================================================
--- trunk/lib/iaxclient.h 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/iaxclient.h 2007-08-15 16:07:09 UTC (rev 1082)
@@ -2,15 +2,18 @@
* iaxclient: a cross-platform IAX softphone library
*
* Copyrights:
- * Copyright (C) 2003 HorizonLive.com, (c) 2004, Horizon Wimba, Inc.
+ * Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
* Contributors:
* Steve Kann <st...@st...>
* Frik Strecker <fr...@ga...>
* Mihai Balea <mihai AT hates DOT ms>
+ * Peter Grayson <jpg...@gm...>
+ * Bill Cholewka <bc...@gm...>
*
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
#ifndef _iaxclient_h
#define _iaxclient_h
Modified: trunk/lib/iaxclient_lib.c
===================================================================
--- trunk/lib/iaxclient_lib.c 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/iaxclient_lib.c 2007-08-15 16:07:09 UTC (rev 1082)
@@ -2,7 +2,8 @@
* iaxclient: a cross-platform IAX softphone library
*
* Copyrights:
- * Copyright (C) 2003 HorizonLive.com, (c) 2004, Horizon Wimba, Inc.
+ * Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
* Contributors:
* Steve Kann <st...@st...>
@@ -10,10 +11,11 @@
* Shawn Lawrence <sha...@te...>
* Frik Strecker <fr...@ga...>
* Mihai Balea <mihai AT hates DOT ms>
+ * Peter Grayson <jpg...@gm...>
+ * Bill Cholewka <bc...@gm...>
*
- *
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
#include <assert.h>
@@ -724,7 +726,7 @@
static THREADFUNCDECL(main_proc_thread_func)
{
static int refresh_registration_count = 0;
-
+
THREADFUNCRET(ret);
/* Increase Priority */
@@ -733,17 +735,17 @@
while ( !main_proc_thread_flag )
{
get_iaxc_lock();
-
+
service_network();
service_audio();
-
+
// Check registration refresh once a second
if ( refresh_registration_count++ > 1000/LOOP_SLEEP )
{
iaxc_refresh_registrations();
refresh_registration_count = 0;
}
-
+
put_iaxc_lock();
iaxc_millisleep(LOOP_SLEEP);
@@ -782,7 +784,7 @@
e.type = IAXC_EVENT_VIDEOSTATS;
e.ev.videostats.callNo = selected_call;
iaxci_post_event(e);
-
+
video_stats_start = now;
}
}
@@ -803,7 +805,7 @@
video_send_video(call, selected_call);
send_video_stats();
-
+
// Tight spinloops are bad, mmmkay?
iaxc_millisleep(LOOP_SLEEP);
}
Modified: trunk/lib/iaxclient_lib.h
===================================================================
--- trunk/lib/iaxclient_lib.h 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/iaxclient_lib.h 2007-08-15 16:07:09 UTC (rev 1082)
@@ -2,16 +2,16 @@
* iaxclient: a cross-platform IAX softphone library
*
* Copyrights:
- * Copyright (C) 2003 HorizonLive.com, (c) 2004, Horizon Wimba, Inc.
+ * Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
* Contributors:
* Steve Kann <st...@st...>
- * Michael Van Donselaar <mv...@va...>
+ * Michael Van Donselaar <mv...@va...>
* Shawn Lawrence <sha...@te...>
*
- *
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
#ifndef _iaxclient_lib_h
#define _iaxclient_lib_h
@@ -132,8 +132,8 @@
int (*select_devices)(struct iaxc_audio_driver *d, int input, int output, int ring);
int (*selected_devices)(struct iaxc_audio_driver *d, int *input, int *output, int *ring);
- /*
- * select_ring ?
+ /*
+ * select_ring ?
* set_latency
*/
@@ -155,7 +155,7 @@
/* mic boost */
int (*mic_boost_get)(struct iaxc_audio_driver *d ) ;
int (*mic_boost_set)(struct iaxc_audio_driver *d, int enable);
-};
+};
struct iaxc_audio_codec {
char name[256];
Modified: trunk/lib/ringbuffer.c
===================================================================
--- trunk/lib/ringbuffer.c 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/ringbuffer.c 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,4 +1,19 @@
/*
+ * iaxclient: a cross-platform IAX softphone library
+ *
+ * Copyrights:
+ * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
+ * Copyright (C) 2007, Wimba, Inc.
+ *
+ * Contributors:
+ * <see below>
+ * Peter Grayson <jpg...@gm...>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU Lesser (Library) General Public License.
+ */
+
+/*
* Ring Buffer utility.
*
* Author: Phil Burk, http://www.softsynth.com
@@ -33,13 +48,13 @@
*/
/*
- * The text above constitutes the entire PortAudio license; however,
+ * The text above constitutes the entire PortAudio license; however,
* the PortAudio community also makes the following non-binding requests:
*
* Any person wishing to distribute modifications to the Software is
* requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also
- * requested that these non-binding requests be included along with the
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the
* license above.
*/
Modified: trunk/lib/ringbuffer.h
===================================================================
--- trunk/lib/ringbuffer.h 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/ringbuffer.h 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,6 +1,19 @@
-#ifndef RINGBUFFER_H
-#define RINGBUFFER_H
/*
+ * iaxclient: a cross-platform IAX softphone library
+ *
+ * Copyrights:
+ * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
+ * Copyright (C) 2007, Wimba, Inc.
+ *
+ * Contributors:
+ * <see below>
+ * Peter Grayson <jpg...@gm...>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU Lesser (Library) General Public License.
+ */
+
+/*
* Ring Buffer utility.
*
* Author: Phil Burk, http://www.softsynth.com
@@ -34,16 +47,19 @@
*/
/*
- * The text above constitutes the entire PortAudio license; however,
+ * The text above constitutes the entire PortAudio license; however,
* the PortAudio community also makes the following non-binding requests:
*
* Any person wishing to distribute modifications to the Software is
* requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version. It is also
- * requested that these non-binding requests be included along with the
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the
* license above.
*/
+#ifndef RINGBUFFER_H
+#define RINGBUFFER_H
+
#ifdef __cplusplus
extern "C"
{
Modified: trunk/lib/unixfuncs.c
===================================================================
--- trunk/lib/unixfuncs.c 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/unixfuncs.c 2007-08-15 16:07:09 UTC (rev 1082)
@@ -2,14 +2,14 @@
* iaxclient: a cross-platform IAX softphone library
*
* Copyrights:
- * Copyright (C) 2003 HorizonLive.com, (c) 2004, Horizon Wimba, Inc.
+ * Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
* Contributors:
* Steve Kann <st...@st...>
*
- *
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
#define _BSD_SOURCE
@@ -103,7 +103,7 @@
THREAD_TIME_CONSTRAINT_POLICY_COUNT)) != KERN_SUCCESS )
{
fprintf(stderr, "thread_policy_set failed: %d.\n", ret);
- }
+ }
return 0;
}
@@ -140,7 +140,7 @@
* they can be incorporated into the canonical version.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- */
+ */
/* It has been clarified by the authors that the request to send modifications
is a request, and not a condition */
@@ -165,7 +165,7 @@
#include <errno.h>
//#define DBUG(...) fprintf(stderr, __VA_ARGS__)
-#define DBUG(...)
+#define DBUG(...)
#define ERR_RPT(...) fprintf(stderr, __VA_ARGS__)
#define SCHEDULER_POLICY SCHED_RR
@@ -182,11 +182,11 @@
int CanaryRun;
pthread_t CanaryThread;
int IsCanaryThreadValid;
-
+
int WatchDogRun;
pthread_t WatchDogThread;
int IsWatchDogThreadValid;
-
+
} prioboost;
static prioboost *pb;
@@ -226,7 +226,7 @@
goto killAudio;
}
- DBUG("prioboost: WatchDog priority set to level %d!\n", schp.sched_priority);
+ DBUG("prioboost: WatchDog priority set to level %d!\n", schp.sched_priority);
/* Compare watchdog time with audio and canary thread times. */
/* Sleep for a while or until thread cancelled. */
@@ -366,7 +366,7 @@
struct sched_param schp = { 0 };
prioboost *b = calloc(sizeof(*b),1);
- int result = 0;
+ int result = 0;
b->priority = (sched_get_priority_max(SCHEDULER_POLICY) -
sched_get_priority_min(SCHEDULER_POLICY)) / 2;
@@ -392,7 +392,7 @@
pthread_setschedparam(b->ThreadID, SCHED_OTHER, &schp);
}
- return result;
+ return result;
}
int iaxci_prioboostend()
Modified: trunk/lib/video.c
===================================================================
--- trunk/lib/video.c 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/video.c 2007-08-15 16:07:09 UTC (rev 1082)
@@ -2,14 +2,18 @@
* iaxclient: a cross-platform IAX softphone library
*
* Copyrights:
- * Copyright (C) 2005 Horizon Wimba, inc.
+ * Copyright (C) 2005-2006, Horizon Wimba, inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
* Contributors:
* Steve Kann <st...@st...>
+ * Mihai Balea <mihai AT hates DOT ms>
+ * Peter Grayson <jpg...@gm...>
*
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
+
#include <assert.h>
#include "video.h"
@@ -212,7 +216,7 @@
for ( i = 0; i <= 24; i++)
{
tmp_allowed = 1 << i;
- if ( (allowed & tmp_allowed) &&
+ if ( (allowed & tmp_allowed) &&
codec_video_ffmpeg_check_codec(tmp_allowed) )
real_allowed |= tmp_allowed;
}
@@ -434,7 +438,7 @@
/* It is okay if we do not get any video; video capture may be
* disabled.
*/
- if ( !videobuf ||
+ if ( !videobuf ||
(iaxc_video_prefs & IAXC_VIDEO_PREF_CAPTURE_DISABLE)
)
return 0;
@@ -734,7 +738,7 @@
yuv2rgb_clip8[i] = 255 << 8;
yuv2rgb_clip16[i] = 255 << 16;
}
-
+
yuv2rgb_tables_initialized = 1;
}
@@ -742,7 +746,7 @@
/*
* Faster function to convert YUV420 images to RGB32
* RGB32: 0xFFRRGGBB
- * This function uses precalculated tables that are initialized
+ * This function uses precalculated tables that are initialized
* on the first run.
* Make sure the src and dest buffers have enough room
* dest should be width * height * 4 bytes in size
@@ -753,21 +757,21 @@
unsigned char *y, *u, *v;
unsigned int *dst;
int i;
-
+
if ( !yuv2rgb_tables_initialized )
iaxc_init_yuv2rgb_tables();
-
+
dst = (unsigned int *)dest;
y = (unsigned char *)src;
u = y + width * height;
v = u + width * height / 4;
-
+
for (i = 0; i < height; i++)
{
unsigned char *uu,*vv;
unsigned int *d;
int j;
-
+
d = dst;
uu = u;
vv = v;
@@ -809,54 +813,54 @@
// unsigned char * u = y + width * height;
// unsigned char * v = u + width * height / 4;
// unsigned int * dst = (unsigned int *)dest;
-//
+//
// for ( i = 0; i < height; i++ )
// {
// int j;
-//
+//
// unsigned char * uu = u;
// unsigned char * vv = v;
-//
+//
// for ( j = 0; j < width; j++ )
// {
// int yyy = *y - 16;
// int uuu = *uu - 128;
// int vvv = *vv - 128;
-//
+//
// int r = ( 298*yyy + 409*vvv + 128) >> 8;
// int g = ( 298*yyy - 100*uuu - 208*vvv + 128) >> 8;
// int b = ( 298*yyy + 516*uuu + 128) >> 8;
-//
+//
// // Clip values to make sure they fit in range
// if ( r < 0 )
// r = 0;
// else if ( r > 255 )
// r = 255;
-//
+//
// if ( g < 0 )
// g = 0;
// else if ( g > 255 )
// g = 255;
-//
+//
// if ( b < 0 )
// b = 0;
// else if ( b > 255 )
// b = 255;
-//
+//
// *(dst++) = 0xff000000 |
// ((unsigned char)r << 16) |
// ((unsigned char)g << 8) |
// ((unsigned char)b << 0);
-//
+//
// y++;
-//
+//
// if ( j & 1 )
// {
// uu++;
// vv++;
// }
// }
-//
+//
// if ( i & 1 )
// {
// u += width >> 1;
Modified: trunk/lib/video.h
===================================================================
--- trunk/lib/video.h 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/video.h 2007-08-15 16:07:09 UTC (rev 1082)
@@ -2,11 +2,13 @@
* iaxclient: a cross-platform IAX softphone library
*
* Copyrights:
- * Copyright (C) 2003 HorizonLive.com, (c) 2004, Horizon Wimba, Inc.
- * Copyright (C) 2007 Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
+ * Contributors:
+ * Peter Grayson <jpg...@gm...>
+ *
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
#ifndef __VIDEO_H__
@@ -34,7 +36,7 @@
int (*stop)(struct iaxc_video_driver *d);
int (*input)(struct iaxc_video_driver *d, char **data);
int (*is_camera_working)(struct iaxc_video_driver *d);
-
+
/* HACK ALERT!!!
* If the requested size of the video is not 320x240, then we
* resize the image in software rather than relying on the camera
@@ -44,7 +46,7 @@
int req_width;
int req_height;
int camera_working; /* true if the camera is working */
-};
+};
int video_initialize(void);
Modified: trunk/lib/videoLib/linux/linuxgrab.c
===================================================================
--- trunk/lib/videoLib/linux/linuxgrab.c 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/videoLib/linux/linuxgrab.c 2007-08-15 16:07:09 UTC (rev 1082)
@@ -2,21 +2,23 @@
* iaxclient: a cross-platform IAX softphone library
*
* Copyrights:
- * Copyright (C) 2003 HorizonLive.com, (c) 2004-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
* Contributors:
- * Peter Grayson <jpg...@gm...>
* Steve Kann <st...@st...>
* Stefano Falsetto <fal...@gn...>
+ * Peter Grayson <jpg...@gm...>
*
* This program is free software, distributed under the terms of
* the GNU Lesser (Library) General Public License
- *
+ */
+
+/*
* Module: video_portvideo
* Purpose: Video code to provide portvideo driver support for IAX library
* Developed by: Steve Kann
* Creation Date: April 7, 2005
- * Modify Data: July, 18, 2005
*/
#include "iaxclient_lib.h"
@@ -142,7 +144,7 @@
void *grabber_init( grab_callback_t gc, void *gc_data, int w, int h)
{
int got_camera;
-
+
grab_callback = gc;
grab_callback_data = gc_data;
width = w;
Modified: trunk/lib/videoLib/macosx/macgrab.c
===================================================================
--- trunk/lib/videoLib/macosx/macgrab.c 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/videoLib/macosx/macgrab.c 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,7 +1,25 @@
/*
- * code based on videoWindow.c
- * seeSaw
+ * iaxclient: a cross-platform IAX softphone library
*
+ * Copyrights:
+ * Copyright (c) 2004, Daniel Heckenberg. All rights reserved.
+ * Copyright (c) 2005, Tipic, Inc. All rights reserved.
+ * Copyright (C) 2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
+ *
+ * Contributors:
+ * Daniel Heckenberg <danielh.seeSaw<at>cse<dot>unsw<dot>edu<dot>au>
+ * Francesco Delfino <pl...@ti...>
+ * Mihai Balea <mihai AT hates DOT ms>
+ * Peter Grayson <jpg...@gm...>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU Lesser (Library) General Public License.
+ */
+
+/*
+ * code based on videoWindow.c from seeSaw
+ *
* Created by Daniel Heckenberg.
* Copyright (c) 2004 Daniel Heckenberg. All rights reserved.
* (danielh.seeSaw<at>cse<dot>unsw<dot>edu<dot>au)
@@ -144,7 +162,7 @@
pWnd->dstDataSize = GetPixRowBytes(GetGWorldPixMap(pWnd->dstPort)) *
(pWnd->dstPortBounds.bottom - pWnd->dstPortBounds.top);
pWnd->dstDisplayBounds = pWnd->dstPortBounds;
-
+
return 0;
}
Modified: trunk/lib/videoLib/macosx/vdigGrab.c
===================================================================
--- trunk/lib/videoLib/macosx/vdigGrab.c 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/videoLib/macosx/vdigGrab.c 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,4 +1,23 @@
/*
+ * iaxclient: a cross-platform IAX softphone library
+ *
+ * Copyrights:
+ * Copyright (c) 2004, Daniel Heckenberg. All rights reserved.
+ * Copyright (c) 2005, Tipic, Inc. All rights reserved.
+ * Copyright (C) 2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
+ *
+ * Contributors:
+ * Daniel Heckenberg <danielh.seeSaw<at>cse<dot>unsw<dot>edu<dot>au>
+ * Francesco Delfino <pl...@ti...>
+ * Mihai Balea <mihai AT hates DOT ms>
+ * Peter Grayson <jpg...@gm...>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU Lesser (Library) General Public License.
+ */
+
+/*
* vdigGrab.c
* seeSaw
*
@@ -220,7 +239,7 @@
goto endFunc;
}
}
-
+
// VDGetCompressTypes() // tells you the supported types
/*
Modified: trunk/lib/videoLib/macosx/vdigGrab.h
===================================================================
--- trunk/lib/videoLib/macosx/vdigGrab.h 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/videoLib/macosx/vdigGrab.h 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,4 +1,23 @@
/*
+ * iaxclient: a cross-platform IAX softphone library
+ *
+ * Copyrights:
+ * Copyright (c) 2004, Daniel Heckenberg. All rights reserved.
+ * Copyright (c) 2005, Tipic, Inc. All rights reserved.
+ * Copyright (C) 2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
+ *
+ * Contributors:
+ * Daniel Heckenberg <danielh.seeSaw<at>cse<dot>unsw<dot>edu<dot>au>
+ * Francesco Delfino <pl...@ti...>
+ * Mihai Balea <mihai AT hates DOT ms>
+ * Peter Grayson <jpg...@gm...>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU Lesser (Library) General Public License.
+ */
+
+/*
* vdigGrab.h
* seeSaw
*
Modified: trunk/lib/videoLib/readme
===================================================================
--- trunk/lib/videoLib/readme 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/videoLib/readme 2007-08-15 16:07:09 UTC (rev 1082)
@@ -14,10 +14,10 @@
License: Lesser GPL v2.1 (LGPL)
Description: This library provides a portable solution to
- use grab frames from webcam under Linux,
+ use grab frames from webcam under Linux,
MacOS X and Windows
-
+
License Terms
~~~~~~~~~~~~~
@@ -41,7 +41,7 @@
-Credits
+Credits
~~~~~~~
This library uses parts of projects from:
Modified: trunk/lib/videoLib/video_grab.c
===================================================================
--- trunk/lib/videoLib/video_grab.c 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/videoLib/video_grab.c 2007-08-15 16:07:09 UTC (rev 1082)
@@ -2,16 +2,22 @@
* iaxclient: a cross-platform IAX softphone library
*
* Copyrights:
- * Copyright (C) 2003 HorizonLive.com, (c) 2004, Horizon Wimba, Inc.
+ * Copyright (C) 2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
* Contributors:
* Steve Kann <st...@st...>
* Stefano Falsetto <fal...@gn...>
* Francesco Delfino <pl...@ti...>
+ * Mihai Balea <mihai AT hates DOT ms>
+ * Peter Grayson <jpg...@gm...>
+ * Bill Cholewka <bc...@gm...>
*
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
- *
+ * the GNU Lesser (Library) General Public License.
+ */
+
+/*
* Module: video_grab
* Purpose: Video code to provide portvideo driver support for IAX library
* Developed by: Stefano Falsetto and Francesco Delfino
@@ -274,9 +280,9 @@
int v = 0;
int s = 0;
int i, j;
-
- // YUY2 has a vertical sampling PERIOD (for U and V)
- // half that for YUV420. Will toss half of the
+
+ // YUY2 has a vertical sampling PERIOD (for U and V)
+ // half that for YUV420. Will toss half of the
// U and V data during repackaging.
for ( i = 0; i < height / 2; i++ )
{
Modified: trunk/lib/videoLib/video_grab.h
===================================================================
--- trunk/lib/videoLib/video_grab.h 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/videoLib/video_grab.h 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,3 +1,22 @@
+/*
+ * iaxclient: a cross-platform IAX softphone library
+ *
+ * Copyrights:
+ * Copyright (C) 2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
+ *
+ * Contributors:
+ * Steve Kann <st...@st...>
+ * Stefano Falsetto <fal...@gn...>
+ * Francesco Delfino <pl...@ti...>
+ * Mihai Balea <mihai AT hates DOT ms>
+ * Peter Grayson <jpg...@gm...>
+ * Bill Cholewka <bc...@gm...>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU Lesser (Library) General Public License.
+ */
+
#ifndef VIDEO_GRAB_H
#define VIDEO_GRAB_H
Modified: trunk/lib/videoLib/win32/wingrab.cpp
===================================================================
--- trunk/lib/videoLib/win32/wingrab.cpp 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/videoLib/win32/wingrab.cpp 2007-08-15 16:07:09 UTC (rev 1082)
@@ -1,3 +1,19 @@
+//
+// iaxclient: a cross-platform IAX softphone library
+//
+// Copyrights:
+// Copyright (C) 2006, Horizon Wimba, Inc.
+// Copyright (C) 2007, Wimba, Inc.
+//
+// Contributors:
+// Mihai Balea <mihai AT hates DOT ms>
+// Peter Grayson <jpg...@gm...>
+// Bill Cholewka <bc...@gm...>
+//
+// This program is free software, distributed under the terms of
+// the GNU Lesser (Library) General Public License.
+//
+
//------------------------------------------------------------------------------
// File: wingrab.cpp
//
Modified: trunk/lib/winfuncs.c
===================================================================
--- trunk/lib/winfuncs.c 2007-08-13 22:42:45 UTC (rev 1081)
+++ trunk/lib/winfuncs.c 2007-08-15 16:07:09 UTC (rev 1082)
@@ -2,14 +2,14 @@
* iaxclient: a cross-platform IAX softphone library
*
* Copyrights:
- * Copyright (C) 2003 HorizonLive.com, (c) 2004, Horizon Wimba, Inc.
+ * Copyright (C) 2003-2006, Horizon Wimba, Inc.
+ * Copyright (C) 2007, Wimba, Inc.
*
* Contributors:
* Steve Kann <st...@st...>
*
- *
* This program is free software, distributed under the terms of
- * the GNU Lesser (Library) General Public License
+ * the GNU Lesser (Library) General Public License.
*/
#include "iaxclient_lib.h"
@@ -28,11 +28,11 @@
/*
changed 'struct timezone*' to 'void*' since
timezone is defined as a long in MINGW and caused compile-time warnings.
- this should be okay since we don't use the passed value.
+ this should be okay since we don't use the passed value.
*/
-/*
+/*
* functions implementations
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
