Changeset 3786 for pjproject

Timestamp:

Oct 4, 2011 8:23:07 AM (13 years ago)

Author:

bennylp

Message:

Added pjsua_call_vid_stream_is_running() and pjmedia_vid_stream_is_running() API (closes #1379)

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/vid_stream.h (modified) (1 diff)
• pjmedia/src/pjmedia/vid_stream.c (modified) (1 diff)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_vid.c (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/vid_stream.h

@@ -288 +288 @@
 
 /**
+ * Query if the stream is started on the specified direction.
+ *
+ * @param stream        The video stream.
+ * @param dir           The direction to be checked.
+ *
+ * @return              PJ_TRUE if stream is started.
+ */
+PJ_DECL(pj_bool_t) pjmedia_vid_stream_is_running(pjmedia_vid_stream *stream,
+                                                 pjmedia_dir dir);
+
+/**
  * Pause the individual channel in the stream.
  *

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

@@ -1599 +1599 @@
 
 /*
+ * Check status.
+ */
+PJ_DEF(pj_bool_t) pjmedia_vid_stream_is_running(pjmedia_vid_stream *stream,
+                                                pjmedia_dir dir)
+{
+    pj_bool_t is_running = PJ_TRUE;
+
+    PJ_ASSERT_RETURN(stream, PJ_FALSE);
+
+    if (dir & PJMEDIA_DIR_ENCODING) {
+        is_running &= (stream->enc && !stream->enc->paused);
+    }
+
+    if (dir & PJMEDIA_DIR_DECODING) {
+        is_running &= (stream->dec && !stream->dec->paused);
+    }
+
+    return is_running;
+}
+
+/*
  * Pause stream.
  */

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -3941 +3941 @@
 
 /**
+ * Determine if video stream for the specified call is currently running
+ * (i.e. has been created, started, and not being paused) for the specified
+ *  direction.
+ *
+ * @param call_id       Call identification.
+ * @param med_idx       Media stream index, or -1 to specify default video
+ *                      media.
+ * @param dir           The direction to be checked.
+ *
+ * @return              PJ_TRUE if stream is currently running for the
+ *                      specified direction.
+ */
+PJ_DECL(pj_bool_t) pjsua_call_vid_stream_is_running(pjsua_call_id call_id,
+                                                    int med_idx,
+                                                    pjmedia_dir dir);
+
+/**
  * Add, remove, modify, and/or manipulate video media stream for the
  * specified call. This may trigger a re-INVITE or UPDATE to be sent

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c

@@ -2039 +2039 @@
 
 
+/*
+ * Determine if video stream for the specified call is currently running
+ * for the specified direction.
+ */
+PJ_DEF(pj_bool_t) pjsua_call_vid_stream_is_running( pjsua_call_id call_id,
+                                                    int med_idx,
+                                                    pjmedia_dir dir)
+{
+    pjsua_call *call;
+    pjsua_call_media *call_med;
+
+    PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
+                     PJ_EINVAL);
+
+    /* Verify and normalize media index */
+    if (med_idx == -1) {
+        med_idx = pjsua_call_get_vid_stream_idx(call_id);
+    }
+
+    call = &pjsua_var.calls[call_id];
+    PJ_ASSERT_RETURN(med_idx >= 0 && med_idx < call->med_cnt, PJ_EINVAL);
+
+    call_med = &call->media[med_idx];
+
+    /* Verify if the stream is transmitting video */
+    if (call_med->type != PJMEDIA_TYPE_VIDEO || (call_med->dir & dir) == 0 ||
+        !call_med->strm.v.stream)
+    {
+        return PJ_FALSE;
+    }
+
+    return pjmedia_vid_stream_is_running(call_med->strm.v.stream, dir);
+}
+
 #endif /* PJSUA_HAS_VIDEO */