[asterisk-commits] branch group/rtpjitterbuffer r29694 - /team/group/rtpjitterbuffer/abstract_jb.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue May 23 10:27:14 2006
New Revision: 29694

URL: http://svn.digium.com/view/asterisk?rev=29694&view=rev
Log:
remove unnecessary braces and trailing whitespace

Modified:
    team/group/rtpjitterbuffer/abstract_jb.c

Modified: team/group/rtpjitterbuffer/abstract_jb.c
URL: http://svn.digium.com/view/asterisk/team/group/rtpjitterbuffer/abstract_jb.c?rev=29694&r1=29693&r2=29694&view=diff
==============================================================================
--- team/group/rtpjitterbuffer/abstract_jb.c (original)
+++ team/group/rtpjitterbuffer/abstract_jb.c Tue May 23 10:27:14 2006
@@ -308,10 +308,9 @@
 	struct ast_frame *frr;
 	long now = 0;
 	
-	if (!ast_test_flag(jb, JB_USE)) {
+	if (!ast_test_flag(jb, JB_USE))
 		return -1;
-	}
-	
+
 	if (f->frametype != AST_FRAME_VOICE) {
 		if (f->frametype == AST_FRAME_DTMF && ast_test_flag(jb, JB_CREATED)) {
 			jb_framelog("JB_PUT {now=%ld}: Received DTMF frame. Force resynching jb...\n", now);
@@ -320,24 +319,24 @@
 		
 		return -1;
 	}
-	
+
 	/* We consider an enabled jitterbuffer should receive frames with valid timing info. */
 	if (!f->has_timing_info || f->len < 2 || f->ts < 0) {
 		ast_log(LOG_WARNING, "Recieved frame with invalid timing info: "
 			"has_timing_info=%d, len=%ld, ts=%ld\n", f->has_timing_info, f->len, f->ts);
 		return -1;
 	}
-	
-	if (f->mallocd & AST_MALLOCD_HDR) {
+
+	if (f->mallocd & AST_MALLOCD_HDR)
 		frr = ast_frdup(f);
-	} else {
+	else
 		frr = ast_frisolate(f);
-	}
+
 	if (!frr) {
 		ast_log(LOG_ERROR, "Failed to isolate frame for the jitterbuffer on channel '%s'\n", chan->name);
 		return -1;
 	}
-	
+
 	if (!ast_test_flag(jb, JB_CREATED)) {
 		if (create_jb(chan, frr)) {
 			ast_frfree(frr);
@@ -345,7 +344,7 @@
 			ast_clear_flag(jb, JB_USE);
 			return -1;
 		}
-		
+
 		ast_set_flag(jb, JB_CREATED);
 		return 0;
 	} else {
@@ -358,11 +357,11 @@
 			   be delivered at all */
 			return 0;
 		}
-		
+
 		jb->next = jbimpl->next(jbobj);
-		
+
 		jb_framelog("JB_PUT {now=%ld}: Queued frame with ts=%ld and len=%ld\n", now, frr->ts, frr->len);
-		
+
 		return 0;
 	}
 }