Zap optimization

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@665 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 9139af0d7be2f53926b23d41ee4e2a597695b609..5a259a0163e96826051056bbe6a726bcf590f2a9 100755 (executable)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -935,33 +935,41 @@ int set_actual_gain(int fd, int chan, float rxgain, float txgain, int law)
        float lrxgain;
        int j,k;
        g.chan = chan;
-         /* caluculate linear value of tx gain */
-       ltxgain = pow(10.0,txgain / 20.0);
-         /* caluculate linear value of rx gain */
-       lrxgain = pow(10.0,rxgain / 20.0);
-       if (law == ZT_LAW_ALAW) {
-               for (j=0;j<256;j++) {
-                       k = (int)(((float)AST_ALAW(j)) * lrxgain);
-                       if (k > 32767) k = 32767;
-                       if (k < -32767) k = -32767;
-                       g.rxgain[j] = AST_LIN2A(k);
-                       k = (int)(((float)AST_ALAW(j)) * ltxgain);
-                       if (k > 32767) k = 32767;
-                       if (k < -32767) k = -32767;
-                       g.txgain[j] = AST_LIN2A(k);
+       if ((rxgain != 0.0)  || (txgain != 0.0)) {
+               /* caluculate linear value of tx gain */
+               ltxgain = pow(10.0,txgain / 20.0);
+               /* caluculate linear value of rx gain */
+               lrxgain = pow(10.0,rxgain / 20.0);
+               if (law == ZT_LAW_ALAW) {
+                       for (j=0;j<256;j++) {
+                               k = (int)(((float)AST_ALAW(j)) * lrxgain);
+                               if (k > 32767) k = 32767;
+                               if (k < -32767) k = -32767;
+                               g.rxgain[j] = AST_LIN2A(k);
+                               k = (int)(((float)AST_ALAW(j)) * ltxgain);
+                               if (k > 32767) k = 32767;
+                               if (k < -32767) k = -32767;
+                               g.txgain[j] = AST_LIN2A(k);
+                       }
+               } else {
+                       for (j=0;j<256;j++) {
+                               k = (int)(((float)AST_MULAW(j)) * lrxgain);
+                               if (k > 32767) k = 32767;
+                               if (k < -32767) k = -32767;
+                               g.rxgain[j] = AST_LIN2MU(k);
+                               k = (int)(((float)AST_MULAW(j)) * ltxgain);
+                               if (k > 32767) k = 32767;
+                               if (k < -32767) k = -32767;
+                               g.txgain[j] = AST_LIN2MU(k);
+                       }
                }
        } else {
                for (j=0;j<256;j++) {
-                       k = (int)(((float)AST_MULAW(j)) * lrxgain);
-                       if (k > 32767) k = 32767;
-                       if (k < -32767) k = -32767;
-                       g.rxgain[j] = AST_LIN2MU(k);
-                       k = (int)(((float)AST_MULAW(j)) * ltxgain);
-                       if (k > 32767) k = 32767;
-                       if (k < -32767) k = -32767;
-                       g.txgain[j] = AST_LIN2MU(k);
+                       g.rxgain[j] = j;
+                       g.txgain[j] = j;
                }
        }
+               
          /* set 'em */
        return(ioctl(fd,ZT_SETGAINS,&g));
 }