Miscellaneous fix (#3750)

* Fix various compile warnings (on MSVC2005 and Android) * A function declaration without a prototype is deprecated in all versions of C * Fix build warning on VS2022 * Minor update on sample app pjsua2 for Android Kotlin: add param to avoid activity recreation in activity config changes, useful in maintaining video window sizes on orientation change. --------- Co-authored-by: sauwming <[email protected]> Co-authored-by: Riza Sulistyo <[email protected]>
pjsip · Nov 1, 2023 · e4bcc71 · e4bcc71
1 parent 33f64ba
commit e4bcc71
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 4 deletions.
diff --git a/pjmedia/src/pjmedia-codec/and_vid_mediacodec.cpp b/pjmedia/src/pjmedia-codec/and_vid_mediacodec.cpp
@@ -1745,6 +1745,8 @@ static pj_status_t decode_h264(pjmedia_vid_codec *codec,
         buf_pos += frm_size;
     }
 
+    PJ_UNUSED_ARG(frm_cnt);
+
     return PJ_SUCCESS;
 }
 

diff --git a/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj b/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj
@@ -420,7 +420,7 @@
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = NO;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -473,7 +473,7 @@
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = NO;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

diff --git a/pjsip-apps/src/samples/pjsua2_demo.cpp b/pjsip-apps/src/samples/pjsua2_demo.cpp
@@ -61,6 +61,7 @@ class MyAudioMediaPort: public AudioMediaPort
 
     virtual void onFrameReceived(MediaFrame &frame)
     {
+        PJ_UNUSED_ARG(frame);
         // Process the incoming frame here
     }
 };

diff --git a/pjsip-apps/src/swig/java/android/app-kotlin/src/main/AndroidManifest.xml b/pjsip-apps/src/swig/java/android/app-kotlin/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Android">
         <activity android:name=".MainActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/pjsip/include/pjsua2/call.hpp b/pjsip/include/pjsua2/call.hpp
@@ -678,6 +678,8 @@ struct StreamInfo
       dir(PJMEDIA_DIR_NONE),
       txPt(0),
       rxPt(0),
+      audTxEventPt(0),
+      audRxEventPt(0),
       codecClockRate(0),
       jbInit(-1),
       jbMinPre(-1),

diff --git a/pjsip/src/pjsua-lib/pjsua_acc.c b/pjsip/src/pjsua-lib/pjsua_acc.c
@@ -3449,7 +3449,7 @@ pj_status_t pjsua_acc_get_uac_addr(pjsua_acc_id acc_id,
 
     /* If the URI uses sips scheme, make sure we use secure transport. */
     if (PJSIP_URI_SCHEME_IS_SIPS(sip_uri)) {
-        unsigned flag, tp_flag;
+        unsigned tp_flag;
 
         tp_flag = PJSIP_TRANSPORT_SECURE;
         flag  = pjsip_transport_get_flag_from_type(tp_type);
@@ -3869,7 +3869,7 @@ PJ_DEF(pj_status_t) pjsua_acc_create_uas_contact( pj_pool_t *pool,
 
     /* If the URI uses sips scheme, make sure we use secure transport. */
     if (PJSIP_URI_SCHEME_IS_SIPS(sip_uri)) {
-        unsigned flag, tp_flag;
+        unsigned tp_flag;
 
         tp_flag = PJSIP_TRANSPORT_SECURE;
         flag  = pjsip_transport_get_flag_from_type(tp_type);

diff --git a/third_party/build/srtp/srtp_config.h b/third_party/build/srtp/srtp_config.h
@@ -151,6 +151,7 @@
 #   pragma warning(disable:4701) // potentially uninitialized local variable used
 #   pragma warning(disable:4702) // unreachable code
 #   pragma warning(disable:4703) // potentially uninitialized local pointer variable used
+#   pragma warning(disable:4204) // nonstandard extension used : non-constant aggregate initializer
 #endif
 
 /* clock()  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -1745,6 +1745,8 @@ static pj_status_t decode_h264(pjmedia_vid_codec *codec, @@
             buf_pos += frm_size;
         }
+        PJ_UNUSED_ARG(frm_cnt);
         return PJ_SUCCESS;
     }
@@ Expand Down @@