diff options
author | George Joseph <gjoseph@digium.com> | 2017-12-13 07:51:39 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-12-13 07:51:39 -0600 |
commit | e40bffd53bbd5f71ab9c7a616a889389c2f7cd80 (patch) | |
tree | f16f11e63bfa119ffda161b4fe6368aba40b4b1e | |
parent | 9b94e440aec9a163918c0e4731ed74c47205949c (diff) | |
parent | 5705e8ae0e05602d5399faa561c3119cfb83eca3 (diff) |
Merge "AST-2017-012: Place single RTCP report block at beginning of report." into 13
-rw-r--r-- | res/res_rtp_asterisk.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index c921f36b3..cf793a663 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -4742,7 +4742,6 @@ static struct ast_frame *ast_rtcp_interpret(struct ast_rtp_instance *instance, c unsigned int first_word; /*! True if we have seen an acceptable SSRC to learn the remote RTCP address */ unsigned int ssrc_seen; - int report_counter = 0; struct ast_rtp_rtcp_report_block *report_block; struct ast_frame *f = &ast_null_frame; @@ -4956,7 +4955,7 @@ static struct ast_frame *ast_rtcp_interpret(struct ast_rtp_instance *instance, c if (!report_block) { return &ast_null_frame; } - rtcp_report->report_block[report_counter] = report_block; + rtcp_report->report_block[0] = report_block; report_block->source_ssrc = ntohl(rtcpheader[i]); report_block->lost_count.packets = ntohl(rtcpheader[i + 1]) & 0x00ffffff; report_block->lost_count.fraction = ((ntohl(rtcpheader[i + 1]) & 0xff000000) >> 24); @@ -4993,7 +4992,6 @@ static struct ast_frame *ast_rtcp_interpret(struct ast_rtp_instance *instance, c ast_verbose(" DLSR: %4.4f (sec)\n",(double)report_block->dlsr / 65536.0); ast_verbose(" RTT: %4.4f(sec)\n", rtp->rtcp->rtt); } - report_counter++; } /* If and when we handle more than one report block, this should occur outside * this loop. |