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

Timestamp:

Aug 21, 2015 6:00:46 AM (9 years ago)

Author:

riza

Message:

Re #1879:

• Implement set video codec param in PJSUA2 API
• Fix bug in videoCodecEnum and updateCodecInfoList

File:

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

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

@@ -1684 +1684 @@
 
         codec_info->fromPj(pj_codec[i]);
-        codecInfoList.push_back(codec_info);
+        codec_list.push_back(codec_info);
     }
     pj_leave_critical_section();
@@ -1699 +1699 @@
     updateCodecInfoList(pj_codec, count, videoCodecInfoList);
 #endif
-    return codecInfoList;
+    return videoCodecInfoList;
 }
 
@@ -1714 +1714 @@
 }
 
-CodecParam Endpoint::videoCodecGetParam(const string &codec_id) const
-           throw(Error)
-{
-    pjmedia_vid_codec_param *pj_param = NULL;
+VidCodecParam Endpoint::getVideoCodecParam(const string &codec_id) const 
+                                                                   throw(Error)
+{    
+    VidCodecParam codec_param;
 #if PJSUA_HAS_VIDEO
-    pj_str_t codec_str = str2Pj(codec_id);
-
-    PJSUA2_CHECK_EXPR(pjsua_vid_codec_get_param(&codec_str, pj_param));
+    pjmedia_vid_codec_param pj_param;
+    pj_str_t codec_str = str2Pj(codec_id);    
+
+    PJSUA2_CHECK_EXPR(pjsua_vid_codec_get_param(&codec_str, &pj_param));
+    codec_param.fromPj(pj_param);
 #else
     PJ_UNUSED_ARG(codec_id);
 #endif
-    return pj_param;
-}
-
-void Endpoint::videoCodecSetParam(const string &codec_id,
-                                  const CodecParam param) throw(Error)
+    return codec_param;
+}
+
+void Endpoint::setVideoCodecParam(const string &codec_id,
+                                  const VidCodecParam &param) throw(Error)
 {
 #if PJSUA_HAS_VIDEO
     pj_str_t codec_str = str2Pj(codec_id);
-    pjmedia_vid_codec_param *pj_param = (pjmedia_vid_codec_param*)param;
-
-    PJSUA2_CHECK_EXPR(pjsua_vid_codec_set_param(&codec_str, pj_param));
+    pjmedia_vid_codec_param pj_param = param.toPj();
+    
+    PJSUA2_CHECK_EXPR(pjsua_vid_codec_set_param(&codec_str, &pj_param));
 #else
     PJ_UNUSED_ARG(codec_id);
@@ -1742 +1744 @@
 }
 
+void Endpoint::resetVideoCodecParam(const string &codec_id) throw(Error)
+{
+#if PJSUA_HAS_VIDEO
+    pj_str_t codec_str = str2Pj(codec_id);    
+    
+    PJSUA2_CHECK_EXPR(pjsua_vid_codec_set_param(&codec_str, NULL));
+#else
+    PJ_UNUSED_ARG(codec_id);
+    PJ_UNUSED_ARG(param);
+#endif  
+}