[svn-commits] file: branch 1.6.0 r110021 - in /branches/1.6.0: ./ main/rtp.c

[SVN commits to the Digium repositories]

Author: file
Date: Wed Mar 19 13:26:24 2008
New Revision: 110021

URL: http://svn.digium.com/view/asterisk?view=rev&rev=110021
Log:
Merged revisions 110020 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r110020 | file | 2008-03-19 15:25:33 -0300 (Wed, 19 Mar 2008) | 14 lines

Merged revisions 110019 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r110019 | file | 2008-03-19 15:20:28 -0300 (Wed, 19 Mar 2008) | 6 lines

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.6.0/   (props changed)
    branches/1.6.0/main/rtp.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/rtp.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/rtp.c?view=diff&rev=110021&r1=110020&r2=110021
==============================================================================
--- branches/1.6.0/main/rtp.c (original)
+++ branches/1.6.0/main/rtp.c Wed Mar 19 13:26:24 2008
@@ -3004,7 +3004,7 @@
 
 	ms = calc_txstamp(rtp, &f->delivery);
 	/* Default prediction */
-	if (f->subclass & AST_FORMAT_AUDIO_MASK) {
+	if (f->frametype == AST_FRAME_VOICE) {
 		pred = rtp->lastts + f->samples;
 
 		/* Re-calculate last TS */
@@ -3019,7 +3019,7 @@
 				mark = 1;
 			}
 		}
-	} else if(f->subclass & AST_FORMAT_VIDEO_MASK) {
+	} else if (f->frametype == AST_FRAME_VIDEO) {
 		mark = f->subclass & 0x1;
 		pred = rtp->lastovidtimestamp + f->samples;
 		/* Re-calculate last TS */