mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 04:11:08 +00:00
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
This commit is contained in:
@@ -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 */
|
||||
|
Reference in New Issue
Block a user