[asterisk-commits] file: branch 1.4 r110019 - /branches/1.4/main/rtp.c

[SVN commits to the Asterisk project]

Author: file
Date: Wed Mar 19 13:20:28 2008
New Revision: 110019

URL: http://svn.digium.com/view/asterisk?view=rev&rev=110019
Log:
Make sure that the mark bit does not incorrectly cause video frame timestamps to be calculated as if they are audio frames.
(closes issue #11429)
Reported by: sperreault
Patches:
      11429-frametype.diff uploaded by qwell (license 4)

Modified:
    branches/1.4/main/rtp.c

Modified: branches/1.4/main/rtp.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/rtp.c?view=diff&rev=110019&r1=110018&r2=110019
==============================================================================
--- branches/1.4/main/rtp.c (original)
+++ branches/1.4/main/rtp.c Wed Mar 19 13:20:28 2008
@@ -2620,7 +2620,7 @@
 
 	ms = calc_txstamp(rtp, &f->delivery);
 	/* Default prediction */
-	if (f->subclass < AST_FORMAT_MAX_AUDIO) {
+	if (f->frametype == AST_FRAME_VOICE) {
 		pred = rtp->lastts + f->samples;
 
 		/* Re-calculate last TS */
@@ -2636,7 +2636,7 @@
 				mark = 1;
 			}
 		}
-	} else {
+	} else if (f->frametype == AST_FRAME_VIDEO) {
 		mark = f->subclass & 0x1;
 		pred = rtp->lastovidtimestamp + f->samples;
 		/* Re-calculate last TS */