Changeset 5157

Timestamp:

Aug 10, 2015 9:11:39 AM (9 years ago)

Author:

nanang

Message:

Misc (re #1843): Fixed compile warnings of unused variable.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia-audiodev/android_jni_dev.c (modified) (1 diff)
• pjmedia/src/pjmedia-videodev/util.c (modified) (4 diffs)
• pjsip/src/pjsua2/media.cpp (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia-audiodev/android_jni_dev.c

@@ -299 +299 @@
         (*jni_env)->ReleaseByteArrayElements(jni_env, inputBuffer, buf,
                                              JNI_ABORT);
+        if (status != PJ_SUCCESS || stream->quit_flag)
+            break;
 
         stream->rec_timestamp.u64 += stream->param.samples_per_frame /

pjproject/trunk/pjmedia/src/pjmedia-videodev/util.c

@@ -23 +23 @@
 #include <pj/errno.h>
 #include <pj/log.h>
+
+#if defined(PJMEDIA_HAS_VIDEO) && (PJMEDIA_HAS_VIDEO != 0)
 
 #if defined(PJMEDIA_HAS_LIBYUV) && PJMEDIA_HAS_LIBYUV != 0
@@ -282 +284 @@
             
             swap(src, dst);
+#else
+            PJ_UNUSED_ARG(p_len);
+            PJ_UNUSED_ARG(dst_size);
 #endif
         }
@@ -289 +294 @@
         /* Center the frame and fill the area with black color */    
         if (conv->fmt.id == PJMEDIA_FORMAT_I420) {
-            int i = 0;
+            unsigned i = 0;
             pj_uint8_t *pdst = dst;
             pj_uint8_t *psrc = src;
-            pj_size_t p_len_src, p_len_dst;
+            pj_size_t p_len_src = 0, p_len_dst = conv->wxh;
             int pad = conv->pad;
 
-            p_len_dst = conv->wxh;
             pj_bzero(pdst, p_len_dst);
 
@@ -358 +362 @@
     }
 }
+
+#endif /* PJMEDIA_HAS_VIDEO */

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

@@ -1159 +1159 @@
 #else
     PJ_UNUSED_ARG(param);
+    PJ_UNUSED_ARG(devId);
 #endif
 }