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

look for transcoder in proper place based on build against Zaptel or DAHDI

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@138663 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-08-18 16:57:27 +00:00
parent 7db192138f
commit 5a0918d421
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
codecs/codec_dahdi.c
View File

@@ -139,7 +139,7 @@ static int zap_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
/* Give the frame to the hardware transcoder... */
res = write(ztp->fd, f->data, f->datalen);
if (-1 == res) {
ast_log(LOG_ERROR, "Failed to write to /dev/dahdi/transcode: %s\n", strerror(errno));
ast_log(LOG_ERROR, "Failed to write to transcoder: %s\n", strerror(errno));
}
if (f->datalen != res) {
ast_log(LOG_ERROR, "Requested write of %d bytes, but only wrote %d bytes.\n", f->datalen, res);
@@ -168,7 +168,7 @@ static struct ast_frame *zap_frameout(struct ast_trans_pvt *pvt)
/* Nothing waiting... */
return NULL;
} else {
ast_log(LOG_ERROR, "Failed to read from /dev/dahdi/transcode: %s\n", strerror(errno));
ast_log(LOG_ERROR, "Failed to read from transcoder: %s\n", strerror(errno));
return NULL;
}
} else {
@@ -234,10 +234,17 @@ static int zap_translate(struct ast_trans_pvt *pvt, int dest, int source)
struct pvt *ztp = pvt->pvt;
int flags;
#ifdef HAVE_ZAPTEL
if ((fd = open("/dev/zap/transcode", O_RDWR)) < 0) {
ast_log(LOG_ERROR, "Failed to open /dev/zap/transcode: %s\n", strerror(errno));
return -1;
}
#else
if ((fd = open("/dev/dahdi/transcode", O_RDWR)) < 0) {
ast_log(LOG_ERROR, "Failed to open /dev/dahdi/transcode: %s\n", strerror(errno));
return -1;
}
#endif
ztp->fmts.srcfmt = (1 << source);
ztp->fmts.dstfmt = (1 << dest);
@@ -405,10 +412,17 @@ static int find_transcoders(void)
int fd, res;
unsigned int x, y;
#ifdef HAVE_ZAPTEL
if ((fd = open("/dev/zap/transcode", O_RDWR)) < 0) {
ast_log(LOG_ERROR, "Failed to open /dev/zap/transcode: %s\n", strerror(errno));
return 0;
}
#else
if ((fd = open("/dev/dahdi/transcode", O_RDWR)) < 0) {
ast_log(LOG_ERROR, "Failed to open /dev/dahdi/transcode: %s\n", strerror(errno));
return 0;
}
#endif
for (info.tcnum = 0; !(res = ioctl(fd, DAHDI_TC_GETINFO, &info)); info.tcnum++) {
if (option_verbose > 1)