Clean up a few things in the last commit to the adaptive jitterbuffer code.

 - Specifically indicate to the compiler that the "dropem" variable only
   needs one but.
 - Change formatting to conform to coding guidelines.

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

diff --git a/include/jitterbuf.h b/include/jitterbuf.h
index 5694f7b6c3b4627048519efc7a88ff3435f66c03..dac903e83548dd94ae479821137896c7f6ae6a7a 100644 (file)
--- a/include/jitterbuf.h
+++ b/include/jitterbuf.h
@@ -103,8 +103,7 @@ typedef struct jitterbuf {
        long hist_maxbuf[JB_HISTORY_MAXBUF_SZ]; /* a sorted buffer of the max delays (highest first) */
        long hist_minbuf[JB_HISTORY_MAXBUF_SZ]; /* a sorted buffer of the min delays (lowest first) */
        int  hist_maxbuf_valid;                 /* are the "maxbuf"/minbuf valid? */
-       int  dropem;                            /* flag to indicate dropping frames (overload) */
-
+       unsigned int dropem:1;                  /* flag to indicate dropping frames (overload) */
 
        jb_frame *frames;               /* queued frames */
        jb_frame *free;                 /* free frames (avoid malloc?) */

diff --git a/main/jitterbuf.c b/main/jitterbuf.c
index f87e273b6726df4cd3f4588909d22227443c624c..2b081704abcad65019f8411912b63bb315eb6724 100644 (file)
--- a/main/jitterbuf.c
+++ b/main/jitterbuf.c
@@ -518,8 +518,9 @@ enum jb_return_code jb_put(jitterbuf *jb, void *data, const enum jb_frame_type t
 
        jb->info.frames_in++;
 
-        if (jb->frames && jb->dropem) return(JB_DROP);
-        jb->dropem = 0;
+       if (jb->frames && jb->dropem) 
+               return JB_DROP;
+       jb->dropem = 0;
 
        if (type == JB_TYPE_VOICE) {
                /* presently, I'm only adding VOICE frames to history and drift calculations; mostly because with the
@@ -527,15 +528,15 @@ enum jb_return_code jb_put(jitterbuf *jb, void *data, const enum jb_frame_type t
                if (history_put(jb,ts,now,ms))
                        return JB_DROP;
        }
-        numts = 0;
-        if (jb->frames) {
-                numts = jb->frames->prev->ts - jb->frames->ts;
-        }
-        if (numts >= jb->info.conf.max_jitterbuf) {
-                ast_log(LOG_NOTICE,"Attempting to exceed Jitterbuf max %ld timeslots\n",jb->info.conf.max_jitterbuf);
-                jb->dropem = 1;
-                return JB_DROP;
-        }
+       numts = 0;
+       if (jb->frames)
+               numts = jb->frames->prev->ts - jb->frames->ts;
+       if (numts >= jb->info.conf.max_jitterbuf) {
+               ast_log(LOG_DEBUG, "Attempting to exceed Jitterbuf max %ld timeslots\n",
+                       jb->info.conf.max_jitterbuf);
+               jb->dropem = 1;
+               return JB_DROP;
+       }
        /* if put into head of queue, caller needs to reschedule */
        if (queue_put(jb,data,type,ms,ts)) {
                return JB_SCHED;