summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun Ruffell <sruffell@digium.com>2011-10-12 16:32:54 +0000
committerShaun Ruffell <sruffell@digium.com>2011-10-12 16:32:54 +0000
commit1866beca0c0911cfd27a79e9aec5e87fb4aa4406 (patch)
tree890115e4355a40e67c65cdb195660739535bdda9
parent7dbe8c05fbcf4146343416e95c59fb60fc02ae59 (diff)
wctc4xxp: Allow G723 SID frames to pass to the hardware decoder.
The driver has, until now, dropped G723 SID frames even though the firmware on the TC400/TCE400 can handle them. Now let them on through. Reported-and-Tested-by: Angel Carhuas <acarhuas@colinanet.com> Signed-off-by: Shaun Ruffell <sruffell@digium.com> Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10218 git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@10223 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r--drivers/dahdi/wctc4xxp/base.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/dahdi/wctc4xxp/base.c b/drivers/dahdi/wctc4xxp/base.c
index 1a39a49..8b6340d 100644
--- a/drivers/dahdi/wctc4xxp/base.c
+++ b/drivers/dahdi/wctc4xxp/base.c
@@ -2158,12 +2158,13 @@ wctc4xxp_write(struct file *file, const char __user *frame,
}
if (DAHDI_FORMAT_G723_1 == dtc->srcfmt) {
- if ((G723_5K_BYTES != count) && (G723_6K_BYTES != count)) {
+ if ((G723_5K_BYTES != count) && (G723_6K_BYTES != count) &&
+ (G723_SID_BYTES != count)) {
DTE_DEBUG(DTE_DEBUG_GENERAL,
"Trying to transcode packet into G723 format " \
"that is %Zu bytes instead of the expected " \
- "%d/%d bytes.\n", count, G723_5K_BYTES,
- G723_6K_BYTES);
+ "%d/%d/%d bytes.\n", count, G723_5K_BYTES,
+ G723_6K_BYTES, G723_SID_BYTES);
return -EINVAL;
}
cpvt->timestamp += G723_SAMPLES;