kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

ensure that ulaw/alaw sound files are filled with silence when extended (not zeroes)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7800 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-01-04 23:27:57 +00:00
parent 229b778b0b
commit e234ad0011
2 changed files with 102 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
formats/format_pcm.c
View File

@@ -1,7 +1,7 @@
/*
* Asterisk -- An open source telephony toolkit.
*
* Copyright (C) 1999 - 2005, Digium, Inc.
* Copyright (C) 1999 - 2006, Digium, Inc.
*
* Mark Spencer <markster@digium.com>
*
@@ -44,6 +44,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/sched.h"
#include "asterisk/module.h"
#include "asterisk/endian.h"
#include "asterisk/ulaw.h"
#define BUF_SIZE 160 /* 160 samples */
@@ -67,6 +68,8 @@ static char *name = "pcm";
static char *desc = "Raw uLaw 8khz Audio support (PCM)";
static char *exts = "pcm|ulaw|ul|mu";
static char ulaw_silence[BUF_SIZE];
static struct ast_filestream *pcm_open(FILE *f)
{
/* We don't have any header to read or anything really, but
@@ -173,25 +176,45 @@ static int pcm_write(struct ast_filestream *fs, struct ast_frame *f)
static int pcm_seek(struct ast_filestream *fs, long sample_offset, int whence)
{
off_t offset=0,min,cur,max;
long cur, max, offset;
min = 0;
cur = ftell(fs->f);
fseek(fs->f, 0, SEEK_END);
max = ftell(fs->f);
if (whence == SEEK_SET)
max = fseek(fs->f, 0, SEEK_END);
switch (whence) {
case SEEK_SET:
offset = sample_offset;
else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
offset = sample_offset + cur;
else if (whence == SEEK_END)
break;
case SEEK_END:
offset = max - sample_offset;
if (whence != SEEK_FORCECUR) {
offset = (offset > max)?max:offset;
break;
case SEEK_CUR:
case SEEK_FORCECUR:
offset = cur + sample_offset;
break;
}
/* always protect against seeking past begining. */
offset = (offset < min)?min:offset;
switch (whence) {
case SEEK_FORCECUR:
if (offset > max) {
size_t left = offset - max;
size_t res;
while (left) {
res = fwrite(ulaw_silence, (left > BUF_SIZE) ? BUF_SIZE : left,
sizeof(ulaw_silence[0]), fs->f);
if (res == -1)
return res;
left -= res;
}
}
/* fall through */
default:
offset = (offset > max) ? max : offset;
offset = (offset < 0) ? 0 : offset;
return fseek(fs->f, offset, SEEK_SET);
}
}
static int pcm_trunc(struct ast_filestream *fs)
{
@@ -212,6 +235,11 @@ static char *pcm_getcomment(struct ast_filestream *s)
int load_module()
{
int index;
for (index = 0; index < (sizeof(ulaw_silence) / sizeof(ulaw_silence[0])); index++)
ulaw_silence[index] = AST_LIN2MU(0);
return ast_format_register(name, exts, AST_FORMAT_ULAW,
pcm_open,
pcm_rewrite,
@@ -222,8 +250,6 @@ int load_module()
pcm_read,
pcm_close,
pcm_getcomment);
}
int unload_module()

54
formats/format_pcm_alaw.c
View File

@@ -1,7 +1,7 @@
/*
* Asterisk -- An open source telephony toolkit.
*
* Copyright (C) 1999 - 2005, Digium, Inc.
* Copyright (C) 1999 - 2006, Digium, Inc.
*
* Mark Spencer <markster@digium.com>
*
@@ -45,6 +45,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/sched.h"
#include "asterisk/module.h"
#include "asterisk/endian.h"
#include "asterisk/alaw.h"
#define BUF_SIZE 160 /* 160 samples */
@@ -73,6 +74,8 @@ static char *name = "alaw";
static char *desc = "Raw aLaw 8khz PCM Audio support";
static char *exts = "alaw|al";
static char alaw_silence[BUF_SIZE];
#if 0
/* Returns time in msec since system boot. */
@@ -248,25 +251,45 @@ static int pcm_write(struct ast_filestream *fs, struct ast_frame *f)
static int pcm_seek(struct ast_filestream *fs, long sample_offset, int whence)
{
off_t offset=0,min,cur,max;
long cur, max, offset;
min = 0;
cur = ftell(fs->f);
fseek(fs->f, 0, SEEK_END);
max = ftell(fs->f);
if (whence == SEEK_SET)
max = fseek(fs->f, 0, SEEK_END);
switch (whence) {
case SEEK_SET:
offset = sample_offset;
else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
offset = sample_offset + cur;
else if (whence == SEEK_END)
break;
case SEEK_END:
offset = max - sample_offset;
if (whence != SEEK_FORCECUR) {
offset = (offset > max)?max:offset;
break;
case SEEK_CUR:
case SEEK_FORCECUR:
offset = cur + sample_offset;
break;
}
/* Always protect against seeking past begining */
offset = (offset < min)?min:offset;
switch (whence) {
case SEEK_FORCECUR:
if (offset > max) {
size_t left = offset - max;
size_t res;
while (left) {
res = fwrite(alaw_silence, (left > BUF_SIZE) ? BUF_SIZE : left,
sizeof(alaw_silence[0]), fs->f);
if (res == -1)
return res;
left -= res;
}
}
/* fall through */
default:
offset = (offset > max) ? max : offset;
offset = (offset < 0) ? 0 : offset;
return fseek(fs->f, offset, SEEK_SET);
}
}
static int pcm_trunc(struct ast_filestream *fs)
{
@@ -288,6 +311,11 @@ static char *pcm_getcomment(struct ast_filestream *s)
int load_module()
{
int index;
for (index = 0; index < (sizeof(alaw_silence) / sizeof(alaw_silence[0])); index++)
alaw_silence[index] = AST_LIN2A(0);
return ast_format_register(name, exts, AST_FORMAT_ALAW,
pcm_open,
pcm_rewrite,