Changeset 5513 for pjproject

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (view diffs)
• README.txt (modified) (view diffs)
• aconfigure (modified) (view diffs)
• aconfigure.ac (modified) (view diffs)
• build.mak.in (modified) (view diffs)
• build/rules.mak (modified) (view diffs)
• configure-android (modified) (view diffs)
• configure-iphone (modified) (view diffs)
• pjlib-util/include/pjlib-util/cli_telnet.h (modified) (view diffs)
• pjlib-util/include/pjlib-util/dns.h (modified) (view diffs)
• pjlib-util/include/pjlib-util/resolver.h (modified) (view diffs)
• pjlib-util/include/pjlib-util/srv_resolver.h (modified) (view diffs)
• pjlib-util/src/pjlib-util-test/resolver_test.c (modified) (view diffs)
• pjlib-util/src/pjlib-util/cli_telnet.c (modified) (view diffs)
• pjlib-util/src/pjlib-util/dns.c (modified) (view diffs)
• pjlib-util/src/pjlib-util/dns_dump.c (modified) (view diffs)
• pjlib-util/src/pjlib-util/dns_server.c (modified) (view diffs)
• pjlib-util/src/pjlib-util/pcap.c (modified) (view diffs)
• pjlib-util/src/pjlib-util/resolver.c (modified) (view diffs)
• pjlib-util/src/pjlib-util/srv_resolver.c (modified) (view diffs)
• pjlib-util/src/pjlib-util/stun_simple_client.c (modified) (view diffs)
• pjlib/build/Makefile (modified) (view diffs)
• pjlib/build/os-auto.mak.in (modified) (view diffs)
• pjlib/build/os-darwinos.mak (modified) (view diffs)
• pjlib/build/os-linux-kernel.mak (modified) (view diffs)
• pjlib/build/os-linux.mak (modified) (view diffs)
• pjlib/build/os-rtems.mak (modified) (view diffs)
• pjlib/build/os-sunos.mak (modified) (view diffs)
• pjlib/build/os-win32.mak (modified) (view diffs)
• pjlib/include/pj/compat/os_auto.h.in (modified) (view diffs)
• pjlib/include/pj/compat/os_darwinos.h (modified) (view diffs)
• pjlib/include/pj/compat/os_linux.h (modified) (view diffs)
• pjlib/include/pj/compat/socket.h (modified) (view diffs)
• pjlib/include/pj/config.h (modified) (view diffs)
• pjlib/include/pj/config_site_sample.h (modified) (view diffs)
• pjlib/include/pj/log.h (modified) (view diffs)
• pjlib/include/pj/sock.h (modified) (view diffs)
• pjlib/include/pj/sock_qos.h (modified) (view diffs)
• pjlib/include/pj/ssl_sock.h (modified) (view diffs)
• pjlib/include/pj/string.h (modified) (view diffs)
• pjlib/include/pj/string_i.h (modified) (view diffs)
• pjlib/src/pj/addr_resolv_sock.c (modified) (view diffs)
• pjlib/src/pj/config.c (modified) (view diffs)
• pjlib/src/pj/guid_android.c (copied) (copied from pjproject/trunk/pjlib/src/pj/guid_android.c) (view diffs)
• pjlib/src/pj/hash.c (modified) (view diffs)
• pjlib/src/pj/os_core_unix.c (modified) (view diffs)
• pjlib/src/pj/os_time_common.c (modified) (view diffs)
• pjlib/src/pj/os_timestamp_posix.c (modified) (view diffs)
• pjlib/src/pj/sock_bsd.c (modified) (view diffs)
• pjlib/src/pj/sock_common.c (modified) (view diffs)
• pjlib/src/pj/sock_qos_bsd.c (modified) (view diffs)
• pjlib/src/pj/sock_qos_common.c (modified) (view diffs)
• pjlib/src/pj/sock_qos_darwin.c (copied) (copied from pjproject/trunk/pjlib/src/pj/sock_qos_darwin.c) (view diffs)
• pjlib/src/pj/ssl_sock_common.c (modified) (view diffs)
• pjlib/src/pj/ssl_sock_ossl.c (modified) (view diffs)
• pjlib/src/pjlib-test/echo_clt.c (modified) (view diffs)
• pjlib/src/pjlib-test/errno.c (modified) (view diffs)
• pjlib/src/pjlib-test/sock.c (modified) (view diffs)
• pjlib/src/pjlib-test/ssl_sock.c (modified) (view diffs)
• pjmedia/build/Makefile (modified) (view diffs)
• pjmedia/build/os-auto.mak.in (modified) (view diffs)
• pjmedia/build/pjmedia.vcproj (modified) (view diffs)
• pjmedia/build/pjmedia.vcxproj (modified) (view diffs)
• pjmedia/build/pjmedia.vcxproj.filters (modified) (view diffs)
• pjmedia/build/pjmedia_codec.vcproj (modified) (view diffs)
• pjmedia/build/pjmedia_codec.vcxproj (modified) (view diffs)
• pjmedia/build/pjmedia_codec.vcxproj.filters (modified) (view diffs)
• pjmedia/include/pjmedia-audiodev/audiodev.h (modified) (view diffs)
• pjmedia/include/pjmedia-audiodev/config.h (modified) (view diffs)
• pjmedia/include/pjmedia-codec.h (modified) (view diffs)
• pjmedia/include/pjmedia-codec/config.h (modified) (view diffs)
• pjmedia/include/pjmedia-codec/config_auto.h.in (modified) (view diffs)
• pjmedia/include/pjmedia-codec/opus.h (copied) (copied from pjproject/trunk/pjmedia/include/pjmedia-codec/opus.h) (view diffs)
• pjmedia/include/pjmedia-codec/types.h (modified) (view diffs)
• pjmedia/include/pjmedia-videodev/config.h (modified) (view diffs)
• pjmedia/include/pjmedia-videodev/videodev.h (modified) (view diffs)
• pjmedia/include/pjmedia/audiodev.h (copied) (copied from pjproject/trunk/pjmedia/include/pjmedia/audiodev.h) (view diffs)
• pjmedia/include/pjmedia/config.h (modified) (view diffs)
• pjmedia/include/pjmedia/endpoint.h (modified) (view diffs)
• pjmedia/include/pjmedia/errno.h (modified) (view diffs)
• pjmedia/include/pjmedia/rtp.h (modified) (view diffs)
• pjmedia/include/pjmedia/sound.h (modified) (view diffs)
• pjmedia/include/pjmedia/stream.h (modified) (view diffs)
• pjmedia/include/pjmedia/stream_common.h (modified) (view diffs)
• pjmedia/include/pjmedia/transport.h (modified) (view diffs)
• pjmedia/include/pjmedia/transport_srtp.h (modified) (view diffs)
• pjmedia/include/pjmedia/vid_stream.h (modified) (view diffs)
• pjmedia/include/pjmedia/videodev.h (copied) (copied from pjproject/trunk/pjmedia/include/pjmedia/videodev.h) (view diffs)
• pjmedia/src/pjmedia-audiodev/alsa_dev.c (modified) (view diffs)
• pjmedia/src/pjmedia-audiodev/android_jni_dev.c (modified) (view diffs)
• pjmedia/src/pjmedia-audiodev/audiodev.c (modified) (view diffs)
• pjmedia/src/pjmedia-audiodev/coreaudio_dev.m (modified) (view diffs)
• pjmedia/src/pjmedia-audiodev/opensl_dev.c (modified) (view diffs)
• pjmedia/src/pjmedia-codec/audio_codecs.c (modified) (view diffs)
• pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c (modified) (view diffs)
• pjmedia/src/pjmedia-codec/openh264.cpp (modified) (view diffs)
• pjmedia/src/pjmedia-codec/opus.c (copied) (copied from pjproject/trunk/pjmedia/src/pjmedia-codec/opus.c) (view diffs)
• pjmedia/src/pjmedia-videodev/darwin_dev.m (copied) (copied from pjproject/trunk/pjmedia/src/pjmedia-videodev/darwin_dev.m) (view diffs)
• pjmedia/src/pjmedia-videodev/ffmpeg_dev.c (modified) (view diffs)
• pjmedia/src/pjmedia-videodev/ios_dev.m (deleted)
• pjmedia/src/pjmedia-videodev/ios_opengl_dev.m (modified) (view diffs)
• pjmedia/src/pjmedia-videodev/sdl_dev.c (modified) (view diffs)
• pjmedia/src/pjmedia-videodev/videodev.c (modified) (view diffs)
• pjmedia/src/pjmedia/audiodev.c (copied) (copied from pjproject/trunk/pjmedia/src/pjmedia/audiodev.c) (view diffs)
• pjmedia/src/pjmedia/converter.c (modified) (view diffs)
• pjmedia/src/pjmedia/converter_libswscale.c (modified) (view diffs)
• pjmedia/src/pjmedia/converter_libyuv.c (modified) (view diffs)
• pjmedia/src/pjmedia/echo_webrtc.c (modified) (view diffs)
• pjmedia/src/pjmedia/endpoint.c (modified) (view diffs)
• pjmedia/src/pjmedia/errno.c (modified) (view diffs)
• pjmedia/src/pjmedia/ffmpeg_util.c (modified) (view diffs)
• pjmedia/src/pjmedia/ffmpeg_util.h (modified) (view diffs)
• pjmedia/src/pjmedia/resample_libsamplerate.c (modified) (view diffs)
• pjmedia/src/pjmedia/rtp.c (modified) (view diffs)
• pjmedia/src/pjmedia/sdp.c (modified) (view diffs)
• pjmedia/src/pjmedia/session.c (modified) (view diffs)
• pjmedia/src/pjmedia/sound_legacy.c (modified) (view diffs)
• pjmedia/src/pjmedia/stream.c (modified) (view diffs)
• pjmedia/src/pjmedia/stream_info.c (modified) (view diffs)
• pjmedia/src/pjmedia/transport_adapter_sample.c (modified) (view diffs)
• pjmedia/src/pjmedia/transport_ice.c (modified) (view diffs)
• pjmedia/src/pjmedia/transport_srtp.c (modified) (view diffs)
• pjmedia/src/pjmedia/vid_stream.c (modified) (view diffs)
• pjmedia/src/pjmedia/vid_stream_info.c (modified) (view diffs)
• pjmedia/src/pjmedia/videodev.c (copied) (copied from pjproject/trunk/pjmedia/src/pjmedia/videodev.c) (view diffs)
• pjnath/include/pjnath/config.h (modified) (view diffs)
• pjnath/include/pjnath/ice_session.h (modified) (view diffs)
• pjnath/include/pjnath/ice_strans.h (modified) (view diffs)
• pjnath/include/pjnath/nat_detect.h (modified) (view diffs)
• pjnath/include/pjnath/stun_sock.h (modified) (view diffs)
• pjnath/include/pjnath/turn_session.h (modified) (view diffs)
• pjnath/src/pjnath-test/concur_test.c (modified) (view diffs)
• pjnath/src/pjnath-test/ice_test.c (modified) (view diffs)
• pjnath/src/pjnath-test/server.c (modified) (view diffs)
• pjnath/src/pjnath-test/server.h (modified) (view diffs)
• pjnath/src/pjnath-test/sess_auth.c (modified) (view diffs)
• pjnath/src/pjnath-test/stun_sock_test.c (modified) (view diffs)
• pjnath/src/pjnath-test/test.c (modified) (view diffs)
• pjnath/src/pjnath-test/test.h (modified) (view diffs)
• pjnath/src/pjnath-test/turn_sock_test.c (modified) (view diffs)
• pjnath/src/pjnath/ice_session.c (modified) (view diffs)
• pjnath/src/pjnath/ice_strans.c (modified) (view diffs)
• pjnath/src/pjnath/nat_detect.c (modified) (view diffs)
• pjnath/src/pjnath/stun_msg_dump.c (modified) (view diffs)
• pjnath/src/pjnath/stun_session.c (modified) (view diffs)
• pjnath/src/pjnath/stun_sock.c (modified) (view diffs)
• pjnath/src/pjnath/turn_session.c (modified) (view diffs)
• pjnath/src/pjnath/turn_sock.c (modified) (view diffs)
• pjproject-vs8.sln (modified) (view diffs)
• pjsip-apps/build/Samples-vc.mak (modified) (view diffs)
• pjsip-apps/build/swig_java_pjsua2.vcproj (copied) (copied from pjproject/trunk/pjsip-apps/build/swig_java_pjsua2.vcproj) (view diffs)
• pjsip-apps/src/pjsua/android (modified) (view diffs)
• pjsip-apps/src/pjsua/android/.classpath (deleted)
• pjsip-apps/src/pjsua/android/.project (deleted)
• pjsip-apps/src/pjsua/android/AndroidManifest.xml (deleted)
• pjsip-apps/src/pjsua/android/app (copied) (copied from pjproject/trunk/pjsip-apps/src/pjsua/android/app) (view diffs)
• pjsip-apps/src/pjsua/android/assets (deleted)
• pjsip-apps/src/pjsua/android/build.gradle (copied) (copied from pjproject/trunk/pjsip-apps/src/pjsua/android/build.gradle) (view diffs)
• pjsip-apps/src/pjsua/android/gradle (copied) (copied from pjproject/trunk/pjsip-apps/src/pjsua/android/gradle) (view diffs)
• pjsip-apps/src/pjsua/android/gradlew (copied) (copied from pjproject/trunk/pjsip-apps/src/pjsua/android/gradlew) (view diffs)
• pjsip-apps/src/pjsua/android/gradlew.bat (copied) (copied from pjproject/trunk/pjsip-apps/src/pjsua/android/gradlew.bat) (view diffs)
• pjsip-apps/src/pjsua/android/jni/Android.mk (deleted)
• pjsip-apps/src/pjsua/android/jni/Application.mk (deleted)
• pjsip-apps/src/pjsua/android/jni/Makefile (copied) (copied from pjproject/trunk/pjsip-apps/src/pjsua/android/jni/Makefile) (view diffs)
• pjsip-apps/src/pjsua/android/jni/pjsua.i (modified) (view diffs)
• pjsip-apps/src/pjsua/android/lint.xml (deleted)
• pjsip-apps/src/pjsua/android/proguard-project.txt (deleted)
• pjsip-apps/src/pjsua/android/project.properties (deleted)
• pjsip-apps/src/pjsua/android/res (deleted)
• pjsip-apps/src/pjsua/android/settings.gradle (copied) (copied from pjproject/trunk/pjsip-apps/src/pjsua/android/settings.gradle) (view diffs)
• pjsip-apps/src/pjsua/android/src (deleted)
• pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj (modified) (view diffs)
• pjsip-apps/src/pjsua/ios/ipjsua/ipjsua-Info.plist (modified) (view diffs)
• pjsip-apps/src/pjsua/pjsua_app.c (modified) (view diffs)
• pjsip-apps/src/pjsua/pjsua_app_cli.c (modified) (view diffs)
• pjsip-apps/src/pjsua/pjsua_app_common.c (modified) (view diffs)
• pjsip-apps/src/pjsua/pjsua_app_config.c (modified) (view diffs)
• pjsip-apps/src/pjsua/pjsua_app_legacy.c (modified) (view diffs)
• pjsip-apps/src/python/_pjsua.h (modified) (view diffs)
• pjsip-apps/src/python/pjsua.py (modified) (view diffs)
• pjsip-apps/src/python/setup.py (modified) (view diffs)
• pjsip-apps/src/samples/aectest.c (modified) (view diffs)
• pjsip-apps/src/samples/android_sample (copied) (copied from pjproject/trunk/pjsip-apps/src/samples/android_sample) (view diffs)
• pjsip-apps/src/samples/encdec.c (modified) (view diffs)
• pjsip-apps/src/samples/footprint.c (modified) (view diffs)
• pjsip-apps/src/samples/pjsip-perf.c (modified) (view diffs)
• pjsip-apps/src/samples/pjsua2_demo.cpp (modified) (view diffs)
• pjsip-apps/src/samples/proxy.h (modified) (view diffs)
• pjsip-apps/src/samples/simpleua.c (modified) (view diffs)
• pjsip-apps/src/samples/sipecho.c (modified) (view diffs)
• pjsip-apps/src/samples/siprtp.c (modified) (view diffs)
• pjsip-apps/src/samples/streamutil.c (modified) (view diffs)
• pjsip-apps/src/samples/vid_streamutil.c (modified) (view diffs)
• pjsip-apps/src/swig/java/Makefile (modified) (view diffs)
• pjsip-apps/src/swig/java/android (modified) (view diffs)
• pjsip-apps/src/swig/java/android/.classpath (deleted)
• pjsip-apps/src/swig/java/android/.project (deleted)
• pjsip-apps/src/swig/java/android/.settings (deleted)
• pjsip-apps/src/swig/java/android/AndroidManifest.xml (deleted)
• pjsip-apps/src/swig/java/android/app (copied) (copied from pjproject/trunk/pjsip-apps/src/swig/java/android/app) (view diffs)
• pjsip-apps/src/swig/java/android/build.gradle (copied) (copied from pjproject/trunk/pjsip-apps/src/swig/java/android/build.gradle) (view diffs)
• pjsip-apps/src/swig/java/android/gradle (copied) (copied from pjproject/trunk/pjsip-apps/src/swig/java/android/gradle) (view diffs)
• pjsip-apps/src/swig/java/android/gradlew (copied) (copied from pjproject/trunk/pjsip-apps/src/swig/java/android/gradlew) (view diffs)
• pjsip-apps/src/swig/java/android/gradlew.bat (copied) (copied from pjproject/trunk/pjsip-apps/src/swig/java/android/gradlew.bat) (view diffs)
• pjsip-apps/src/swig/java/android/ic_launcher-web.png (deleted)
• pjsip-apps/src/swig/java/android/jni (deleted)
• pjsip-apps/src/swig/java/android/libs (deleted)
• pjsip-apps/src/swig/java/android/proguard-project.txt (deleted)
• pjsip-apps/src/swig/java/android/project.properties (deleted)
• pjsip-apps/src/swig/java/android/res (deleted)
• pjsip-apps/src/swig/java/android/settings.gradle (copied) (copied from pjproject/trunk/pjsip-apps/src/swig/java/android/settings.gradle) (view diffs)
• pjsip-apps/src/swig/java/android/src (deleted)
• pjsip-apps/src/swig/java/sample.java (modified) (view diffs)
• pjsip-apps/src/swig/java/sample2.java (copied) (copied from pjproject/trunk/pjsip-apps/src/swig/java/sample2.java) (view diffs)
• pjsip-apps/src/swig/pjsua2.i (modified) (view diffs)
• pjsip-apps/src/swig/python/setup.py (modified) (view diffs)
• pjsip-apps/src/swig/symbols.i (modified) (view diffs)
• pjsip-apps/src/swig/symbols.lst (modified) (view diffs)
• pjsip/docs/doxygen.cfg (modified) (view diffs)
• pjsip/include/pjsip-simple/evsub.h (modified) (view diffs)
• pjsip/include/pjsip-ua/sip_inv.h (modified) (view diffs)
• pjsip/include/pjsip-ua/sip_regc.h (modified) (view diffs)
• pjsip/include/pjsip-ua/sip_replaces.h (modified) (view diffs)
• pjsip/include/pjsip/print_util.h (modified) (view diffs)
• pjsip/include/pjsip/sip_auth.h (modified) (view diffs)
• pjsip/include/pjsip/sip_config.h (modified) (view diffs)
• pjsip/include/pjsip/sip_dialog.h (modified) (view diffs)
• pjsip/include/pjsip/sip_endpoint.h (modified) (view diffs)
• pjsip/include/pjsip/sip_transport.h (modified) (view diffs)
• pjsip/include/pjsip/sip_transport_tls.h (modified) (view diffs)
• pjsip/include/pjsip/sip_transport_udp.h (modified) (view diffs)
• pjsip/include/pjsua-lib/pjsua.h (modified) (view diffs)
• pjsip/include/pjsua-lib/pjsua_internal.h (modified) (view diffs)
• pjsip/include/pjsua2/account.hpp (modified) (view diffs)
• pjsip/include/pjsua2/call.hpp (modified) (view diffs)
• pjsip/include/pjsua2/endpoint.hpp (modified) (view diffs)
• pjsip/include/pjsua2/media.hpp (modified) (view diffs)
• pjsip/src/pjsip-simple/evsub.c (modified) (view diffs)
• pjsip/src/pjsip-simple/publishc.c (modified) (view diffs)
• pjsip/src/pjsip-ua/sip_100rel.c (modified) (view diffs)
• pjsip/src/pjsip-ua/sip_inv.c (modified) (view diffs)
• pjsip/src/pjsip-ua/sip_reg.c (modified) (view diffs)
• pjsip/src/pjsip-ua/sip_timer.c (modified) (view diffs)
• pjsip/src/pjsip/sip_auth_client.c (modified) (view diffs)
• pjsip/src/pjsip/sip_auth_msg.c (modified) (view diffs)
• pjsip/src/pjsip/sip_dialog.c (modified) (view diffs)
• pjsip/src/pjsip/sip_endpoint.c (modified) (view diffs)
• pjsip/src/pjsip/sip_msg.c (modified) (view diffs)
• pjsip/src/pjsip/sip_parser.c (modified) (view diffs)
• pjsip/src/pjsip/sip_resolve.c (modified) (view diffs)
• pjsip/src/pjsip/sip_transaction.c (modified) (view diffs)
• pjsip/src/pjsip/sip_transport.c (modified) (view diffs)
• pjsip/src/pjsip/sip_transport_tcp.c (modified) (view diffs)
• pjsip/src/pjsip/sip_transport_tls.c (modified) (view diffs)
• pjsip/src/pjsip/sip_transport_udp.c (modified) (view diffs)
• pjsip/src/pjsip/sip_ua_layer.c (modified) (view diffs)
• pjsip/src/pjsip/sip_util.c (modified) (view diffs)
• pjsip/src/pjsua-lib/pjsua_acc.c (modified) (view diffs)
• pjsip/src/pjsua-lib/pjsua_aud.c (modified) (view diffs)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (view diffs)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (view diffs)
• pjsip/src/pjsua-lib/pjsua_im.c (modified) (view diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (view diffs)
• pjsip/src/pjsua-lib/pjsua_pres.c (modified) (view diffs)
• pjsip/src/pjsua-lib/pjsua_vid.c (modified) (view diffs)
• pjsip/src/pjsua2/account.cpp (modified) (view diffs)
• pjsip/src/pjsua2/call.cpp (modified) (view diffs)
• pjsip/src/pjsua2/endpoint.cpp (modified) (view diffs)
• pjsip/src/pjsua2/media.cpp (modified) (view diffs)
• pjsip/src/test/inv_offer_answer_test.c (modified) (view diffs)
• pjsip/src/test/transport_tcp_test.c (modified) (view diffs)
• pjsip/src/test/transport_test.c (modified) (view diffs)
• pjsip/src/test/uri_test.c (modified) (view diffs)
• version.mak (modified) (view diffs)

pjproject/branches/projects/uwp/pjsip-apps/src/pjsua/android

@@ -1 @@
-bin
-obj
-libs
-gen
-.settings
-.*
-
+.gradle
+.idea
+build
+android.iml
+local.properties

@@ -1 @@
-bin
-obj
-libs
-gen
-.settings
-.*
-
+.gradle
+.idea
+build
+android.iml
+local.properties

pjproject/branches/projects/uwp/pjsip-apps/src/swig/java/android

@@ -1 @@
-bin
-gen
-obj
-assets
-.cproject
+.gradle
+.idea
+build
+android.iml
+local.properties

@@ -1 @@
-bin
-gen
-obj
-assets
-.cproject
+.gradle
+.idea
+build
+android.iml
+local.properties

@@ -1 @@
-bin
-obj
-libs
-gen
-.settings
-.*
-
+.gradle
+.idea
+build
+android.iml
+local.properties

@@ -1 @@
-bin
-gen
-obj
-assets
-.cproject
+.gradle
+.idea
+build
+android.iml
+local.properties