Changeset 5968

Timestamp:

Apr 15, 2019 2:53:52 AM (6 years ago)

Author:

ming

Message:

Fixed #2188: RTCP RR not generated if stream's encoder channel is paused

Location:

pjproject/trunk/pjmedia/src/pjmedia

Files:

• stream.c (modified) (1 diff)
• vid_stream.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -2050 +2050 @@
 
     /* Check if now is the time to transmit RTCP SR/RR report.
-     * We only do this when stream direction is "decoding only",
+     * We only do this when stream direction is "decoding only" or
+     * if the encoder is paused,
      * because otherwise check_tx_rtcp() will be handled by put_frame()
      */
-    if (stream->dir == PJMEDIA_DIR_DECODING) {
+    if (stream->dir == PJMEDIA_DIR_DECODING || stream->enc->paused) {
         check_tx_rtcp(stream, pj_ntohl(hdr->ts));
     }

pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c

@@ -817 +817 @@
 
     /* Check if now is the time to transmit RTCP SR/RR report.
-     * We only do this when stream direction is "decoding only", 
+     * We only do this when stream direction is "decoding only" or
+     * if the encoder is paused,
      * because otherwise check_tx_rtcp() will be handled by put_frame()
      */
-    if (stream->dir == PJMEDIA_DIR_DECODING) {
+    if (stream->dir == PJMEDIA_DIR_DECODING || stream->enc->paused) {
         check_tx_rtcp(stream, pj_ntohl(hdr->ts));
     }