Changeset 4928
- Timestamp:
- Sep 24, 2014 4:01:34 AM (10 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 1 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/aconfigure
r4892 r4928 668 668 ac_ios_cflags 669 669 ac_pjmedia_video_has_ios 670 ac_android_cflags 671 ac_pjmedia_video_has_android 670 672 ac_pjmedia_video 671 673 ac_pa_use_oss … … 6160 6162 else 6161 6163 case $target in 6164 *android*) 6165 ac_pjmedia_video=android_os 6166 6167 6168 SAVED_LIBS="$LIBS" 6169 LIBS="-lGLESv2 -lEGL -landroid" 6170 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 6171 /* end confdefs.h. */ 6172 6173 int 6174 main () 6175 { 6176 6177 ; 6178 return 0; 6179 } 6180 _ACEOF 6181 if ac_fn_c_try_link "$LINENO"; then : 6182 ac_pjmedia_video_has_android=yes 6183 else 6184 ac_pjmedia_video_has_android=no 6185 fi 6186 rm -f core conftest.err conftest.$ac_objext \ 6187 conftest$ac_exeext conftest.$ac_ext 6188 LIBS="$SAVED_LIBS" 6189 if test "$ac_pjmedia_video_has_android" = "yes"; then 6190 ac_android_cflags="-DPJMEDIA_VIDEO_DEV_HAS_ANDROID_OPENGL=1" 6191 LIBS="$LIBS -lGLESv2 -lEGL -landroid" 6192 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGL ES 2 is available... yes" >&5 6193 $as_echo "Checking if OpenGL ES 2 is available... yes" >&6; } 6194 else 6195 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if OpenGL ES 2 is available... no" >&5 6196 $as_echo "Checking if OpenGL ES 2 is available... no" >&6; } 6197 fi 6198 ;; 6162 6199 arm-apple-darwin*) 6163 6200 ac_pjmedia_video=iphone_os -
pjproject/trunk/aconfigure.ac
r4892 r4928 706 706 else 707 707 case $target in 708 *android*) 709 ac_pjmedia_video=android_os 710 AC_SUBST(ac_pjmedia_video_has_android) 711 AC_SUBST(ac_android_cflags) 712 SAVED_LIBS="$LIBS" 713 LIBS="-lGLESv2 -lEGL -landroid" 714 AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [])],[ac_pjmedia_video_has_android=yes],[ac_pjmedia_video_has_android=no]) 715 LIBS="$SAVED_LIBS" 716 if test "$ac_pjmedia_video_has_android" = "yes"; then 717 ac_android_cflags="-DPJMEDIA_VIDEO_DEV_HAS_ANDROID_OPENGL=1" 718 LIBS="$LIBS -lGLESv2 -lEGL -landroid" 719 AC_MSG_RESULT([Checking if OpenGL ES 2 is available... yes]) 720 else 721 AC_MSG_RESULT([Checking if OpenGL ES 2 is available... no]) 722 fi 723 ;; 708 724 arm-apple-darwin*) 709 725 ac_pjmedia_video=iphone_os -
pjproject/trunk/pjmedia/build/Makefile
r4875 r4928 107 107 export PJMEDIA_VIDEODEV_SRCDIR = ../src/pjmedia-videodev 108 108 export PJMEDIA_VIDEODEV_OBJS += errno.o videodev.o avi_dev.o ffmpeg_dev.o \ 109 colorbar_dev.o v4l2_dev.o opengl_dev.o 109 colorbar_dev.o v4l2_dev.o opengl_dev.o \ 110 android_opengl.o 110 111 export PJMEDIA_VIDEODEV_CFLAGS += $(_CFLAGS) 111 112 export PJMEDIA_VIDEODEV_CXXFLAGS += $(_CXXFLAGS) -
pjproject/trunk/pjmedia/build/os-auto.mak.in
r4875 r4928 26 26 IOS_CFLAGS = @ac_ios_cflags@ 27 27 28 # Android 29 ANDROID_CFLAGS = @ac_android_cflags@ 30 28 31 # libyuv 29 32 LIBYUV_CFLAGS = @ac_libyuv_cflags@ … … 34 37 export CFLAGS += @ac_no_small_filter@ @ac_no_large_filter@ @ac_no_speex_aec@ \ 35 38 $(SDL_CFLAGS) $(FFMPEG_CFLAGS) $(V4L2_CFLAGS) $(QT_CFLAGS) \ 36 $(IOS_CFLAGS) $( LIBYUV_CFLAGS)39 $(IOS_CFLAGS) $(ANDROID_CFLAGS) $(LIBYUV_CFLAGS) 37 40 export LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS) \ 38 41 $(LIBYUV_LDFLAGS) -
pjproject/trunk/pjmedia/include/pjmedia-videodev/config.h
r4907 r4928 72 72 73 73 /** 74 * This setting controls whether OpenGL for Android should be included. 75 * 76 * Default: 0 (or detected by configure) 77 */ 78 #ifndef PJMEDIA_VIDEO_DEV_HAS_ANDROID_OPENGL 79 # define PJMEDIA_VIDEO_DEV_HAS_ANDROID_OPENGL 0 80 #else 81 # if defined(PJMEDIA_VIDEO_DEV_HAS_ANDROID_OPENGL) && \ 82 PJMEDIA_VIDEO_DEV_HAS_ANDROID_OPENGL != 0 83 # undef PJMEDIA_VIDEO_DEV_HAS_OPENGL_ES 84 # define PJMEDIA_VIDEO_DEV_HAS_OPENGL_ES 1 85 # endif 86 #endif 87 88 89 /** 74 90 * This setting controls whether OpenGL ES support should be included. 75 91 * -
pjproject/trunk/pjsip-apps/src/pjsua/android/AndroidManifest.xml
r4496 r4928 23 23 <uses-permission android:name="android.permission.CAMERA" /> 24 24 25 <uses-feature android:glEsVersion="0x00020000" android:required="false" /> 26 25 27 <uses-feature 26 28 android:name="android.hardware.microphone" -
pjproject/trunk/pjsip-apps/src/swig/java/android/AndroidManifest.xml
r4704 r4928 21 21 <uses-permission android:name="android.permission.READ_LOGS" /> 22 22 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 23 24 <uses-feature android:glEsVersion="0x00020000" android:required="false" /> 23 25 24 26 <application
Note: See TracChangeset
for help on using the changeset viewer.