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

Merge "format_pcm: Correct behavior of fseek and ftell for G.722" into 13

Browse Source
This commit is contained in:
Joshua Colp
2018-04-25 13:30:42 -05:00
committed by Gerrit Code Review
parent dec91abcae 7b05184bca
commit 8c5f4dade3
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
formats/format_pcm.c
View File

@@ -93,10 +93,7 @@ static struct ast_frame *pcm_read(struct ast_filestream *s, int *whennext)
return NULL; return NULL;
} }
s->fr.datalen = res; s->fr.datalen = res;
if (ast_format_cmp(s->fmt->format, ast_format_g722) == AST_FORMAT_CMP_EQUAL) *whennext = s->fr.samples = res;
*whennext = s->fr.samples = res * 2;
else
*whennext = s->fr.samples = res;
return &s->fr; return &s->fr;
} }
@@ -412,16 +409,11 @@ static int au_rewrite(struct ast_filestream *s, const char *comment)
static int au_seek(struct ast_filestream *fs, off_t sample_offset, int whence) static int au_seek(struct ast_filestream *fs, off_t sample_offset, int whence)
{ {
off_t min, max, cur; off_t min, max, cur;
long offset = 0, bytes; long offset = 0;
struct au_desc *desc = fs->_private; struct au_desc *desc = fs->_private;
min = desc->hdr_size; min = desc->hdr_size;
if (ast_format_cmp(fs->fmt->format, ast_format_g722) == AST_FORMAT_CMP_EQUAL)
bytes = sample_offset / 2;
else
bytes = sample_offset;
if ((cur = ftello(fs->f)) < 0) { if ((cur = ftello(fs->f)) < 0) {
ast_log(AST_LOG_WARNING, "Unable to determine current position in au filestream %p: %s\n", fs, strerror(errno)); ast_log(AST_LOG_WARNING, "Unable to determine current position in au filestream %p: %s\n", fs, strerror(errno));
return -1; return -1;
@@ -438,11 +430,11 @@ static int au_seek(struct ast_filestream *fs, off_t sample_offset, int whence)
} }
if (whence == SEEK_SET) if (whence == SEEK_SET)
offset = bytes + min; offset = sample_offset + min;
else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
offset = bytes + cur; offset = sample_offset + cur;
else if (whence == SEEK_END) else if (whence == SEEK_END)
offset = max - bytes; offset = max - sample_offset;
if (whence != SEEK_FORCECUR) { if (whence != SEEK_FORCECUR) {
offset = (offset > max) ? max : offset; offset = (offset > max) ? max : offset;
@@ -481,6 +473,23 @@ static off_t au_tell(struct ast_filestream *fs)
return offset - desc->hdr_size; return offset - desc->hdr_size;
} }
static struct ast_frame *g722_read(struct ast_filestream *s, int *whennext)
{
struct ast_frame *f = pcm_read(s, whennext);
*whennext = s->fr.samples = (*whennext * 2);
return f;
}
static int g722_seek(struct ast_filestream *fs, off_t sample_offset, int whence)
{
return pcm_seek(fs, sample_offset / 2, whence);
}
static off_t g722_tell(struct ast_filestream *fs)
{
return pcm_tell(fs) * 2;
}
static struct ast_format_def alaw_f = { static struct ast_format_def alaw_f = {
.name = "alaw", .name = "alaw",
.exts = "alaw|al|alw", .exts = "alaw|al|alw",
@@ -512,10 +521,10 @@ static struct ast_format_def g722_f = {
.name = "g722", .name = "g722",
.exts = "g722", .exts = "g722",
.write = pcm_write, .write = pcm_write,
.seek = pcm_seek, .seek = g722_seek,
.trunc = pcm_trunc, .trunc = pcm_trunc,
.tell = pcm_tell, .tell = g722_tell,
.read = pcm_read, .read = g722_read,
.buf_size = (BUF_SIZE * 2) + AST_FRIENDLY_OFFSET, .buf_size = (BUF_SIZE * 2) + AST_FRIENDLY_OFFSET,
}; };