** **
\*****************************************************************************/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include "main.h"
+/* HOW TO audio?
+
+Audio flow has two ways:
+
+* from channel to the upper layer
+ -> sound from mISDN channel
+ -> announcement from vbox channel
+
+* from the upper layer to the channel
+ -> sound from remote channel
+
+Audio is required:
+
+ -> if local or remote channel is not mISDN
+ -> if call is recorded (vbox)
+
-#define BETTERDELAY
+Functions:
-//#define MIXER_DEBUG /* debug mixer buffer overflow and underrun */
+* PmISDN::txfromup
+ -> audio from upper layer is buffered for later transmission to channel
+* PmISDN::handler
+ -> buffered audio from upper layer or tones are transmitted via system clock
+* mISDN_handler
+ -> rx-data from port to record() and upper layer
+ -> tx-data from port (dsp) to record()
+* VboxPort::handler
+ -> streaming announcement to upper layer
+ -> recording announcement
+* VboxPort::message_epoint
+ -> recording audio message from upper layer
+
+
+
+*/
+
+#include "main.h"
+
+#define SHORT_MIN -32768
+#define SHORT_MAX 32767
class Port *port_first = NULL;
-unsigned long port_serial = 1; /* must be 1, because 0== no port */
+unsigned int port_serial = 1; /* must be 1, because 0== no port */
/* free epointlist relation
/* free */
PDEBUG(DEBUG_EPOINT, "PORT(%d) removed epoint from port\n", p_serial);
- memset(temp, 0, sizeof(struct epoint_list));
- free(temp);
+ FREE(temp, sizeof(struct epoint_list));
ememuse--;
}
-void Port::free_epointid(unsigned long epoint_id)
+void Port::free_epointid(unsigned int epoint_id)
{
struct epoint_list *temp, **tempp;
}
if (temp == 0)
{
- PERROR("epoint_id not in port's list, exitting.\n");
+ PERROR("epoint_id not in port's list.\n");
return;
}
/* detach */
/* free */
PDEBUG(DEBUG_EPOINT, "PORT(%d) removed epoint from port\n", p_serial);
- memset(temp, 0, sizeof(struct epoint_list));
- free(temp);
+ FREE(temp, sizeof(struct epoint_list));
ememuse--;
}
/* create new epointlist relation
*/
-struct epoint_list *Port::epointlist_new(unsigned long epoint_id)
+struct epoint_list *Port::epointlist_new(unsigned int epoint_id)
{
struct epoint_list *epointlist, **epointlistpointer;
/* epointlist structure */
- epointlist = (struct epoint_list *)calloc(1, sizeof(struct epoint_list));
+ epointlist = (struct epoint_list *)MALLOC(sizeof(struct epoint_list));
if (!epointlist)
- {
- PERROR("no mem for allocating epoint_list\n");
- return(0);
- }
+ FATAL("No memory for epointlist\n");
ememuse++;
PDEBUG(DEBUG_EPOINT, "PORT(%d) allocating epoint_list.\n", p_serial);
- memset(epointlist, 0, sizeof(struct epoint_list));
/* add epoint_list to chain */
epointlist->next = NULL;
/*
* port constructor
*/
-Port::Port(int type, char *portname, struct port_settings *settings)
+Port::Port(int type, const char *portname, struct port_settings *settings)
{
class Port *temp, **tempp;
}
SCPY(p_name, portname);
SCPY(p_tone_dir, p_settings.tones_dir); // just to be sure
- p_last_tv_sec = 0;
- p_last_tv_msec = 0;
p_type = type;
p_serial = port_serial++;
- p_debug_nothingtosend = 0;
p_tone_fh = -1;
p_tone_fetched = NULL;
p_tone_name[0] = '\0';
-// p_knock_fh = -1;
-// p_knock_fetched = NULL;
p_state = PORT_STATE_IDLE;
p_epointlist = NULL;
memset(&p_callerinfo, 0, sizeof(p_callerinfo));
memset(&p_connectinfo, 0, sizeof(p_connectinfo));
memset(&p_redirinfo, 0, sizeof(p_redirinfo));
memset(&p_capainfo, 0, sizeof(p_capainfo));
- memset(p_mixer_buffer, 0, sizeof(p_mixer_buffer));
- memset(p_record_buffer, 0, sizeof(p_record_buffer));
- memset(p_stereo_buffer, 0, sizeof(p_stereo_buffer));
- p_mixer_rel = NULL;
- p_mixer_readp = 0;
p_echotest = 0;
- next = NULL;
+
+ /* call recording */
p_record = NULL;
p_record_type = 0;
p_record_length = 0;
+ p_record_skip = 0;
p_record_filename[0] = '\0';
+ p_record_buffer_readp = 0;
+ p_record_buffer_writep = 0;
+ p_record_buffer_dir = 0;
/* append port to chain */
+ next = NULL;
temp = port_first;
tempp = &port_first;
while(temp)
*/
Port::~Port(void)
{
- struct mixer_relation *relation, *rtemp;
class Port *temp, **tempp;
- struct message *message;
+ struct lcr_msg *message;
if (p_record)
- close_record(0);
+ close_record(0, 0);
classuse--;
PDEBUG(DEBUG_PORT, "removing port of type %d, name '%s'\n", p_type, p_name);
- /* free mixer relation chain */
- relation = p_mixer_rel;
- while(relation)
- {
- rtemp = relation;
- relation = relation->next;
- memset(rtemp, 0, sizeof(struct mixer_relation));
- free(rtemp);
- pmemuse--;
- }
- p_mixer_rel = NULL; /* beeing paranoid */
-
/* disconnect port from endpoint */
while(p_epointlist)
{
temp = temp->next;
}
if (temp == NULL)
- {
- PERROR("PORT(%s) port not in port's list.\n", p_name);
- exit(-1);
- }
+ FATAL("PORT(%s) port not in port's list.\n", p_name);
/* detach */
*tempp=this->next;
/*
* find the port with port_id
*/
-class Port *find_port_id(unsigned long port_id)
+class Port *find_port_id(unsigned int port_id)
{
class Port *port = port_first;
/*
* set the file in the tone directory with the given name
*/
-void Port::set_tone(char *dir, char *name)
+void Port::set_tone(const char *dir, const char *name)
{
int fh;
char filename[128];
if (name == NULL)
name = "";
+#if 0
+ /* if tones is jingle, store next tone */
+ if ((p_tone_fh >= 0 || p_tone_fetched)
+ && (!strcmp(p_tone_name, "left") || !strcmp(p_tone_name, "joined")))
+ {
+ SCPY(p_tone_dir, dir);
+ SCPY(p_tone_name, name);
+ return;
+ }
+#endif
+
/* no counter, no eof, normal speed */
p_tone_counter = 0;
p_tone_eof = 0;
p_tone_fetched = NULL;
return;
}
- SPRINT(filename, "%s/%s/%s", INSTALL_DATA, p_tone_dir, p_tone_name);
+ SPRINT(filename, "%s/%s/%s", SHARE_DATA, p_tone_dir, p_tone_name);
if ((fh=open_tone(filename, &p_tone_codec, 0, 0)) >= 0)
{
close(fh);
return;
}
- SPRINT(filename, "%s/%s/%s_loop", INSTALL_DATA, p_tone_dir, p_tone_name);
+ SPRINT(filename, "%s/%s/%s_loop", SHARE_DATA, p_tone_dir, p_tone_name);
if ((fh=open_tone(filename, &p_tone_codec, 0, 0)) >= 0)
{
close(fh);
* set the file in the tone directory for vbox playback
* also set the play_eof-flag
*/
-void Port::set_vbox_tone(char *dir, char *name)
+void Port::set_vbox_tone(const char *dir, const char *name)
{
char filename[256];
PDEBUG(DEBUG_PORT, "PORT(%s) opening fetched tone: %s\n", p_name, p_tone_name);
return;
}
- SPRINT(filename, "%s/%s/%s", INSTALL_DATA, p_tone_dir, p_tone_name);
+ SPRINT(filename, "%s/%s/%s", SHARE_DATA, p_tone_dir, p_tone_name);
if ((p_tone_fh=open_tone(filename, &p_tone_codec, &p_tone_size, &p_tone_left)) >= 0)
{
fhuse++;
* also set the eof-flag
* also set the counter-flag
*/
-void Port::set_vbox_play(char *name, int offset)
+void Port::set_vbox_play(const char *name, int offset)
{
- signed long size;
- struct message *message;
+ struct lcr_msg *message;
/* use ser_box_tone() */
set_vbox_tone("", name);
{
message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_TONE_COUNTER);
message->param.counter.current = offset;
- message->param.counter.max = size;
+ message->param.counter.max = p_tone_size;
message_put(message);
}
}
/*
* read from the given file as specified in port_set_tone and return sample data
- * silence is appended if sample ends, but only the number of samples with tones are returned
+ * if the tone ends, the result may be less samples than requested
*/
int Port::read_audio(unsigned char *buffer, int length)
{
- int l,len;
- int readp;
+ int l = 0,len;
int nodata=0; /* to detect 0-length files and avoid endless reopen */
char filename[128];
int tone_left_before; /* temp variable to determine the change in p_tone_left */
return(0);
len = length;
- codec_in = p_tone_codec;
/* if there is no tone set, use silence */
- if (p_tone_name[0] == 0)
- {
-rest_is_silence:
- memset(buffer, (options.law=='a')?0x2a:0xff, len); /* silence */
- goto done;
- }
+ if (!p_tone_name[0])
+ return(0);
/* if the file pointer is not open, we open it */
if (p_tone_fh<0 && p_tone_fetched==NULL)
/* if file does not exist */
if (!(p_tone_fetched=open_tone_fetched(p_tone_dir, filename, &p_tone_codec, &p_tone_size, &p_tone_left)))
{
- SPRINT(filename, "%s/%s/%s", INSTALL_DATA, p_tone_dir, p_tone_name);
+ SPRINT(filename, "%s/%s/%s", SHARE_DATA, p_tone_dir, p_tone_name);
/* if file does not exist */
if ((p_tone_fh=open_tone(filename, &p_tone_codec, &p_tone_size, &p_tone_left)) < 0)
{
if (((p_tone_size-p_tone_left)/8000) != (p_tone_size-tone_left_before)/8000)
{
//printf("\nsize=%d left=%d\n\n",p_tone_size,p_tone_left);
- struct message *message;
+ struct lcr_msg *message;
message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_TONE_COUNTER);
message->param.counter.current = (p_tone_size-p_tone_left)/8000;
message->param.counter.max = -1;
}
if (len==0)
- goto done;
+ return(length-len);
if (p_tone_fh >= 0)
{
PDEBUG(DEBUG_PORT, "PORT(%s) 0-length loop: %s\n", p_name, filename);
p_tone_name[0]=0;
p_tone_dir[0]=0;
- goto rest_is_silence;
+ return(length-len);
}
/* if eof is reached, or if the normal file cannot be opened, continue with the loop file if possible */
try_loop:
if (p_tone_eof && ACTIVE_EPOINT(p_epointlist))
{
- struct message *message;
+ struct lcr_msg *message;
message = message_create(p_serial, ACTIVE_EPOINT(p_epointlist), PORT_TO_EPOINT, MESSAGE_TONE_EOF);
message_put(message);
}
SPRINT(filename, "%s_loop", p_tone_name);
if (!(p_tone_fetched=open_tone_fetched(p_tone_dir, filename, &p_tone_codec, &p_tone_size, &p_tone_left)))
{
- SPRINT(filename, "%s/%s/%s_loop", INSTALL_DATA, p_tone_dir, p_tone_name);
+ SPRINT(filename, "%s/%s/%s_loop", SHARE_DATA, p_tone_dir, p_tone_name);
/* if file does not exist */
if ((p_tone_fh=open_tone(filename, &p_tone_codec, &p_tone_size, &p_tone_left)) < 0)
{
PDEBUG(DEBUG_PORT, "PORT(%s) no tone loop: %s\n",p_name, filename);
p_tone_dir[0] = '\0';
p_tone_name[0] = '\0';
- // codec_in = CODEC_LAW;
- goto rest_is_silence;
+ return(length-len);
}
fhuse++;
}
PDEBUG(DEBUG_PORT, "PORT(%s) no tone loop: %s\n",p_name, filename);
p_tone_dir[0] = '\0';
p_tone_name[0] = '\0';
- // codec_in = CODEC_LAW;
- goto rest_is_silence;
+ return(length-len);
}
fhuse++;
}
/* now we have opened the loop */
goto read_more;
-
-done:
- return(length-len);
-}
-
-
-/*
- * dummy for transmit function, since this must be inherited
- */
-void Port::transmit(unsigned char *buffer, int length, int tonelength)
-{
}
* this is called by the message_epoint inherited by child classes
* therefor a return=1 means: stop, no more processing
*/
-//extern struct message *dddebug;
-int Port::message_epoint(unsigned long epoint_id, int message_id, union parameter *param)
+//extern struct lcr_msg *dddebug;
+int Port::message_epoint(unsigned int epoint_id, int message_id, union parameter *param)
{
/* check if we got audio data from one remote port */
switch(message_id)
set_tone(param->tone.dir,param->tone.name);
return(1);
- case MESSAGE_DATA: /* tx-data from upper layer */
- fromup(param->data.data, param->data.len);
- return(1);
-
case MESSAGE_VBOX_TONE: /* play tone of answering machine */
PDEBUG(DEBUG_PORT, "PORT(%s) set answering machine tone '%s' '%s'\n", p_name, param->tone.dir, param->tone.name);
set_vbox_tone(param->tone.dir, param->tone.name);
}
-/*
- * special function generate individual isdn debug logs
- */
-void Port::printisdn(char *fmt, ...)
-{
- char buffer[4096];
- char name[128];
- va_list args;
- FILE *fp;
-
- va_start(args,fmt);
- VUNPRINT(buffer,sizeof(buffer)-1,fmt,args);
- buffer[sizeof(buffer)-1]=0;
- va_end(args);
-
- PDEBUG_RUNTIME(NULL, 0, DEBUG_PORT, "PORT(%s serial=%ld): %s\n", p_name, p_serial, buffer);
- if (options.deb & DEBUG_LOG)
- {
- SPRINT(name, "%s/debug_%s.log", INSTALL_DATA, p_name);
- if (!(fp = fopen(name, "a")))
- return;
-
- fprintf(fp, "%04d.%02d.%02d %02d:%02d:%02d %s(%ld): %s", now_tm->tm_year+1900, now_tm->tm_mon+1, now_tm->tm_mday, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec, p_name, p_serial, buffer);
- fclose(fp);
- }
-}
-
-
/* wave header structure */
struct fmt {
unsigned short stereo; /* 1 = mono, 2 = stereo */
unsigned short channels; /* number of channels */
- unsigned long sample_rate; /* sample rate */
- unsigned long data_rate; /* data rate */
+ unsigned int sample_rate; /* sample rate */
+ unsigned int data_rate; /* data rate */
unsigned short bytes_sample; /* bytes per sample (all channels) */
unsigned short bits_sample; /* bits per sample (one channel) */
};
* written before close, because we do not know the size yet)
* type=1 record annoucement, type=0 record audio stream, type=2 record vbox
*/
-int Port::open_record(int type, int vbox, int skip, char *extension, int anon_ignore, char *vbox_email, int vbox_email_file)
+int Port::open_record(int type, int vbox, int skip, char *extension, int anon_ignore, const char *vbox_email, int vbox_email_file)
{
/* RIFFxxxxWAVEfmt xxxx(fmt-size)dataxxxx... */
char dummyheader[8+4+8+sizeof(fmt)+8];
}
if (vbox != 0)
- SPRINT(filename, "%s/%s/%s/vbox", INSTALL_DATA, options.extensions_dir, p_record_extension);
+ SPRINT(filename, "%s/%s/vbox", EXTENSION_DATA, p_record_extension);
else
- SPRINT(filename, "%s/%s/%s/recordings", INSTALL_DATA, options.extensions_dir, p_record_extension);
+ SPRINT(filename, "%s/%s/recordings", EXTENSION_DATA, p_record_extension);
if (mkdir(filename, 0755) < 0)
{
if (errno != EEXIST)
/*
* close the recoding file, put header in front and rename
*/
-void Port::close_record(int beep)
+void Port::close_record(int beep, int mute)
{
- static signed long beep_mono[] = {-10000, 10000, -10000, 10000, -10000, 10000, -10000, 10000, -10000, 10000, -10000, 10000, -10000, 10000, -10000, 10000};
- static unsigned char beep_8bit[] = {48, 208, 48, 208, 48, 208, 48, 208, 48, 208, 48, 208, 48, 208, 48, 208, 48, 208, 48, 208, 48, 208, 48, 208, 48, 208, 48, 208, 48, 208, 48, 208, 48, 208};
- unsigned long size, wsize;
+ static signed short beep_mono[256];
+ unsigned int size = 0, wsize = 0;
struct fmt fmt;
char filename[512], indexname[512];
FILE *fp;
char number[256], callerid[256];
char *p;
struct caller_info callerinfo;
- char *valid_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_.-!$%&/()=+*;~";
+ const char *valid_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_.-!$%&/()=+*;~";
if (!p_record)
return;
+ PDEBUG(DEBUG_PORT, "data still in record buffer: %d (dir %d)\n", (p_record_buffer_writep - p_record_buffer_readp) & RECORD_BUFFER_MASK, p_record_buffer_dir);
memcpy(&callerinfo, &p_callerinfo, sizeof(struct caller_info));
- apply_callerid_restriction(p_record_anon_ignore, -1, callerinfo.id, &callerinfo.ntype, &callerinfo.present, &callerinfo.screen, callerinfo.voip, callerinfo.intern, callerinfo.name);
+// apply_callerid_restriction(p_record_anon_ignore, callerinfo.id, &callerinfo.ntype, &callerinfo.present, &callerinfo.screen, callerinfo.extension, callerinfo.name);
- SCPY(number, p_dialinginfo.number);
- SCPY(callerid, numberrize_callerinfo(callerinfo.id, callerinfo.ntype));
+ SCPY(number, p_dialinginfo.id);
+ SCPY(callerid, numberrize_callerinfo(callerinfo.id, callerinfo.ntype, options.national, options.international));
if (callerid[0] == '\0')
{
if (callerinfo.present == INFO_PRESENT_RESTRICTED)
i++;
}
+ /* mute */
+ if (mute && p_record_type==CODEC_MONO)
+ {
+ i = p_record_length;
+ if (i > mute)
+ i = mute;
+ fseek(p_record, -(i<<1), SEEK_END);
+ p_record_length -= (i<<1);
+ }
/* add beep to the end of recording */
- if (beep)
- switch(p_record_type)
+ if (beep && p_record_type==CODEC_MONO)
{
- case CODEC_MONO:
i = 0;
- while(i < beep)
+ while(i < 256)
{
- fwrite(beep_mono, sizeof(beep_mono), 1, p_record);
- i += sizeof(beep_mono);
- p_record_length += sizeof(beep_mono);
+ beep_mono[i] = (signed short)(sin((double)i / 5.688888888889 * 2.0 * 3.1415927) * 2000.0);
+ i++;
}
- break;
- case CODEC_8BIT:
i = 0;
while(i < beep)
{
- fwrite(beep_8bit, sizeof(beep_8bit), 1, p_record);
- i += sizeof(beep_8bit);
- p_record_length += sizeof(beep_8bit);
- }
- break;
-#if 0
- case CODEC_LAW:
- i = 0;
- while(i < beep)
- {
- fwrite(beep_law, sizeof(beep_law), 1, p_record);
- i += sizeof(beep_law);
- p_record_length += sizeof(beep_law);
+ fwrite(beep_mono, sizeof(beep_mono), 1, p_record);
+ i += sizeof(beep_mono);
+ p_record_length += sizeof(beep_mono);
}
- break;
-#endif
- default:
- PERROR("codec %d not supported for beep adding\n", p_record_type);
}
/* complete header */
fprintf(p_record, "WAVE");
/* fmt */
- fprintf(p_record, "fmt %c%c%c%c", sizeof(fmt), 0, 0, 0);
+ fprintf(p_record, "fmt %c%c%c%c", (unsigned int)sizeof(fmt), 0, 0, 0);
switch(p_record_type)
{
case CODEC_MONO:
if (p_record_vbox == 2)
{
- SPRINT(indexname, "%s/%s/%s/vbox/index", INSTALL_DATA, options.extensions_dir, p_record_extension);
+ SPRINT(indexname, "%s/%s/vbox/index", EXTENSION_DATA, p_record_extension);
if ((fp = fopen(indexname,"a")))
{
fduse++;
/* send email with sample*/
if (p_record_vbox_email[0])
{
- send_mail(p_record_vbox_email_file?filename:(char *)"", callerid, callerinfo.intern, callerinfo.name, p_record_vbox_email, p_record_vbox_year, p_record_vbox_mon, p_record_vbox_mday, p_record_vbox_hour, p_record_vbox_min, p_record_extension);
+ send_mail(p_record_vbox_email_file?filename:(char *)"", callerid, callerinfo.extension, callerinfo.name, p_record_vbox_email, p_record_vbox_year, p_record_vbox_mon, p_record_vbox_mday, p_record_vbox_hour, p_record_vbox_min, p_record_extension);
}
}
}
*
* If one stream (dir) received packets, they are stored to a
* buffer to wait for the other stream (dir), so both streams can
- * be combined. If the buffer is full, it's read pointer is written
- * without mixing stream.
+ * be combined. If the buffer is full, it's content is written
+ * without mixing stream. (assuming only one stram (dir) exists.)
* A flag is used to indicate what stream is currently in buffer.
*
* NOTE: First stereo sample (odd) is from down, second is from up.
*/
-alle buffer initialisieren
-record nur aufrufen, wenn recorded wird.
-restlicher buffer wegschreiben beim schliessen
-void Port::record(char *data, int length, int dir_fromup)
+void Port::record(unsigned char *data, int length, int dir_fromup)
{
unsigned char write_buffer[1024], *d;
signed short *s;
- int r, w;
- signed long sample;
+ int free, i, ii;
+ signed int sample;
/* no recording */
if (!p_record || !length)
return;
+ /* skip data from local caller (dtmf input) */
+ if (p_record_skip && !dir_fromup)
+ {
+ /* more to skip than we have */
+ if (p_record_skip > length)
+ {
+ p_record_skip -= length;
+ return;
+ }
+ /* less to skip */
+ data += p_record_skip;
+ length -= p_record_skip;
+ p_record_skip = 0;
+ }
+
+//printf("dir=%d len=%d\n", dir_fromup, length);
+
free = ((p_record_buffer_readp - p_record_buffer_writep - 1) & RECORD_BUFFER_MASK);
+//PDEBUG(DEBUG_PORT, "record(data,%d,%d): free=%d, p_record_buffer_dir=%d, p_record_buffer_readp=%d, p_record_buffer_writep=%d.\n", length, dir_fromup, free, p_record_buffer_dir, p_record_buffer_readp, p_record_buffer_writep);
+
/* the buffer stores the same data stream */
if (dir_fromup == p_record_buffer_dir)
{
- same_again:
+same_again:
+//printf("same free=%d length=%d\n", free, length);
/* first write what we can to the buffer */
while(free && length)
{
- p_record_buffer[p_record_buffer_writep] = audio_law_to_s32(*data++);
+ p_record_buffer[p_record_buffer_writep] = audio_law_to_s32[*data++];
p_record_buffer_writep = (p_record_buffer_writep + 1) & RECORD_BUFFER_MASK;
free--;
length--;
/* all written, so we return */
if (!length)
return;
- /* still data left, buffer is full, so we need to write to file */
+ /* still data left, buffer is full, so we need to write a chunk to file */
switch(p_record_type)
{
case CODEC_MONO:
i++;
}
fwrite(write_buffer, 512, 1, p_record);
+ p_record_length += 512;
break;
case CODEC_STEREO:
}
}
fwrite(write_buffer, 1024, 1, p_record);
+ p_record_length += 1024;
break;
case CODEC_8BIT:
i = 0;
while(i < 256)
{
- *d++ = (p_record_buffer[p_record_buffer_readp]+0x8000) >> 8;
+ *d++ = ((unsigned short)(p_record_buffer[p_record_buffer_readp]+0x8000)) >> 8;
p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
i++;
}
fwrite(write_buffer, 512, 1, p_record);
+ p_record_length += 512;
break;
case CODEC_LAW:
i++;
}
fwrite(write_buffer, 256, 1, p_record);
+ p_record_length += 256;
break;
}
/* because we still have data, we write again */
- free += sizeof(write_buffer);
+ free += 256;
goto same_again;
}
-
- /* the buffer store the other stream */
- different_again:
+ /* the buffer stores the other stream */
+different_again:
/* if buffer empty, change it */
if (p_record_buffer_readp == p_record_buffer_writep)
{
ii = (p_record_buffer_writep - p_record_buffer_readp) & RECORD_BUFFER_MASK;
if (length < ii)
ii = length;
+
+ if (ii > 256)
+ ii = 256;
+//printf("same ii=%d length=%d\n", ii, length);
+//PDEBUG(DEBUG_PORT, "record(data,%d,%d): free=%d, p_record_buffer_dir=%d, p_record_buffer_readp=%d, p_record_buffer_writep=%d: mixing %d bytes.\n", length, dir_fromup, free, p_record_buffer_dir, p_record_buffer_readp, p_record_buffer_writep, ii);
+
/* write data mixed with the buffer */
switch(p_record_type)
{
while(i < ii)
{
sample = p_record_buffer[p_record_buffer_readp]
- + audio_law_to_s32(*data++);
+ + audio_law_to_s32[*data++];
p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
- if (sample < 32767)
- sample = -32767;
- if (sample > 32768)
- sample = 32768;
+ if (sample < SHORT_MIN) sample = SHORT_MIN;
+ if (sample > SHORT_MAX) sample = SHORT_MAX;
*s++ = sample;
i++;
}
fwrite(write_buffer, ii<<1, 1, p_record);
+ p_record_length += (ii<<1);
break;
case CODEC_STEREO:
i = 0;
while(i < ii)
{
- *s++ = audio_law_to_s32(*data++);
+ *s++ = audio_law_to_s32[*data++];
*s++ = p_record_buffer[p_record_buffer_readp];
p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
i++;
while(i < ii)
{
*s++ = p_record_buffer[p_record_buffer_readp];
- *s++ = audio_law_to_s32(*data++);
+ *s++ = audio_law_to_s32[*data++];
+ p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
i++;
}
}
fwrite(write_buffer, ii<<2, 1, p_record);
+ p_record_length += (ii<<2);
break;
case CODEC_8BIT:
while(i < ii)
{
sample = p_record_buffer[p_record_buffer_readp]
- + audio_law_to_s32(*data++);
+ + audio_law_to_s32[*data++];
p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
- if (sample < 32767)
- sample = -32767;
- if (sample > 32768)
- sample = 32768;
+ if (sample < SHORT_MIN) sample = SHORT_MIN;
+ if (sample > SHORT_MAX) sample = SHORT_MAX;
*d++ = (sample+0x8000) >> 8;
i++;
}
fwrite(write_buffer, ii, 1, p_record);
+ p_record_length += ii;
break;
case CODEC_LAW:
while(i < ii)
{
sample = p_record_buffer[p_record_buffer_readp]
- + audio_law_to_s32(*data++);
+ + audio_law_to_s32[*data++];
p_record_buffer_readp = (p_record_buffer_readp + 1) & RECORD_BUFFER_MASK;
- if (sample < 32767)
- sample = -32767;
- if (sample > 32768)
- sample = 32768;
+ if (sample < SHORT_MIN) sample = SHORT_MIN;
+ if (sample > SHORT_MAX) sample = SHORT_MAX;
*d++ = audio_s16_to_law[sample & 0xffff];
i++;
}
fwrite(write_buffer, ii, 1, p_record);
+ p_record_length += ii;
break;
}
length -= ii;
- /* data, but buffer empty */
+ /* still data */
if (length)
- {
- p_record_buffer_dir = dir_fromup;
- goto same_again;
- }
+ goto different_again;
/* no data (maybe buffer) */
return;
}
-/*
- * enque data from upper buffer
- */
-iniialisieren der werte
-void Port::txfromup(unsigned char *data, int length)
-{
-
- /* no recording */
- if (!length)
- return;
-
- /* get free samples in buffer */
- free = ((p_fromup_buffer_readp - p_fromup_buffer_writep - 1) & FROMUP_BUFFER_MASK);
- if (free < length)
- {
- PDEBUG(DEBUG_PORT, "Port(%d): fromup_buffer overflows, this shall not happen under normal conditions\n", p_serial);
- return;
- }
-
- /* write data to buffer and return */
- while(length)
- {
- p_fromup_buffer[p_fromup_buffer_writep] = *data++;
- p_fromup_buffer_writep = (p_fromup_buffer_writep + 1) & FROMUP_BUFFER_MASK;
- length--;
- }
- return; // must return, because length is 0
-}
-