kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix synchronization of recorded files when using Monitor application

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1446 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Martin Pycko
2003-08-28 20:02:10 +00:00
parent 3ee27a8a89
commit f14004abfd
10 changed files with 92 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
formats/format_g729.c
View File

@@ -174,14 +174,16 @@ static int g729_seek(struct ast_filestream *fs, long sample_offset, int whence)
max = lseek(fs->fd, 0, SEEK_END);
bytes = 20 * (sample_offset / 160);
if(whence == SEEK_SET)
if (whence == SEEK_SET)
offset = bytes;
if(whence == SEEK_CUR)
else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
offset = cur + bytes;
if(whence == SEEK_END)
else if (whence == SEEK_END)
offset = max - bytes;
offset = (offset > max)?max:offset;
offset = (offset < min)?min:offset;
if (whence != SEEK_FORCECUR) {
offset = (offset > max)?max:offset;
offset = (offset < min)?min:offset;
}
if (lseek(fs->fd, offset, SEEK_SET) < 0)
return -1;
return 0;

10
formats/format_gsm.c
View File

@@ -185,12 +185,14 @@ static int gsm_seek(struct ast_filestream *fs, long sample_offset, int whence)
distance = (sample_offset/160) * 33;
if(whence == SEEK_SET)
offset = distance;
if(whence == SEEK_CUR)
else if(whence == SEEK_CUR || whence == SEEK_FORCECUR)
offset = distance + cur;
if(whence == SEEK_END)
else if(whence == SEEK_END)
offset = max - distance;
offset = (offset > max)?max:offset;
offset = (offset < min)?min:offset;
if (whence != SEEK_FORCECUR) {
offset = (offset > max)?max:offset;
offset = (offset < min)?min:offset;
}
return lseek(fs->fd, offset, SEEK_SET);
}

3
formats/format_mp3.c
View File

@@ -41,8 +41,9 @@ struct ast_filestream {
struct timeval last;
};
#if 0
static struct ast_filestream *glist = NULL;
#endif
static ast_mutex_t mp3_lock = AST_MUTEX_INITIALIZER;
static int glistcnt = 0;

12
formats/format_pcm.c
View File

@@ -163,14 +163,16 @@ static int pcm_seek(struct ast_filestream *fs, long sample_offset, int whence)
min = 0;
cur = lseek(fs->fd, 0, SEEK_CUR);
max = lseek(fs->fd, 0, SEEK_END);
if(whence == SEEK_SET)
if (whence == SEEK_SET)
offset = sample_offset;
if(whence == SEEK_CUR)
else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
offset = sample_offset + cur;
if(whence == SEEK_END)
else if (whence == SEEK_END)
offset = max - sample_offset;
offset = (offset > max)?max:offset;
offset = (offset < min)?min:offset;
if (whence != SEEK_FORCECUR) {
offset = (offset > max)?max:offset;
offset = (offset < min)?min:offset;
}
return lseek(fs->fd, offset, SEEK_SET);
}

12
formats/format_pcm_alaw.c
View File

@@ -242,14 +242,16 @@ static int pcm_seek(struct ast_filestream *fs, long sample_offset, int whence)
min = 0;
cur = lseek(fs->fd, 0, SEEK_CUR);
max = lseek(fs->fd, 0, SEEK_END);
if(whence == SEEK_SET)
if (whence == SEEK_SET)
offset = sample_offset;
if(whence == SEEK_CUR)
else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
offset = sample_offset + cur;
if(whence == SEEK_END)
else if (whence == SEEK_END)
offset = max - sample_offset;
offset = (offset > max)?max:offset;
offset = (offset < min)?min:offset;
if (whence != SEEK_FORCECUR) {
offset = (offset > max)?max:offset;
offset = (offset < min)?min:offset;
}
return lseek(fs->fd, offset, SEEK_SET);
}

14
formats/format_wav.c
View File

@@ -499,14 +499,16 @@ static int wav_seek(struct ast_filestream *fs, long sample_offset, int whence)
min = 44; /* wav header is 44 bytes */
cur = lseek(fs->fd, 0, SEEK_CUR);
max = lseek(fs->fd, 0, SEEK_END);
if(whence == SEEK_SET)
if (whence == SEEK_SET)
offset = samples + min;
if(whence == SEEK_CUR)
else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
offset = samples + cur;
if(whence == SEEK_END)
offset = max - samples;
offset = (offset > max)?max:offset;
offset = (offset < min)?min:offset;
else if (whence == SEEK_END)
offset = max - samples;
if (whence != SEEK_FORCECUR) {
offset = (offset > max)?max:offset;
offset = (offset < min)?min:offset;
}
return lseek(fs->fd,offset,SEEK_SET);
}

10
formats/format_wav_gsm.c
View File

@@ -478,12 +478,14 @@ static int wav_seek(struct ast_filestream *fs, long sample_offset, int whence)
distance = (sample_offset/320) * 65;
if(whence == SEEK_SET)
offset = distance + min;
if(whence == SEEK_CUR)
else if(whence == SEEK_CUR || whence == SEEK_FORCECUR)
offset = distance + cur;
if(whence == SEEK_END)
else if(whence == SEEK_END)
offset = max - distance;
offset = (offset < min)?min:offset;
offset = (offset > max)?max:offset;
if (whence != SEEK_FORCECUR) {
offset = (offset < min)?min:offset;
offset = (offset > max)?max:offset;
}
fs->secondhalf = 0;
return lseek(fs->fd, offset, SEEK_SET);
}