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)

........

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

diff --git a/main/rtp.c b/main/rtp.c
index 4fcf747da9a8c00bf5d475110dd26655b9aa8143..1647074def007dee89f6a8dfbc1319f62654e6e9 100644 (file)
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -3004,7 +3004,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_AUDIO_MASK) {
+       if (f->frametype == AST_FRAME_VOICE) {
                pred = rtp->lastts + f->samples;
 
                /* Re-calculate last TS */
@@ -3019,7 +3019,7 @@ static int ast_rtp_raw_write(struct ast_rtp *rtp, struct ast_frame *f, int codec
                                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 */