[asterisk-commits] dvossel: branch dvossel/fixtheworld_phase1_step3 r302162 - in /team/dvossel/f...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Jan 17 14:46:48 CST 2011
Author: dvossel
Date: Mon Jan 17 14:46:43 2011
New Revision: 302162
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=302162
Log:
changes set_rtp_mark function to set_video_mark because that makes more sense
Modified:
team/dvossel/fixtheworld_phase1_step3/channels/chan_iax2.c
team/dvossel/fixtheworld_phase1_step3/formats/format_h263.c
team/dvossel/fixtheworld_phase1_step3/formats/format_h264.c
team/dvossel/fixtheworld_phase1_step3/include/asterisk/format.h
team/dvossel/fixtheworld_phase1_step3/main/format.c
team/dvossel/fixtheworld_phase1_step3/res/res_rtp_asterisk.c
Modified: team/dvossel/fixtheworld_phase1_step3/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step3/channels/chan_iax2.c?view=diff&rev=302162&r1=302161&r2=302162
==============================================================================
--- team/dvossel/fixtheworld_phase1_step3/channels/chan_iax2.c (original)
+++ team/dvossel/fixtheworld_phase1_step3/channels/chan_iax2.c Mon Jan 17 14:46:43 2011
@@ -6542,7 +6542,7 @@
if (fr->af.frametype == AST_FRAME_VIDEO) {
iax2_format tmpfmt = ast_format_to_old_bitfield(&fr->af.subclass.format);
- tmpfmt |= ast_format_get_rtp_mark(&fr->af.subclass.format) ? 0x1LL : 0;
+ tmpfmt |= ast_format_get_video_mark(&fr->af.subclass.format) ? 0x1LL : 0;
fh->csub = compress_subclass(tmpfmt | ((tmpfmt & 0x1LL) << 6));
} else if (fr->af.frametype == AST_FRAME_VOICE) {
fh->csub = compress_subclass(ast_format_to_old_bitfield(&fr->af.subclass.format));
@@ -6601,7 +6601,7 @@
vh = (struct ast_iax2_video_hdr *)(fr->af.data.ptr - sizeof(struct ast_iax2_video_hdr));
vh->zeros = 0;
vh->callno = htons(0x8000 | fr->callno);
- vh->ts = htons((fr->ts & 0x7FFF) | (ast_format_get_rtp_mark(&fr->af.subclass.format) ? 0x8000 : 0));
+ vh->ts = htons((fr->ts & 0x7FFF) | (ast_format_get_video_mark(&fr->af.subclass.format) ? 0x8000 : 0));
fr->datalen = fr->af.datalen + sizeof(struct ast_iax2_video_hdr);
fr->data = vh;
fr->retries = -1;
@@ -9987,7 +9987,7 @@
if (f.frametype == AST_FRAME_VIDEO) {
ast_format_from_old_bitfield(&f.subclass.format, (uncompress_subclass(fh->csub & ~0x40)));
if ((fh->csub >> 6) & 0x1) {
- ast_format_set_rtp_mark(&f.subclass.format);
+ ast_format_set_video_mark(&f.subclass.format);
}
} else if (f.frametype == AST_FRAME_VOICE) {
ast_format_from_old_bitfield(&f.subclass.format, uncompress_subclass(fh->csub));
@@ -11518,7 +11518,7 @@
f.frametype = AST_FRAME_VIDEO;
if (iaxs[fr->callno]->videoformat > 0) {
if (ntohs(vh->ts) & 0x8000LL) {
- ast_format_set_rtp_mark(&f.subclass.format);
+ ast_format_set_video_mark(&f.subclass.format);
}
ast_format_from_old_bitfield(&f.subclass.format, iaxs[fr->callno]->videoformat);
} else {
Modified: team/dvossel/fixtheworld_phase1_step3/formats/format_h263.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step3/formats/format_h263.c?view=diff&rev=302162&r1=302161&r2=302162
==============================================================================
--- team/dvossel/fixtheworld_phase1_step3/formats/format_h263.c (original)
+++ team/dvossel/fixtheworld_phase1_step3/formats/format_h263.c Mon Jan 17 14:46:43 2011
@@ -91,7 +91,7 @@
s->fr.samples = fs->lastts; /* XXX what ? */
s->fr.datalen = len;
if (mark) {
- ast_format_set_rtp_mark(&s->fr.subclass.format);
+ ast_format_set_video_mark(&s->fr.subclass.format);
}
s->fr.delivery.tv_sec = 0;
s->fr.delivery.tv_usec = 0;
@@ -113,7 +113,7 @@
ast_log(LOG_WARNING, "Asked to write non-video frame!\n");
return -1;
}
- mark = ast_format_get_rtp_mark(&f->subclass.format) ? 0x8000 : 0;
+ mark = ast_format_get_video_mark(&f->subclass.format) ? 0x8000 : 0;
if (f->subclass.format.id != AST_FORMAT_H263) {
ast_log(LOG_WARNING, "Asked to write non-h263 frame (%s)!\n", ast_getformatname(&f->subclass.format));
return -1;
Modified: team/dvossel/fixtheworld_phase1_step3/formats/format_h264.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step3/formats/format_h264.c?view=diff&rev=302162&r1=302161&r2=302162
==============================================================================
--- team/dvossel/fixtheworld_phase1_step3/formats/format_h264.c (original)
+++ team/dvossel/fixtheworld_phase1_step3/formats/format_h264.c Mon Jan 17 14:46:43 2011
@@ -83,7 +83,7 @@
s->fr.samples = fs->lastts;
s->fr.datalen = len;
if (mark) {
- ast_format_set_rtp_mark(&s->fr.subclass.format);
+ ast_format_set_video_mark(&s->fr.subclass.format);
}
s->fr.delivery.tv_sec = 0;
s->fr.delivery.tv_usec = 0;
@@ -106,7 +106,7 @@
ast_log(LOG_WARNING, "Asked to write non-video frame!\n");
return -1;
}
- mark = ast_format_get_rtp_mark(&f->subclass.format) ? 0x8000 : 0;
+ mark = ast_format_get_video_mark(&f->subclass.format) ? 0x8000 : 0;
if (f->subclass.format.id != AST_FORMAT_H264) {
ast_log(LOG_WARNING, "Asked to write non-h264 frame (%s)!\n", ast_getformatname(&f->subclass.format));
return -1;
Modified: team/dvossel/fixtheworld_phase1_step3/include/asterisk/format.h
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step3/include/asterisk/format.h?view=diff&rev=302162&r1=302161&r2=302162
==============================================================================
--- team/dvossel/fixtheworld_phase1_step3/include/asterisk/format.h (original)
+++ team/dvossel/fixtheworld_phase1_step3/include/asterisk/format.h Mon Jan 17 14:46:43 2011
@@ -223,7 +223,7 @@
* \brief Set the rtp mark value on the format to indicate to the interface
* writing this format's payload that a new RTP marker is necessary.
*/
-void ast_format_set_rtp_mark(struct ast_format *format);
+void ast_format_set_video_mark(struct ast_format *format);
/*!
* \brief Determine of the marker bit is set or not on this format.
@@ -231,7 +231,7 @@
* \retval 1, true
* \retval 0, false
*/
-int ast_format_get_rtp_mark(const struct ast_format *format);
+int ast_format_get_video_mark(const struct ast_format *format);
/*!
* \brief ast_format to old bitfield format represenatation
Modified: team/dvossel/fixtheworld_phase1_step3/main/format.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step3/main/format.c?view=diff&rev=302162&r1=302161&r2=302162
==============================================================================
--- team/dvossel/fixtheworld_phase1_step3/main/format.c (original)
+++ team/dvossel/fixtheworld_phase1_step3/main/format.c Mon Jan 17 14:46:43 2011
@@ -76,13 +76,13 @@
memcpy(dst, src, sizeof(struct ast_format));
}
-void ast_format_set_rtp_mark(struct ast_format *format)
+void ast_format_set_video_mark(struct ast_format *format)
{
format->fattr.rtp_marker_bit = 1;
}
-int ast_format_get_rtp_mark(const struct ast_format *format)
+int ast_format_get_video_mark(const struct ast_format *format)
{
return format->fattr.rtp_marker_bit;
}
Modified: team/dvossel/fixtheworld_phase1_step3/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/fixtheworld_phase1_step3/res/res_rtp_asterisk.c?view=diff&rev=302162&r1=302161&r2=302162
==============================================================================
--- team/dvossel/fixtheworld_phase1_step3/res/res_rtp_asterisk.c (original)
+++ team/dvossel/fixtheworld_phase1_step3/res/res_rtp_asterisk.c Mon Jan 17 14:46:43 2011
@@ -1063,7 +1063,7 @@
}
}
} else if (frame->frametype == AST_FRAME_VIDEO) {
- mark = ast_format_get_rtp_mark(&frame->subclass.format);
+ mark = ast_format_get_video_mark(&frame->subclass.format);
pred = rtp->lastovidtimestamp + frame->samples;
/* Re-calculate last TS */
rtp->lastts = rtp->lastts + ms * 90;
@@ -2309,7 +2309,7 @@
rtp->f.delivery.tv_sec = 0;
rtp->f.delivery.tv_usec = 0;
/* Pass the RTP marker bit as bit */
- ast_format_set_rtp_mark(&rtp->f.subclass.format);
+ ast_format_set_video_mark(&rtp->f.subclass.format);
} else {
/* TEXT -- samples is # of samples vs. 1000 */
if (!rtp->lastitexttimestamp)
More information about the asterisk-commits
mailing list