IPTV: RTP - add pkt_cb to iptv_rtp_read() - for RTCP

tvheadend · May 28, 2015 · e808234 · e808234
1 parent 779874c
commit e808234
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/input/mpegts/iptv/iptv_private.h b/src/input/mpegts/iptv/iptv_private.h
@@ -128,7 +128,8 @@ void iptv_udp_init     ( void );
 void iptv_rtsp_init    ( void );
 void iptv_pipe_init    ( void );
 
-ssize_t iptv_rtp_read ( iptv_mux_t *im, udp_multirecv_t *um );
+ssize_t iptv_rtp_read ( iptv_mux_t *im, udp_multirecv_t *um,
+                        void (*pkt_cb)(iptv_mux_t *im, uint8_t *buf, int len) );
 
 #endif /* __IPTV_PRIVATE_H__ */
 

diff --git a/src/input/mpegts/iptv/iptv_rtsp.c b/src/input/mpegts/iptv/iptv_rtsp.c
@@ -224,7 +224,7 @@ iptv_rtsp_read ( iptv_mux_t *im )
     r = recv(im->mm_iptv_fd2, buf, sizeof(buf), MSG_DONTWAIT);
   } while (r > 0);
 
-  r = iptv_rtp_read(im, um);
+  r = iptv_rtp_read(im, um, NULL);
   if (r < 0 && ERRNO_AGAIN(errno))
     r = 0;
   return r;

diff --git a/src/input/mpegts/iptv/iptv_udp.c b/src/input/mpegts/iptv/iptv_udp.c
@@ -93,7 +93,8 @@ iptv_udp_read ( iptv_mux_t *im )
 }
 
 ssize_t
-iptv_rtp_read ( iptv_mux_t *im, udp_multirecv_t *um )
+iptv_rtp_read ( iptv_mux_t *im, udp_multirecv_t *um,
+                void (*pkt_cb)(iptv_mux_t *im, uint8_t *pkt, int len) )
 {
   ssize_t len, hlen;
   uint8_t *rtp;
@@ -115,6 +116,9 @@ iptv_rtp_read ( iptv_mux_t *im, udp_multirecv_t *um )
     if (len < 12)
       continue;
 
+    if (pkt_cb)
+      pkt_cb(im, rtp, len);
+
     /* Version 2 */
     if ((rtp[0] & 0xC0) != 0x80)
       continue;
@@ -149,7 +153,7 @@ iptv_udp_rtp_read ( iptv_mux_t *im )
 {
   udp_multirecv_t *um = im->im_data;
 
-  return iptv_rtp_read(im, um);
+  return iptv_rtp_read(im, um, NULL);
 }
 
 /*