Changeset 215 for pjproject/trunk/pjmedia/include/pjmedia/stream.h

Timestamp:

Feb 22, 2006 12:06:39 PM (18 years ago)

Author:

bennylp

Message:

RFC 2833 support!

File:

• pjproject/trunk/pjmedia/include/pjmedia/stream.h (modified) (4 diffs)

pjproject/trunk/pjmedia/include/pjmedia/stream.h

@@ -72 +72 @@
     pj_sockaddr_in      rem_addr;   /**< Remote RTP address                 */
     pjmedia_codec_info  fmt;        /**< Codec format info.                 */
-    unsigned            tx_event_pt;/**< Outgoing pt for telephone-events.  */
-    unsigned            rx_event_pt;/**< Incoming pt for telephone-events.  */
+    int                 tx_event_pt;/**< Outgoing pt for telephone-events.  */
+    int                 rx_event_pt;/**< Incoming pt for telephone-events.  */
     pj_uint32_t         ssrc;       /**< RTP SSRC.                          */
     int                 jb_min;     /**< Jitter buffer min delay.           */
@@ -111 +111 @@
  *                      buffer needs to preallocate some storage.
  * @param info          Stream information.
+ * @param user_data     Arbitrary user data (for future callback feature).
  * @param p_stream      Pointer to receive the media stream.
  *
@@ -118 +119 @@
                                            pj_pool_t *pool,
                                            const pjmedia_stream_info *info,
+                                           void *user_data,
                                            pjmedia_stream **p_stream);
 
@@ -192 +194 @@
  *
  * @param stream        The media stream.
- * @param digit         A single digit ('0123456789*#ABCD').
+ * @param ascii_digit   String containing digits to be sent to remote.
+ *                      Currently the maximum number of digits are 32.
  *
  * @return              PJ_SUCCESS on success.
  */
 PJ_DECL(pj_status_t) pjmedia_stream_dial_dtmf(pjmedia_stream *stream,
-                                              const pj_str_t *digit_char);
-
+                                              const pj_str_t *ascii_digit);
+
+
+/**
+ * Check if the stream has incoming DTMF digits in the incoming DTMF
+ * queue. Incoming DTMF digits received via RFC 2833 mechanism are
+ * saved in the incoming digits queue.
+ *
+ * @param stream        The media stream.
+ *
+ * @return              Non-zero (PJ_TRUE) if the stream has received DTMF
+ *                      digits in the .
+ */
+PJ_DECL(pj_bool_t) pjmedia_stream_check_dtmf(pjmedia_stream *stream);
+
+
+/**
+ * Retrieve the incoming DTMF digits from the stream. Note that the digits
+ * buffer will not be NULL terminated.
+ *
+ * @param stream        The media stream.
+ * @param ascii_digits  Buffer to receive the digits. The length of this
+ *                      buffer is indicated in the "size" argument.
+ * @param size          On input, contains the maximum digits to be copied
+ *                      to the buffer.
+ *                      On output, it contains the actual digits that has
+ *                      been copied to the buffer.
+ *
+ * @return              Non-zero (PJ_TRUE) if the stream has received DTMF
+ *                      digits in the .
+ */
+PJ_DECL(pj_status_t) pjmedia_stream_get_dtmf( pjmedia_stream *stream,
+                                              char *ascii_digits,
+                                              unsigned *size);