Changeset 6157

Timestamp:

Feb 5, 2020 3:05:30 AM (5 years ago)

Author:

nanang

Message:

Misc (re #2210): Fixed various compile warnings on MSVC2005.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia-codec/openh264.cpp (modified) (1 diff)
• pjmedia/src/pjmedia/echo_speex.c (modified) (1 diff)
• pjmedia/src/pjmedia/vid_codec_util.c (modified) (1 diff)
• pjnath/src/pjnath/turn_session.c (modified) (1 diff)
• pjnath/src/pjnath/turn_sock.c (modified) (2 diffs)
• pjsip/src/pjsip-ua/sip_reg.c (modified) (1 diff)
• pjsip/src/pjsua2/media.cpp (modified) (1 diff)
• third_party/build/speex/config.h (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia-codec/openh264.cpp

@@ -169 +169 @@
 
 static void log_print(void* ctx, int level, const char* string) {
+    PJ_UNUSED_ARG(ctx);
     PJ_LOG(4,("[OPENH264_LOG]", "[L%d] %s", level, string));
 }

pjproject/trunk/pjmedia/src/pjmedia/echo_speex.c

@@ -60 +60 @@
 {
     speex_ec *echo;
-    int i, sampling_rate;
+    int sampling_rate;
+    unsigned i;
 
     *p_echo = NULL;

pjproject/trunk/pjmedia/src/pjmedia/vid_codec_util.c

@@ -787 +787 @@
         } else if (pj_stricmp(&fmtp->param[i].name, &PROFILE_ID) == 0) {
             tmp = pj_strtoul(&fmtp->param[i].val);
-            vpx_fmtp->profile_id = PJ_MAX(tmp, vpx_fmtp->profile_id);
+            vpx_fmtp->profile_id = (pj_uint8_t)
+                                   PJ_MAX(tmp, vpx_fmtp->profile_id);
         }
     }

pjproject/trunk/pjnath/src/pjnath/turn_session.c

@@ -1327 +1327 @@
 
     sess = (pj_turn_session*) pj_stun_session_get_user_data(stun);
-    if (*sess->cb.on_stun_send_pkt) {
+    if (sess->cb.on_stun_send_pkt) {
         return (*sess->cb.on_stun_send_pkt)(sess, (const pj_uint8_t*)pkt,
                                             (unsigned)pkt_size,

pjproject/trunk/pjnath/src/pjnath/turn_sock.c

@@ -889 +889 @@
                               pj_ssize_t sent)
 {
-    unsigned header_len, sent_size;
-
     /* Don't report to callback if this is internal message. */
     if (send_key == &turn_sock->int_send_key) {
@@ -897 +895 @@
 
     if (turn_sock->cb.on_data_sent) {
+        pj_ssize_t header_len, sent_size;
+
         /* Remove the length of packet header from sent size. */
         header_len = turn_sock->pkt_len - turn_sock->body_len;

pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

@@ -46 +46 @@
 #define REGC_TSX_TIMEOUT        33000
 
-enum { NOEXP = PJSIP_REGC_EXPIRATION_NOT_SPECIFIED };
+#define NOEXP                   PJSIP_REGC_EXPIRATION_NOT_SPECIFIED
 
 static const pj_str_t XUID_PARAM_NAME = { "x-uid", 5 };

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

@@ -1847 +1847 @@
     packet_loss = config.packet_loss;
     complexity = config.complexity;
-    cbr = config.cbr;
+    cbr = PJ2BOOL(config.cbr);
 }
 

pjproject/trunk/third_party/build/speex/config.h

@@ -29 +29 @@
 #   pragma warning(disable: 4456)   // declaration of '[var]' hides previous local declaration
 #   pragma warning(disable: 4267)   // conversion from 'size_t' to 'int', possible loss of data
+#   pragma warning(disable: 4706)   // assignment within conditional expression
 //#   pragma warning(disable: 4701)   // local variable used without initialized
 #endif