diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-19 18:26:24 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-19 18:26:24 +0000 |
| commit | a133f75721895e36a5069586f22d1b4bf906f7b5 (patch) | |
| tree | 1b68c59a8f797880283494ff4d6c3ed3260d4b7c /main | |
| parent | 9a1b3adca4f2d6d4cc59b9cad31e4423b1b6bf02 (diff) | |
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)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@110021 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/rtp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/rtp.c b/main/rtp.c index 4fcf747da..1647074de 100644 --- 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 */ |