kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 07:48:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use FILE * instead of fd for files to support buffering

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6801 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-10-16 16:12:51 +00:00
parent d2025ad2a1
commit d499a85f05
17 changed files with 406 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
formats/format_au.c
View File

@@ -57,7 +57,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
struct ast_filestream {
void *reserved[AST_RESERVED_POINTERS];
/* This is what a filestream means to us */
int fd; /* Descriptor */
FILE *f; /* Descriptor */
struct ast_channel *owner;
struct ast_frame fr; /* Frame information */
char waste[AST_FRIENDLY_OFFSET]; /* Buffer for sending frames, etc */
@@ -98,7 +98,7 @@ static char *exts = "au";
#endif
static int check_header(int fd)
static int check_header(FILE *f)
{
AU_HEADER(header);
u_int32_t magic;
@@ -108,7 +108,7 @@ static int check_header(int fd)
u_int32_t sample_rate;
u_int32_t channels;
if (read(fd, header, AU_HEADER_SIZE) != AU_HEADER_SIZE) {
if (fread(header, 1, AU_HEADER_SIZE, f) != AU_HEADER_SIZE) {
ast_log(LOG_WARNING, "Read failed (header)\n");
return -1;
}
@@ -136,22 +136,24 @@ static int check_header(int fd)
return -1;
}
/* Skip to data */
data_size = lseek(fd, 0, SEEK_END) - hdr_size;
if (lseek(fd, hdr_size, SEEK_SET) == -1 ) {
fseek(f, 0, SEEK_END);
data_size = ftell(f) - hdr_size;
if (fseek(f, hdr_size, SEEK_SET) == -1 ) {
ast_log(LOG_WARNING, "Failed to skip to data: %d\n", hdr_size);
return -1;
}
return data_size;
}
static int update_header(int fd)
static int update_header(FILE *f)
{
off_t cur, end;
u_int32_t datalen;
int bytes;
cur = lseek(fd, 0, SEEK_CUR);
end = lseek(fd, 0, SEEK_END);
cur = ftell(f);
fseek(f, 0, SEEK_END);
end = ftell(f);
/* data starts 24 bytes in */
bytes = end - AU_HEADER_SIZE;
datalen = htoll(bytes);
@@ -160,22 +162,22 @@ static int update_header(int fd)
ast_log(LOG_WARNING, "Unable to find our position\n");
return -1;
}
if (lseek(fd, AU_HDR_DATA_SIZE_OFF * sizeof(u_int32_t), SEEK_SET) != (AU_HDR_DATA_SIZE_OFF * sizeof(u_int32_t))) {
if (fseek(f, AU_HDR_DATA_SIZE_OFF * sizeof(u_int32_t), SEEK_SET)) {
ast_log(LOG_WARNING, "Unable to set our position\n");
return -1;
}
if (write(fd, &datalen, sizeof(datalen)) != sizeof(datalen)) {
if (fwrite(&datalen, 1, sizeof(datalen), f) != sizeof(datalen)) {
ast_log(LOG_WARNING, "Unable to set write file size\n");
return -1;
}
if (lseek(fd, cur, SEEK_SET) != cur) {
if (fseek(f, cur, SEEK_SET)) {
ast_log(LOG_WARNING, "Unable to return to position\n");
return -1;
}
return 0;
}
static int write_header(int fd)
static int write_header(FILE *f)
{
AU_HEADER(header);
@@ -187,15 +189,15 @@ static int write_header(int fd)
header[AU_HDR_CHANNELS_OFF] = htoll(1);
/* Write an au header, ignoring sizes which will be filled in later */
lseek(fd, 0, SEEK_SET);
if (write(fd, header, AU_HEADER_SIZE) != AU_HEADER_SIZE) {
fseek(f, 0, SEEK_SET);
if (fwrite(header, 1, AU_HEADER_SIZE, f) != AU_HEADER_SIZE) {
ast_log(LOG_WARNING, "Unable to write header\n");
return -1;
}
return 0;
}
static struct ast_filestream *au_open(int fd)
static struct ast_filestream *au_open(FILE *f)
{
struct ast_filestream *tmp;
@@ -205,7 +207,7 @@ static struct ast_filestream *au_open(int fd)
}
memset(tmp, 0, sizeof(struct ast_filestream));
if (check_header(fd) < 0) {
if (check_header(f) < 0) {
free(tmp);
return NULL;
}
@@ -214,7 +216,7 @@ static struct ast_filestream *au_open(int fd)
free(tmp);
return NULL;
}
tmp->fd = fd;
tmp->f = f;
tmp->fr.data = tmp->buf;
tmp->fr.frametype = AST_FRAME_VOICE;
tmp->fr.subclass = AST_FORMAT_ULAW;
@@ -227,7 +229,7 @@ static struct ast_filestream *au_open(int fd)
return tmp;
}
static struct ast_filestream *au_rewrite(int fd, const char *comment)
static struct ast_filestream *au_rewrite(FILE *f, const char *comment)
{
struct ast_filestream *tmp;
@@ -237,7 +239,7 @@ static struct ast_filestream *au_rewrite(int fd, const char *comment)
}
memset(tmp, 0, sizeof(struct ast_filestream));
if (write_header(fd)) {
if (write_header(f)) {
free(tmp);
return NULL;
}
@@ -246,7 +248,7 @@ static struct ast_filestream *au_rewrite(int fd, const char *comment)
free(tmp);
return NULL;
}
tmp->fd = fd;
tmp->f = f;
localusecnt++;
ast_mutex_unlock(&au_lock);
ast_update_use_count();
@@ -262,7 +264,7 @@ static void au_close(struct ast_filestream *s)
localusecnt--;
ast_mutex_unlock(&au_lock);
ast_update_use_count();
close(s->fd);
fclose(s->f);
free(s);
}
@@ -277,7 +279,7 @@ static struct ast_frame *au_read(struct ast_filestream *s, int *whennext)
s->fr.offset = AST_FRIENDLY_OFFSET;
s->fr.mallocd = 0;
s->fr.data = s->buf;
if ((res = read(s->fd, s->buf, BUF_SIZE)) < 1) {
if ((res = fread(s->buf, 1, BUF_SIZE, s->f)) < 1) {
if (res)
ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
return NULL;
@@ -301,11 +303,11 @@ static int au_write(struct ast_filestream *fs, struct ast_frame *f)
ast_log(LOG_WARNING, "Asked to write non-ulaw frame (%d)!\n", f->subclass);
return -1;
}
if ((res = write(fs->fd, f->data, f->datalen)) != f->datalen) {
if ((res = fwrite(f->data, 1, f->datalen, fs->f)) != f->datalen) {
ast_log(LOG_WARNING, "Bad write (%d/%d): %s\n", res, f->datalen, strerror(errno));
return -1;
}
update_header(fs->fd);
update_header(fs->f);
return 0;
}
@@ -316,8 +318,9 @@ static int au_seek(struct ast_filestream *fs, long sample_offset, int whence)
samples = sample_offset;
min = AU_HEADER_SIZE;
cur = lseek(fs->fd, 0, SEEK_CUR);
max = lseek(fs->fd, 0, SEEK_END);
cur = ftell(fs->f);
fseek(fs->f, 0, SEEK_END);
max = ftell(fs->f);
if (whence == SEEK_SET)
offset = samples + min;
else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
@@ -329,21 +332,21 @@ static int au_seek(struct ast_filestream *fs, long sample_offset, int whence)
}
/* always protect the header space. */
offset = (offset < min) ? min : offset;
return lseek(fs->fd, offset, SEEK_SET);
return fseek(fs->f, offset, SEEK_SET);
}
static int au_trunc(struct ast_filestream *fs)
{
if(ftruncate(fs->fd, lseek(fs->fd, 0, SEEK_CUR)))
if (ftruncate(fileno(fs->f), ftell(fs->f)))
return -1;
return update_header(fs->fd);
return update_header(fs->f);
}
static long au_tell(struct ast_filestream *fs)
{
off_t offset;
offset = lseek(fs->fd, 0, SEEK_CUR);
offset = ftell(fs->f);
return offset - AU_HEADER_SIZE;
}