Audio and video stream refactoring

pjsip · Feb 11, 2025 · 9366f64 · 9366f64
1 parent 4ded10f
commit 9366f64
Show file tree

Hide file tree

Showing 10 changed files with 2,427 additions and 3,093 deletions.
diff --git a/pjmedia/include/pjmedia/stream.h b/pjmedia/include/pjmedia/stream.h
@@ -78,79 +78,20 @@ PJ_BEGIN_DECL
  */
 
 /**
- * Opaque declaration for media channel.
- * Media channel is unidirectional flow of media from sender to
- * receiver.
- */
-typedef struct pjmedia_channel pjmedia_channel;
-
-/**
- * This structure describes media stream information. Each media stream
+ * This structure describes audio stream information. Each audio stream
  * corresponds to one "m=" line in SDP session descriptor, and it has
  * its own RTP/RTCP socket pair.
  */
 typedef struct pjmedia_stream_info
 {
-    pjmedia_type        type;       /**< Media type (audio, video)          */
-    pjmedia_tp_proto    proto;      /**< Transport protocol (RTP/AVP, etc.) */
-    pjmedia_dir         dir;        /**< Media direction.                   */
-    pj_sockaddr         local_addr; /**< Local RTP address                  */
-    pj_sockaddr         rem_addr;   /**< Remote RTP address                 */
-    pj_sockaddr         rem_rtcp;   /**< Optional remote RTCP address. If
-                                         sin_family is zero, the RTP address
-                                         will be calculated from RTP.       */
-    pj_bool_t           rtcp_mux;   /**< Use RTP and RTCP multiplexing.     */
-#if defined(PJMEDIA_HAS_RTCP_XR) && (PJMEDIA_HAS_RTCP_XR != 0)
-    pj_bool_t           rtcp_xr_enabled;
-                                    /**< Specify whether RTCP XR is enabled.*/
-    pj_uint32_t         rtcp_xr_interval; /**< RTCP XR interval.            */
-    pj_sockaddr         rtcp_xr_dest;/**<Additional remote RTCP XR address.
-                                         This is useful for third-party (e.g:
-                                         network monitor) to monitor the 
-                                         stream. If sin_family is zero, 
-                                         this will be ignored.              */
-#endif
-    pjmedia_rtcp_fb_info loc_rtcp_fb; /**< Local RTCP-FB info.              */
-    pjmedia_rtcp_fb_info rem_rtcp_fb; /**< Remote RTCP-FB info.             */
+    PJ_DECL_STREAM_INFO_COMMON_MEMBER()
+
     pjmedia_codec_info  fmt;        /**< Incoming codec format info.        */
     pjmedia_codec_param *param;     /**< Optional codec param.              */
-    unsigned            tx_pt;      /**< Outgoing codec paylaod type.       */
-    unsigned            rx_pt;      /**< Incoming codec paylaod type.       */
+
     unsigned            tx_maxptime;/**< Outgoing codec max ptime.          */
     int                 tx_event_pt;/**< Outgoing pt for telephone-events.  */
     int                 rx_event_pt;/**< Incoming pt for telephone-events.  */
-    pj_uint32_t         ssrc;       /**< RTP SSRC.                          */
-    pj_str_t            cname;      /**< RTCP CNAME.                        */
-    pj_bool_t           has_rem_ssrc;/**<Has remote RTP SSRC?               */
-    pj_uint32_t         rem_ssrc;   /**< Remote RTP SSRC.                   */
-    pj_str_t            rem_cname;  /**< Remote RTCP CNAME.                 */
-    pj_uint32_t         rtp_ts;     /**< Initial RTP timestamp.             */
-    pj_uint16_t         rtp_seq;    /**< Initial RTP sequence number.       */
-    pj_uint8_t          rtp_seq_ts_set;
-                                    /**< Bitmask flags if initial RTP sequence 
-                                         and/or timestamp for sender are set.
-                                         bit 0/LSB : sequence flag 
-                                         bit 1     : timestamp flag         */
-    int                 jb_init;    /**< Jitter buffer init delay in msec.  
-                                         (-1 for default).                  */
-    int                 jb_min_pre; /**< Jitter buffer minimum prefetch
-                                         delay in msec (-1 for default).    */
-    int                 jb_max_pre; /**< Jitter buffer maximum prefetch
-                                         delay in msec (-1 for default).    */
-    int                 jb_max;     /**< Jitter buffer max delay in msec.   */
-    pjmedia_jb_discard_algo jb_discard_algo;
-                                    /**< Jitter buffer discard algorithm.   */
-
-#if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0
-    pj_bool_t           use_ka;     /**< Stream keep-alive and NAT hole punch
-                                         (see #PJMEDIA_STREAM_ENABLE_KA)
-                                         is enabled?                        */
-    pjmedia_stream_ka_config ka_cfg;
-                                    /**< Stream send kep-alive settings.    */
-#endif
-    pj_bool_t           rtcp_sdes_bye_disabled; 
-                                    /**< Disable automatic sending of RTCP
-                                         SDES and BYE.                      */
 } pjmedia_stream_info;
 
 /**