From: Joshua Colp <jcolp@digium.com>
Date: Wed, 19 Mar 2008 18:20:28 +0000 (+0000)
Subject: Make sure that the mark bit does not incorrectly cause video frame timestamps to... 
X-Git-Tag: 1.4.19-rc4~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=996d3a1c2e584b5db17b6785b2651962e92b036d;p=thirdparty%2Fasterisk.git

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)


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

diff --git a/main/rtp.c b/main/rtp.c
index fc6f9a467e..6cb7fb6baf 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -2620,7 +2620,7 @@ static int ast_rtp_raw_write(struct ast_rtp *rtp, struct ast_frame *f, int codec
 
 	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 @@ static int ast_rtp_raw_write(struct ast_rtp *rtp, struct ast_frame *f, int codec
 				mark = 1;
 			}
 		}
-	} else {
+	} else if (f->frametype == AST_FRAME_VIDEO) {
 		mark = f->subclass & 0x1;
 		pred = rtp->lastovidtimestamp + f->samples;
 		/* Re-calculate last TS */