summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2014-04-14 08:14:11 +0000
committerBenny Prijono <bennylp@teluu.com>2014-04-14 08:14:11 +0000
commitd92ae21ccb7898aceeec8f5e01925ebea6a2e903 (patch)
treebc4d321b2b9314d26b26e40e73f88a4521f98c14
parent0aa83d8efcf477675669569b037f291464c4f146 (diff)
Misc (re #1751): do not update RTCP TX statistic if sending RTP in stream (audio and video) fails
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4816 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjmedia/src/pjmedia/stream.c1
-rw-r--r--pjmedia/src/pjmedia/vid_stream.c8
2 files changed, 7 insertions, 2 deletions
diff --git a/pjmedia/src/pjmedia/stream.c b/pjmedia/src/pjmedia/stream.c
index c8eb9c29..a5202827 100644
--- a/pjmedia/src/pjmedia/stream.c
+++ b/pjmedia/src/pjmedia/stream.c
@@ -1389,6 +1389,7 @@ static pj_status_t put_frame_imp( pjmedia_port *port,
if (status != PJ_SUCCESS) {
PJ_PERROR(4,(stream->port.info.name.ptr, status,
"Error sending RTP"));
+ return PJ_SUCCESS;
}
/* Update stat */
diff --git a/pjmedia/src/pjmedia/vid_stream.c b/pjmedia/src/pjmedia/vid_stream.c
index c67f657d..714ae13d 100644
--- a/pjmedia/src/pjmedia/vid_stream.c
+++ b/pjmedia/src/pjmedia/vid_stream.c
@@ -987,8 +987,12 @@ static pj_status_t put_frame(pjmedia_port *port,
}
/* Update stat */
- stream->rtcp.stat.rtp_tx_last_ts = pj_ntohl(stream->enc->rtp.out_hdr.ts);
- stream->rtcp.stat.rtp_tx_last_seq = pj_ntohs(stream->enc->rtp.out_hdr.seq);
+ if (pkt_cnt) {
+ stream->rtcp.stat.rtp_tx_last_ts =
+ pj_ntohl(stream->enc->rtp.out_hdr.ts);
+ stream->rtcp.stat.rtp_tx_last_seq =
+ pj_ntohs(stream->enc->rtp.out_hdr.seq);
+ }
#if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0
/* Update timestamp of last sending packet. */