Changeset 5123 for pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp

Timestamp:

Jul 1, 2015 2:20:12 AM (9 years ago)

Author:

riza

Message:

Re #1863: Initial implementation of PJSUA2 Video Codec API and Video Device API.

• Codec management (enum codec, set prio, get param, set param)
• Device management (enum dev, dev count, dev info).

File:

• pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp (modified) (4 diffs)

pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp

@@ -388 +388 @@
     }
 
-    clearCodecInfoList();
+    clearCodecInfoList(codecInfoList);
+    clearCodecInfoList(videoCodecInfoList);
 
     try {
@@ -1619 +1620 @@
 }
 
+VidDevManager &Endpoint::vidDevManager()
+{
+    return videoDevMgr;
+}
+
 /*
  * Codec operations.
@@ -1629 +1635 @@
     PJSUA2_CHECK_EXPR( pjsua_enum_codecs(pj_codec, &count) );
 
+    updateCodecInfoList(pj_codec, count, codecInfoList);
+    return codecInfoList;
+}
+
+void Endpoint::codecSetPriority(const string &codec_id,
+                                pj_uint8_t priority) throw(Error)
+{
+    pj_str_t codec_str = str2Pj(codec_id);
+    PJSUA2_CHECK_EXPR( pjsua_codec_set_priority(&codec_str, priority) );
+}
+
+CodecParam Endpoint::codecGetParam(const string &codec_id) const throw(Error)
+{
+    pjmedia_codec_param *pj_param = NULL;
+    pj_str_t codec_str = str2Pj(codec_id);
+
+    PJSUA2_CHECK_EXPR( pjsua_codec_get_param(&codec_str, pj_param) );
+
+    return pj_param;
+}
+
+void Endpoint::codecSetParam(const string &codec_id,
+                             const CodecParam param) throw(Error)
+{
+    pj_str_t codec_str = str2Pj(codec_id);
+    pjmedia_codec_param *pj_param = (pjmedia_codec_param*)param;
+
+    PJSUA2_CHECK_EXPR( pjsua_codec_set_param(&codec_str, pj_param) );
+}
+
+void Endpoint::clearCodecInfoList(CodecInfoVector &codec_list)
+{
+    for (unsigned i=0;i<codec_list.size();++i) {
+        delete codec_list[i];
+    }
+    codec_list.clear();
+}
+
+void Endpoint::updateCodecInfoList(pjsua_codec_info pj_codec[], unsigned count,
+                                   CodecInfoVector &codec_list)
+{
     pj_enter_critical_section();
-    clearCodecInfoList();
-    for (unsigned i=0; i<count; ++i) {
+    clearCodecInfoList(codec_list);
+    for (unsigned i = 0; i<count; ++i) {
         CodecInfo *codec_info = new CodecInfo;
 
@@ -1638 +1685 @@
     }
     pj_leave_critical_section();
+}
+
+const CodecInfoVector &Endpoint::videoCodecEnum() throw(Error)
+{
+#if PJSUA_HAS_VIDEO
+    pjsua_codec_info pj_codec[MAX_CODEC_NUM];
+    unsigned count = MAX_CODEC_NUM;
+
+    PJSUA2_CHECK_EXPR(pjsua_vid_enum_codecs(pj_codec, &count));
+
+    updateCodecInfoList(pj_codec, count, videoCodecInfoList);
+#endif
     return codecInfoList;
 }
 
-void Endpoint::codecSetPriority(const string &codec_id,
-                                pj_uint8_t priority) throw(Error)
-{
+void Endpoint::videoCodecSetPriority(const string &codec_id,
+                                     pj_uint8_t priority) throw(Error)
+{
+#if PJSUA_HAS_VIDEO
     pj_str_t codec_str = str2Pj(codec_id);
-    PJSUA2_CHECK_EXPR( pjsua_codec_set_priority(&codec_str, priority) );
-}
-
-CodecParam Endpoint::codecGetParam(const string &codec_id) const throw(Error)
-{
-    pjmedia_codec_param *pj_param = NULL;
+    PJSUA2_CHECK_EXPR(pjsua_vid_codec_set_priority(&codec_str, priority));
+#endif
+}
+
+CodecParam Endpoint::videoCodecGetParam(const string &codec_id) const
+           throw(Error)
+{
+    pjmedia_vid_codec_param *pj_param = NULL;
+#if PJSUA_HAS_VIDEO
     pj_str_t codec_str = str2Pj(codec_id);
 
-    PJSUA2_CHECK_EXPR( pjsua_codec_get_param(&codec_str, pj_param) );
-
+    PJSUA2_CHECK_EXPR(pjsua_vid_codec_get_param(&codec_str, pj_param));
+#endif
     return pj_param;
 }
 
-void Endpoint::codecSetParam(const string &codec_id,
-                             const CodecParam param) throw(Error)
-{
+void Endpoint::videoCodecSetParam(const string &codec_id,
+                                  const CodecParam param) throw(Error)
+{
+#if PJSUA_HAS_VIDEO
     pj_str_t codec_str = str2Pj(codec_id);
-    pjmedia_codec_param *pj_param = (pjmedia_codec_param*)param;
-
-    PJSUA2_CHECK_EXPR( pjsua_codec_set_param(&codec_str, pj_param) );
-}
-
-void Endpoint::clearCodecInfoList()
-{
-    for (unsigned i=0;i<codecInfoList.size();++i) {
-        delete codecInfoList[i];
-    }
-    codecInfoList.clear();
-}
+    pjmedia_vid_codec_param *pj_param = (pjmedia_vid_codec_param*)param;
+
+    PJSUA2_CHECK_EXPR(pjsua_vid_codec_set_param(&codec_str, pj_param));
+#endif
+}
+