kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 19:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 110019 via svnmerge from

Browse Source 
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
This commit is contained in:
Joshua Colp
2008-03-19 18:25:33 +00:00
parent 10020f41fb
commit 3e439e9616
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/rtp.c
View File

@@ -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 */