Diff
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (212307 => 212308)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2017-02-14 18:51:24 UTC (rev 212307)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2017-02-14 18:52:31 UTC (rev 212308)
@@ -1,3 +1,308 @@
+2017-02-14 Alex Christensen <achristen...@webkit.org>
+
+ Remove android-specific files from ThirdParty/libwebrtc
+ https://bugs.webkit.org/show_bug.cgi?id=168272
+
+ Reviewed by Brady Eidson.
+
+ * Source/third_party/boringssl/src/third_party/android-cmake: Removed.
+ * Source/third_party/boringssl/src/third_party/android-cmake/AndroidNdkGdb.cmake: Removed.
+ * Source/third_party/boringssl/src/third_party/android-cmake/AndroidNdkModules.cmake: Removed.
+ * Source/third_party/boringssl/src/third_party/android-cmake/LICENSE: Removed.
+ * Source/third_party/boringssl/src/third_party/android-cmake/METADATA: Removed.
+ * Source/third_party/boringssl/src/third_party/android-cmake/README.md: Removed.
+ * Source/third_party/boringssl/src/third_party/android-cmake/android.toolchain.cmake: Removed.
+ * Source/third_party/boringssl/src/third_party/android-cmake/ndk_links.md: Removed.
+ * Source/third_party/boringssl/src/util/run_android_tests.go: Removed.
+ * Source/third_party/libyuv/util/android: Removed.
+ * Source/third_party/libyuv/util/android/test_runner.py: Removed.
+ * Source/webrtc/androidjunit: Removed.
+ * Source/webrtc/androidjunit/OWNERS: Removed.
+ * Source/webrtc/androidjunit/src: Removed.
+ * Source/webrtc/androidjunit/src/org: Removed.
+ * Source/webrtc/androidjunit/src/org/webrtc: Removed.
+ * Source/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java: Removed.
+ * Source/webrtc/api/android: Removed.
+ * Source/webrtc/api/android/PRESUBMIT.py: Removed.
+ * Source/webrtc/api/android/README: Removed.
+ * Source/webrtc/api/android/java: Removed.
+ * Source/webrtc/api/android/java/src: Removed.
+ * Source/webrtc/api/android/java/src/org: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/AudioSource.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/AudioTrack.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/CallSessionFileRotatingLogSink.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/Camera1Capturer.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/Camera1Enumerator.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/Camera1Session.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/Camera2Capturer.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/Camera2Enumerator.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/Camera2Session.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/CameraCapturer.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/CameraEnumerationAndroid.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/CameraEnumerator.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/CameraSession.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/CameraVideoCapturer.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/DataChannel.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/EglBase.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/EglBase10.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/EglBase14.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/EglRenderer.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/FileVideoCapturer.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/GlRectDrawer.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/GlShader.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/GlTextureFrameBuffer.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/GlUtil.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/IceCandidate.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/MediaCodecVideoDecoder.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/MediaCodecVideoEncoder.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/MediaConstraints.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/MediaSource.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/MediaStream.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/MediaStreamTrack.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/Metrics.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/NetworkMonitor.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/NetworkMonitorAutoDetect.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/OWNERS: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/PeerConnection.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/PeerConnectionFactory.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/RendererCommon.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/RtpParameters.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/RtpReceiver.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/RtpSender.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/ScreenCapturerAndroid.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/SdpObserver.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/SessionDescription.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/StatsObserver.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/StatsReport.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/SurfaceTextureHelper.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/SurfaceViewRenderer.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/VideoCapturer.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/VideoCapturerAndroid.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/VideoFileRenderer.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/VideoRenderer.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/VideoRendererGui.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/VideoSource.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/VideoTrack.java: Removed.
+ * Source/webrtc/api/android/java/src/org/webrtc/YuvConverter.java: Removed.
+ * Source/webrtc/api/android/jni: Removed.
+ * Source/webrtc/api/android/jni/OWNERS: Removed.
+ * Source/webrtc/api/android/jni/androidmediacodeccommon.h: Removed.
+ * Source/webrtc/api/android/jni/androidmediadecoder_jni.cc: Removed.
+ * Source/webrtc/api/android/jni/androidmediadecoder_jni.h: Removed.
+ * Source/webrtc/api/android/jni/androidmediaencoder_jni.cc: Removed.
+ * Source/webrtc/api/android/jni/androidmediaencoder_jni.h: Removed.
+ * Source/webrtc/api/android/jni/androidmetrics_jni.cc: Removed.
+ * Source/webrtc/api/android/jni/androidnetworkmonitor_jni.cc: Removed.
+ * Source/webrtc/api/android/jni/androidnetworkmonitor_jni.h: Removed.
+ * Source/webrtc/api/android/jni/androidvideotracksource_jni.cc: Removed.
+ * Source/webrtc/api/android/jni/classreferenceholder.cc: Removed.
+ * Source/webrtc/api/android/jni/classreferenceholder.h: Removed.
+ * Source/webrtc/api/android/jni/jni_helpers.cc: Removed.
+ * Source/webrtc/api/android/jni/jni_helpers.h: Removed.
+ * Source/webrtc/api/android/jni/jni_onload.cc: Removed.
+ * Source/webrtc/api/android/jni/native_handle_impl.cc: Removed.
+ * Source/webrtc/api/android/jni/native_handle_impl.h: Removed.
+ * Source/webrtc/api/android/jni/peerconnection_jni.cc: Removed.
+ * Source/webrtc/api/android/jni/surfacetexturehelper_jni.cc: Removed.
+ * Source/webrtc/api/android/jni/surfacetexturehelper_jni.h: Removed.
+ * Source/webrtc/api/androidtests: Removed.
+ * Source/webrtc/api/androidtests/AndroidManifest.xml: Removed.
+ * Source/webrtc/api/androidtests/OWNERS: Removed.
+ * Source/webrtc/api/androidtests/ant.properties: Removed.
+ * Source/webrtc/api/androidtests/build.xml: Removed.
+ * Source/webrtc/api/androidtests/project.properties: Removed.
+ * Source/webrtc/api/androidtests/res: Removed.
+ * Source/webrtc/api/androidtests/res/drawable-hdpi: Removed.
+ * Source/webrtc/api/androidtests/res/drawable-hdpi/ic_launcher.png: Removed.
+ * Source/webrtc/api/androidtests/res/drawable-ldpi: Removed.
+ * Source/webrtc/api/androidtests/res/drawable-ldpi/ic_launcher.png: Removed.
+ * Source/webrtc/api/androidtests/res/drawable-mdpi: Removed.
+ * Source/webrtc/api/androidtests/res/drawable-mdpi/ic_launcher.png: Removed.
+ * Source/webrtc/api/androidtests/res/drawable-xhdpi: Removed.
+ * Source/webrtc/api/androidtests/res/drawable-xhdpi/ic_launcher.png: Removed.
+ * Source/webrtc/api/androidtests/res/values: Removed.
+ * Source/webrtc/api/androidtests/res/values/strings.xml: Removed.
+ * Source/webrtc/api/androidtests/src: Removed.
+ * Source/webrtc/api/androidtests/src/org: Removed.
+ * Source/webrtc/api/androidtests/src/org/webrtc: Removed.
+ * Source/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java: Removed.
+ * Source/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java: Removed.
+ * Source/webrtc/api/androidtests/src/org/webrtc/Camera2CapturerTest.java: Removed.
+ * Source/webrtc/api/androidtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java: Removed.
+ * Source/webrtc/api/androidtests/src/org/webrtc/EglRendererTest.java: Removed.
+ * Source/webrtc/api/androidtests/src/org/webrtc/GlRectDrawerTest.java: Removed.
+ * Source/webrtc/api/androidtests/src/org/webrtc/MediaCodecVideoEncoderTest.java: Removed.
+ * Source/webrtc/api/androidtests/src/org/webrtc/NetworkMonitorTest.java: Removed.
+ * Source/webrtc/api/androidtests/src/org/webrtc/PeerConnectionTest.java: Removed.
+ * Source/webrtc/api/androidtests/src/org/webrtc/RendererCommonTest.java: Removed.
+ * Source/webrtc/api/androidtests/src/org/webrtc/SurfaceTextureHelperTest.java: Removed.
+ * Source/webrtc/api/androidtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java: Removed.
+ * Source/webrtc/api/androidtests/src/org/webrtc/WebRtcJniBootTest.java: Removed.
+ * Source/webrtc/api/androidvideotracksource.cc: Removed.
+ * Source/webrtc/api/androidvideotracksource.h: Removed.
+ * Source/webrtc/api/test/androidtestinitializer.cc: Removed.
+ * Source/webrtc/api/test/androidtestinitializer.h: Removed.
+ * Source/webrtc/base/ifaddrs-android.cc: Removed.
+ * Source/webrtc/base/ifaddrs-android.h: Removed.
+ * Source/webrtc/build/android: Removed.
+ * Source/webrtc/build/android/AndroidManifest.xml: Removed.
+ * Source/webrtc/build/android/suppressions.xml: Removed.
+ * Source/webrtc/build/android/test_runner.py: Removed.
+ * Source/webrtc/examples/androidapp: Removed.
+ * Source/webrtc/examples/androidapp/AndroidManifest.xml: Removed.
+ * Source/webrtc/examples/androidapp/OWNERS: Removed.
+ * Source/webrtc/examples/androidapp/README: Removed.
+ * Source/webrtc/examples/androidapp/ant.properties: Removed.
+ * Source/webrtc/examples/androidapp/build.xml: Removed.
+ * Source/webrtc/examples/androidapp/project.properties: Removed.
+ * Source/webrtc/examples/androidapp/res: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-hdpi: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-hdpi/disconnect.png: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-hdpi/ic_action_full_screen.png: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-hdpi/ic_action_return_from_full_screen.png: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-hdpi/ic_launcher.png: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-hdpi/ic_loopback_call.png: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-ldpi: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-ldpi/disconnect.png: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-ldpi/ic_action_full_screen.png: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-ldpi/ic_action_return_from_full_screen.png: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-ldpi/ic_launcher.png: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-ldpi/ic_loopback_call.png: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-mdpi: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-mdpi/disconnect.png: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-mdpi/ic_action_full_screen.png: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-mdpi/ic_action_return_from_full_screen.png: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-mdpi/ic_launcher.png: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-mdpi/ic_loopback_call.png: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-xhdpi: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-xhdpi/disconnect.png: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-xhdpi/ic_action_full_screen.png: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-xhdpi/ic_action_return_from_full_screen.png: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-xhdpi/ic_launcher.png: Removed.
+ * Source/webrtc/examples/androidapp/res/drawable-xhdpi/ic_loopback_call.png: Removed.
+ * Source/webrtc/examples/androidapp/res/layout: Removed.
+ * Source/webrtc/examples/androidapp/res/layout/activity_call.xml: Removed.
+ * Source/webrtc/examples/androidapp/res/layout/activity_connect.xml: Removed.
+ * Source/webrtc/examples/androidapp/res/layout/fragment_call.xml: Removed.
+ * Source/webrtc/examples/androidapp/res/layout/fragment_hud.xml: Removed.
+ * Source/webrtc/examples/androidapp/res/menu: Removed.
+ * Source/webrtc/examples/androidapp/res/menu/connect_menu.xml: Removed.
+ * Source/webrtc/examples/androidapp/res/values: Removed.
+ * Source/webrtc/examples/androidapp/res/values-v17: Removed.
+ * Source/webrtc/examples/androidapp/res/values-v17/styles.xml: Removed.
+ * Source/webrtc/examples/androidapp/res/values-v21: Removed.
+ * Source/webrtc/examples/androidapp/res/values-v21/styles.xml: Removed.
+ * Source/webrtc/examples/androidapp/res/values/arrays.xml: Removed.
+ * Source/webrtc/examples/androidapp/res/values/strings.xml: Removed.
+ * Source/webrtc/examples/androidapp/res/xml: Removed.
+ * Source/webrtc/examples/androidapp/res/xml/preferences.xml: Removed.
+ * Source/webrtc/examples/androidapp/src: Removed.
+ * Source/webrtc/examples/androidapp/src/org: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCClient.java: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/CallFragment.java: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/CaptureQualityController.java: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/CpuMonitor.java: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/DirectRTCClient.java: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/HudFragment.java: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/PercentFrameLayout.java: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/RoomParametersFetcher.java: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsActivity.java: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/SettingsFragment.java: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/TCPChannelClient.java: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/UnhandledExceptionHandler.java: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketChannelClient.java: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/util: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/util/AppRTCUtils.java: Removed.
+ * Source/webrtc/examples/androidapp/src/org/appspot/apprtc/util/AsyncHttpURLConnection.java: Removed.
+ * Source/webrtc/examples/androidapp/start_loopback_stubbed_camera_saved_video_out.py: Removed.
+ * Source/webrtc/examples/androidapp/third_party: Removed.
+ * Source/webrtc/examples/androidapp/third_party/autobanh: Removed.
+ * Source/webrtc/examples/androidapp/third_party/autobanh/BUILD.gn: Removed.
+ * Source/webrtc/examples/androidapp/third_party/autobanh/LICENSE: Removed.
+ * Source/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md: Removed.
+ * Source/webrtc/examples/androidapp/third_party/autobanh/NOTICE: Removed.
+ * Source/webrtc/examples/androidapp/third_party/autobanh/lib: Removed.
+ * Source/webrtc/examples/androidapp/third_party/autobanh/lib/autobanh.jar: Removed.
+ * Source/webrtc/examples/androidjunit: Removed.
+ * Source/webrtc/examples/androidjunit/README: Removed.
+ * Source/webrtc/examples/androidjunit/src: Removed.
+ * Source/webrtc/examples/androidjunit/src/org: Removed.
+ * Source/webrtc/examples/androidjunit/src/org/appspot: Removed.
+ * Source/webrtc/examples/androidjunit/src/org/appspot/apprtc: Removed.
+ * Source/webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java: Removed.
+ * Source/webrtc/examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java: Removed.
+ * Source/webrtc/examples/androidtests: Removed.
+ * Source/webrtc/examples/androidtests/AndroidManifest.xml: Removed.
+ * Source/webrtc/examples/androidtests/README: Removed.
+ * Source/webrtc/examples/androidtests/ant.properties: Removed.
+ * Source/webrtc/examples/androidtests/build.xml: Removed.
+ * Source/webrtc/examples/androidtests/project.properties: Removed.
+ * Source/webrtc/examples/androidtests/src: Removed.
+ * Source/webrtc/examples/androidtests/src/org: Removed.
+ * Source/webrtc/examples/androidtests/src/org/appspot: Removed.
+ * Source/webrtc/examples/androidtests/src/org/appspot/apprtc: Removed.
+ * Source/webrtc/examples/androidtests/src/org/appspot/apprtc/test: Removed.
+ * Source/webrtc/examples/androidtests/src/org/appspot/apprtc/test/FileVideoCapturerTest.java: Removed.
+ * Source/webrtc/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java: Removed.
+ * Source/webrtc/examples/androidtests/src/org/appspot/apprtc/test/VideoFileRendererTest.java: Removed.
+ * Source/webrtc/examples/androidtests/src/org/appspot/apprtc/test/capturetestvideo.y4m: Removed.
+ * Source/webrtc/modules/audio_device/android: Removed.
+ * Source/webrtc/modules/audio_device/android/audio_common.h: Removed.
+ * Source/webrtc/modules/audio_device/android/audio_device_template.h: Removed.
+ * Source/webrtc/modules/audio_device/android/audio_device_unittest.cc: Removed.
+ * Source/webrtc/modules/audio_device/android/audio_manager.cc: Removed.
+ * Source/webrtc/modules/audio_device/android/audio_manager.h: Removed.
+ * Source/webrtc/modules/audio_device/android/audio_manager_unittest.cc: Removed.
+ * Source/webrtc/modules/audio_device/android/audio_record_jni.cc: Removed.
+ * Source/webrtc/modules/audio_device/android/audio_record_jni.h: Removed.
+ * Source/webrtc/modules/audio_device/android/audio_track_jni.cc: Removed.
+ * Source/webrtc/modules/audio_device/android/audio_track_jni.h: Removed.
+ * Source/webrtc/modules/audio_device/android/build_info.cc: Removed.
+ * Source/webrtc/modules/audio_device/android/build_info.h: Removed.
+ * Source/webrtc/modules/audio_device/android/ensure_initialized.cc: Removed.
+ * Source/webrtc/modules/audio_device/android/ensure_initialized.h: Removed.
+ * Source/webrtc/modules/audio_device/android/java: Removed.
+ * Source/webrtc/modules/audio_device/android/java/src: Removed.
+ * Source/webrtc/modules/audio_device/android/java/src/org: Removed.
+ * Source/webrtc/modules/audio_device/android/java/src/org/webrtc: Removed.
+ * Source/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine: Removed.
+ * Source/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java: Removed.
+ * Source/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioEffects.java: Removed.
+ * Source/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java: Removed.
+ * Source/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java: Removed.
+ * Source/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java: Removed.
+ * Source/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java: Removed.
+ * Source/webrtc/modules/audio_device/android/opensles_common.cc: Removed.
+ * Source/webrtc/modules/audio_device/android/opensles_common.h: Removed.
+ * Source/webrtc/modules/audio_device/android/opensles_player.cc: Removed.
+ * Source/webrtc/modules/audio_device/android/opensles_player.h: Removed.
+ * Source/webrtc/modules/audio_device/android/opensles_recorder.cc: Removed.
+ * Source/webrtc/modules/audio_device/android/opensles_recorder.h: Removed.
+ * Source/webrtc/modules/audio_processing/test/android: Removed.
+ * Source/webrtc/modules/audio_processing/test/android/apmtest: Removed.
+ * Source/webrtc/modules/audio_processing/test/android/apmtest/AndroidManifest.xml: Removed.
+ * Source/webrtc/modules/audio_processing/test/android/apmtest/default.properties: Removed.
+ * Source/webrtc/modules/audio_processing/test/android/apmtest/jni: Removed.
+ * Source/webrtc/modules/audio_processing/test/android/apmtest/jni/main.c: Removed.
+ * Source/webrtc/modules/audio_processing/test/android/apmtest/res: Removed.
+ * Source/webrtc/modules/audio_processing/test/android/apmtest/res/values: Removed.
+ * Source/webrtc/modules/audio_processing/test/android/apmtest/res/values/strings.xml: Removed.
+ * Source/webrtc/modules/utility/include/helpers_android.h: Removed.
+ * Source/webrtc/modules/utility/include/jvm_android.h: Removed.
+ * Source/webrtc/modules/utility/source/helpers_android.cc: Removed.
+ * Source/webrtc/modules/utility/source/jvm_android.cc: Removed.
+ * Source/webrtc/system_wrappers/source/cpu_features_android.c: Removed.
+ * libwebrtc.xcodeproj/project.pbxproj:
+
2017-02-10 Alex Christensen <achristen...@webkit.org>
Fix iOS libwebrtc build after r212127
Deleted: trunk/Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/util/run_android_tests.go (212307 => 212308)
--- trunk/Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/util/run_android_tests.go 2017-02-14 18:51:24 UTC (rev 212307)
+++ trunk/Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/util/run_android_tests.go 2017-02-14 18:52:31 UTC (rev 212308)
@@ -1,321 +0,0 @@
-// Copyright (c) 2016, Google Inc.
-//
-// Permission to use, copy, modify, and/or distribute this software for any
-// purpose with or without fee is hereby granted, provided that the above
-// copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-// SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-// OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-// CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-package main
-
-import (
- "bytes"
- "encoding/json"
- "flag"
- "fmt"
- "io"
- "io/ioutil"
- "os"
- "os/exec"
- "path/filepath"
- "strconv"
- "strings"
-)
-
-var (
- buildDir = flag.String("build-dir", "build", "Specifies the build directory to push.")
- adbPath = flag.String("adb", "adb", "Specifies the adb binary to use. Defaults to looking in PATH.")
- device = flag.String("device", "", "Specifies the device or emulator. See adb's -s argument.")
- aarch64 = flag.Bool("aarch64", false, "Build the test runners for aarch64 instead of arm.")
- arm = flag.Int("arm", 7, "Which arm revision to build for.")
- suite = flag.String("suite", "all", "Specifies the test suites to run (all, unit, or ssl).")
- allTestsArgs = flag.String("all-tests-args", "", "Specifies space-separated arguments to pass to all_tests.go")
- runnerArgs = flag.String("runner-args", "", "Specifies space-separated arguments to pass to ssl/test/runner")
- jsonOutput = flag.String("json-output", "", "The file to output JSON results to.")
-)
-
-func enableUnitTests() bool {
- return *suite == "all" || *suite == "unit"
-}
-
-func enableSSLTests() bool {
- return *suite == "all" || *suite == "ssl"
-}
-
-func adb(args ...string) error {
- if len(*device) > 0 {
- args = append([]string{"-s", *device}, args...)
- }
- cmd := exec.Command(*adbPath, args...)
- cmd.Stdout = os.Stdout
- cmd.Stderr = os.Stderr
- return cmd.Run()
-}
-
-func adbShell(shellCmd string) (int, error) {
- var args []string
- if len(*device) > 0 {
- args = append([]string{"-s", *device}, args...)
- }
- args = append(args, "shell")
-
- const delimiter = "___EXIT_CODE___"
-
- // Older versions of adb and Android do not preserve the exit
- // code, so work around this.
- // https://code.google.com/p/android/issues/detail?id=3254
- shellCmd += "; echo " + delimiter + " $?"
- args = append(args, shellCmd)
-
- cmd := exec.Command(*adbPath, args...)
- stdout, err := cmd.StdoutPipe()
- if err != nil {
- return 0, err
- }
- cmd.Stderr = os.Stderr
- if err := cmd.Start(); err != nil {
- return 0, err
- }
-
- var stdoutBytes bytes.Buffer
- for {
- var buf [1024]byte
- n, err := stdout.Read(buf[:])
- stdoutBytes.Write(buf[:n])
- os.Stdout.Write(buf[:n])
- if err != nil {
- break
- }
- }
-
- if err := cmd.Wait(); err != nil {
- return 0, err
- }
-
- stdoutStr := stdoutBytes.String()
- idx := strings.LastIndex(stdoutStr, delimiter)
- if idx < 0 {
- return 0, fmt.Errorf("Could not find delimiter in output.")
- }
-
- return strconv.Atoi(strings.TrimSpace(stdoutStr[idx+len(delimiter):]))
-}
-
-func goTool(args ...string) error {
- cmd := exec.Command("go", args...)
- cmd.Stdout = os.Stdout
- cmd.Stderr = os.Stderr
-
- cmd.Env = os.Environ()
- if *aarch64 {
- cmd.Env = append(cmd.Env, "GOARCH=arm64")
- } else {
- cmd.Env = append(cmd.Env, "GOARCH=arm")
- cmd.Env = append(cmd.Env, fmt.Sprintf("GOARM=%d", *arm))
- }
- return cmd.Run()
-}
-
-// setWorkingDirectory walks up directories as needed until the current working
-// directory is the top of a BoringSSL checkout.
-func setWorkingDirectory() {
- for i := 0; i < 64; i++ {
- if _, err := os.Stat("BUILDING.md"); err == nil {
- return
- }
- os.Chdir("..")
- }
-
- panic("Couldn't find BUILDING.md in a parent directory!")
-}
-
-type test []string
-
-func parseTestConfig(filename string) ([]test, error) {
- in, err := os.Open(filename)
- if err != nil {
- return nil, err
- }
- defer in.Close()
-
- decoder := json.NewDecoder(in)
- var result []test
- if err := decoder.Decode(&result); err != nil {
- return nil, err
- }
- return result, nil
-}
-
-func copyFile(dst, src string) error {
- srcFile, err := os.Open(src)
- if err != nil {
- return err
- }
- defer srcFile.Close()
-
- srcInfo, err := srcFile.Stat()
- if err != nil {
- return err
- }
-
- dir := filepath.Dir(dst)
- if err := os.MkdirAll(dir, 0777); err != nil {
- return err
- }
-
- dstFile, err := os.OpenFile(dst, os.O_CREATE|os.O_WRONLY, srcInfo.Mode())
- if err != nil {
- return err
- }
- defer dstFile.Close()
-
- _, err = io.Copy(dstFile, srcFile)
- return err
-}
-
-func main() {
- flag.Parse()
-
- if *suite == "all" && *jsonOutput != "" {
- fmt.Printf("To use -json-output flag, select only one test suite with -suite.\n")
- os.Exit(1)
- }
-
- setWorkingDirectory()
-
- // Clear the target directory.
- if err := adb("shell", "rm -Rf /data/local/tmp/boringssl-tmp"); err != nil {
- fmt.Printf("Failed to clear target directory: %s\n", err)
- os.Exit(1)
- }
-
- // Stage everything in a temporary directory.
- tmpDir, err := ioutil.TempDir("", "boringssl-android")
- if err != nil {
- fmt.Printf("Error making temporary directory: %s\n", err)
- os.Exit(1)
- }
- defer os.RemoveAll(tmpDir)
-
- var binaries, files []string
-
- if enableUnitTests() {
- files = append(files,
- "util/all_tests.json",
- "BUILDING.md",
- )
-
- tests, err := parseTestConfig("util/all_tests.json")
- if err != nil {
- fmt.Printf("Failed to parse input: %s\n", err)
- os.Exit(1)
- }
-
- seenBinary := make(map[string]struct{})
- for _, test := range tests {
- if _, ok := seenBinary[test[0]]; !ok {
- binaries = append(binaries, test[0])
- seenBinary[test[0]] = struct{}{}
- }
- for _, arg := range test[1:] {
- if strings.Contains(arg, "/") {
- files = append(files, arg)
- }
- }
- }
-
- fmt.Printf("Building all_tests...\n")
- if err := goTool("build", "-o", filepath.Join(tmpDir, "util/all_tests"), "util/all_tests.go"); err != nil {
- fmt.Printf("Error building all_tests.go: %s\n", err)
- os.Exit(1)
- }
- }
-
- if enableSSLTests() {
- binaries = append(binaries, "ssl/test/bssl_shim")
- files = append(files,
- "BUILDING.md",
- "util/all_tests.json",
- "ssl/test/runner/cert.pem",
- "ssl/test/runner/channel_id_key.pem",
- "ssl/test/runner/ecdsa_p256_cert.pem",
- "ssl/test/runner/ecdsa_p256_key.pem",
- "ssl/test/runner/ecdsa_p384_cert.pem",
- "ssl/test/runner/ecdsa_p384_key.pem",
- "ssl/test/runner/ecdsa_p521_cert.pem",
- "ssl/test/runner/ecdsa_p521_key.pem",
- "ssl/test/runner/key.pem",
- "ssl/test/runner/rsa_1024_cert.pem",
- "ssl/test/runner/rsa_1024_key.pem",
- )
-
- fmt.Printf("Building runner...\n")
- if err := goTool("test", "-c", "-o", filepath.Join(tmpDir, "ssl/test/runner/runner"), "./ssl/test/runner/"); err != nil {
- fmt.Printf("Error building runner: %s\n", err)
- os.Exit(1)
- }
- }
-
- fmt.Printf("Copying test binaries...\n")
- for _, binary := range binaries {
- if err := copyFile(filepath.Join(tmpDir, "build", binary), filepath.Join(*buildDir, binary)); err != nil {
- fmt.Printf("Failed to copy %s: %s\n", binary, err)
- os.Exit(1)
- }
- }
-
- fmt.Printf("Copying data files...\n")
- for _, file := range files {
- if err := copyFile(filepath.Join(tmpDir, file), file); err != nil {
- fmt.Printf("Failed to copy %s: %s\n", file, err)
- os.Exit(1)
- }
- }
-
- fmt.Printf("Uploading files...\n")
- if err := adb("push", "-p", tmpDir, "/data/local/tmp/boringssl-tmp"); err != nil {
- fmt.Printf("Failed to push runner: %s\n", err)
- os.Exit(1)
- }
-
- var unitTestExit int
- if enableUnitTests() {
- fmt.Printf("Running unit tests...\n")
- unitTestExit, err = adbShell(fmt.Sprintf("cd /data/local/tmp/boringssl-tmp && ./util/all_tests -json-output results.json %s", *allTestsArgs))
- if err != nil {
- fmt.Printf("Failed to run unit tests: %s\n", err)
- os.Exit(1)
- }
- }
-
- var sslTestExit int
- if enableSSLTests() {
- fmt.Printf("Running SSL tests...\n")
- sslTestExit, err = adbShell(fmt.Sprintf("cd /data/local/tmp/boringssl-tmp/ssl/test/runner && ./runner -json-output ../../../results.json %s", *runnerArgs))
- if err != nil {
- fmt.Printf("Failed to run SSL tests: %s\n", err)
- os.Exit(1)
- }
- }
-
- if *jsonOutput != "" {
- if err := adb("pull", "-p", "/data/local/tmp/boringssl-tmp/results.json", *jsonOutput); err != nil {
- fmt.Printf("Failed to extract results.json: %s\n", err)
- os.Exit(1)
- }
- }
-
- if unitTestExit != 0 {
- os.Exit(unitTestExit)
- }
-
- if sslTestExit != 0 {
- os.Exit(sslTestExit)
- }
-}
Deleted: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/api/androidvideotracksource.cc (212307 => 212308)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/api/androidvideotracksource.cc 2017-02-14 18:51:24 UTC (rev 212307)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/api/androidvideotracksource.cc 2017-02-14 18:52:31 UTC (rev 212308)
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "webrtc/api/androidvideotracksource.h"
-
-#include <utility>
-
-namespace webrtc {
-
-AndroidVideoTrackSource::AndroidVideoTrackSource(rtc::Thread* signaling_thread,
- JNIEnv* jni,
- jobject j_egl_context,
- bool is_screencast)
- : signaling_thread_(signaling_thread),
- surface_texture_helper_(webrtc_jni::SurfaceTextureHelper::create(
- jni,
- "Camera SurfaceTextureHelper",
- j_egl_context)),
- is_screencast_(is_screencast) {
- LOG(LS_INFO) << "AndroidVideoTrackSource ctor";
- camera_thread_checker_.DetachFromThread();
-}
-
-void AndroidVideoTrackSource::SetState(SourceState state) {
- if (rtc::Thread::Current() != signaling_thread_) {
- invoker_.AsyncInvoke<void>(
- RTC_FROM_HERE, signaling_thread_,
- rtc::Bind(&AndroidVideoTrackSource::SetState, this, state));
- return;
- }
-
- if (state_ != state) {
- state_ = state;
- FireOnChanged();
- }
-}
-
-void AndroidVideoTrackSource::OnByteBufferFrameCaptured(const void* frame_data,
- int length,
- int width,
- int height,
- int rotation,
- int64_t timestamp_ns) {
- RTC_DCHECK(camera_thread_checker_.CalledOnValidThread());
- RTC_DCHECK(rotation == 0 || rotation == 90 || rotation == 180 ||
- rotation == 270);
-
- int64_t camera_time_us = timestamp_ns / rtc::kNumNanosecsPerMicrosec;
- int64_t translated_camera_time_us =
- timestamp_aligner_.TranslateTimestamp(camera_time_us, rtc::TimeMicros());
-
- int adapted_width;
- int adapted_height;
- int crop_width;
- int crop_height;
- int crop_x;
- int crop_y;
-
- if (!AdaptFrame(width, height, camera_time_us,
- &adapted_width, &adapted_height, &crop_width, &crop_height,
- &crop_x, &crop_y)) {
- return;
- }
-
- const uint8_t* y_plane = static_cast<const uint8_t*>(frame_data);
- const uint8_t* uv_plane = y_plane + width * height;
- const int uv_width = (width + 1) / 2;
-
- RTC_CHECK_GE(length, width * height + 2 * uv_width * ((height + 1) / 2));
-
- // Can only crop at even pixels.
- crop_x &= ~1;
- crop_y &= ~1;
- // Crop just by modifying pointers.
- y_plane += width * crop_y + crop_x;
- uv_plane += uv_width * crop_y + crop_x;
-
- rtc::scoped_refptr<webrtc::I420Buffer> buffer =
- buffer_pool_.CreateBuffer(adapted_width, adapted_height);
-
- nv12toi420_scaler_.NV12ToI420Scale(
- y_plane, width,
- uv_plane, uv_width * 2,
- crop_width, crop_height,
- buffer->MutableDataY(), buffer->StrideY(),
- // Swap U and V, since we have NV21, not NV12.
- buffer->MutableDataV(), buffer->StrideV(),
- buffer->MutableDataU(), buffer->StrideU(),
- buffer->width(), buffer->height());
-
- OnFrame(VideoFrame(buffer, static_cast<webrtc::VideoRotation>(rotation),
- translated_camera_time_us));
-}
-
-void AndroidVideoTrackSource::OnTextureFrameCaptured(
- int width,
- int height,
- int rotation,
- int64_t timestamp_ns,
- const webrtc_jni::NativeHandleImpl& handle) {
- RTC_DCHECK(camera_thread_checker_.CalledOnValidThread());
- RTC_DCHECK(rotation == 0 || rotation == 90 || rotation == 180 ||
- rotation == 270);
-
- int64_t camera_time_us = timestamp_ns / rtc::kNumNanosecsPerMicrosec;
- int64_t translated_camera_time_us =
- timestamp_aligner_.TranslateTimestamp(camera_time_us, rtc::TimeMicros());
-
- int adapted_width;
- int adapted_height;
- int crop_width;
- int crop_height;
- int crop_x;
- int crop_y;
-
- if (!AdaptFrame(width, height, camera_time_us,
- &adapted_width, &adapted_height, &crop_width, &crop_height,
- &crop_x, &crop_y)) {
- surface_texture_helper_->ReturnTextureFrame();
- return;
- }
-
- webrtc_jni::Matrix matrix = handle.sampling_matrix;
-
- matrix.Crop(crop_width / static_cast<float>(width),
- crop_height / static_cast<float>(height),
- crop_x / static_cast<float>(width),
- crop_y / static_cast<float>(height));
-
- // Make a local copy, since value of apply_rotation() may change
- // under our feet.
- bool do_rotate = apply_rotation();
-
- if (do_rotate) {
- if (rotation == webrtc::kVideoRotation_90 ||
- rotation == webrtc::kVideoRotation_270) {
- std::swap(adapted_width, adapted_height);
- }
- matrix.Rotate(static_cast<webrtc::VideoRotation>(rotation));
- }
-
- OnFrame(VideoFrame(
- surface_texture_helper_->CreateTextureFrame(
- adapted_width, adapted_height,
- webrtc_jni::NativeHandleImpl(handle.oes_texture_id, matrix)),
- do_rotate ? webrtc::kVideoRotation_0
- : static_cast<webrtc::VideoRotation>(rotation),
- translated_camera_time_us));
-}
-
-void AndroidVideoTrackSource::OnOutputFormatRequest(int width,
- int height,
- int fps) {
- cricket::VideoFormat format(width, height,
- cricket::VideoFormat::FpsToInterval(fps), 0);
- video_adapter()->OnOutputFormatRequest(format);
-}
-
-} // namespace webrtc
Deleted: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/api/androidvideotracksource.h (212307 => 212308)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/api/androidvideotracksource.h 2017-02-14 18:51:24 UTC (rev 212307)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/api/androidvideotracksource.h 2017-02-14 18:52:31 UTC (rev 212308)
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef WEBRTC_API_ANDROIDVIDEOTRACKSOURCE_H_
-#define WEBRTC_API_ANDROIDVIDEOTRACKSOURCE_H_
-
-#include "webrtc/api/android/jni/native_handle_impl.h"
-#include "webrtc/api/android/jni/surfacetexturehelper_jni.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/thread_checker.h"
-#include "webrtc/base/timestampaligner.h"
-#include "webrtc/common_video/include/i420_buffer_pool.h"
-#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/media/base/adaptedvideotracksource.h"
-
-namespace webrtc {
-
-class AndroidVideoTrackSource : public rtc::AdaptedVideoTrackSource {
- public:
- AndroidVideoTrackSource(rtc::Thread* signaling_thread,
- JNIEnv* jni,
- jobject j_egl_context,
- bool is_screencast = false);
-
- bool is_screencast() const override { return is_screencast_; }
-
- // Indicates that the encoder should denoise video before encoding it.
- // If it is not set, the default configuration is used which is different
- // depending on video codec.
- rtc::Optional<bool> needs_denoising() const override {
- return rtc::Optional<bool>(false);
- }
-
- // Called by the native capture observer
- void SetState(SourceState state);
-
- SourceState state() const override { return state_; }
-
- bool remote() const override { return false; }
-
- void OnByteBufferFrameCaptured(const void* frame_data,
- int length,
- int width,
- int height,
- int rotation,
- int64_t timestamp_ns);
-
- void OnTextureFrameCaptured(int width,
- int height,
- int rotation,
- int64_t timestamp_ns,
- const webrtc_jni::NativeHandleImpl& handle);
-
- void OnOutputFormatRequest(int width, int height, int fps);
-
- rtc::scoped_refptr<webrtc_jni::SurfaceTextureHelper>
- surface_texture_helper() {
- return surface_texture_helper_;
- }
-
- private:
- rtc::Thread* signaling_thread_;
- rtc::AsyncInvoker invoker_;
- rtc::ThreadChecker camera_thread_checker_;
- SourceState state_;
- rtc::VideoBroadcaster broadcaster_;
- rtc::TimestampAligner timestamp_aligner_;
- webrtc::NV12ToI420Scaler nv12toi420_scaler_;
- webrtc::I420BufferPool buffer_pool_;
- rtc::scoped_refptr<webrtc_jni::SurfaceTextureHelper> surface_texture_helper_;
- const bool is_screencast_;
-};
-
-} // namespace webrtc
-
-#endif // WEBRTC_API_ANDROIDVIDEOTRACKSOURCE_H_
Deleted: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/api/test/androidtestinitializer.cc (212307 => 212308)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/api/test/androidtestinitializer.cc 2017-02-14 18:51:24 UTC (rev 212307)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/api/test/androidtestinitializer.cc 2017-02-14 18:52:31 UTC (rev 212308)
@@ -1,61 +0,0 @@
-/*
- * Copyright 2015 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "webrtc/api/test/androidtestinitializer.h"
-
-#include <pthread.h>
-
-#include "webrtc/base/ignore_wundef.h"
-
-// Note: this dependency is dangerous since it reaches into Chromium's base.
-// There's a risk of e.g. macro clashes. This file may only be used in tests.
-// Since we use Chromes build system for creating the gtest binary, this should
-// be fine.
-RTC_PUSH_IGNORING_WUNDEF()
-#include "base/android/context_utils.h"
-#include "base/android/jni_android.h"
-RTC_POP_IGNORING_WUNDEF()
-
-#include "webrtc/api/android/jni/classreferenceholder.h"
-#include "webrtc/api/android/jni/jni_helpers.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/voice_engine/include/voe_base.h"
-
-namespace webrtc {
-
-namespace {
-
-static pthread_once_t g_initialize_once = PTHREAD_ONCE_INIT;
-
-// There can only be one JNI_OnLoad in each binary. So since this is a GTEST
-// C++ runner binary, we want to initialize the same global objects we normally
-// do if this had been a Java binary.
-void EnsureInitializedOnce() {
- RTC_CHECK(::base::android::IsVMInitialized());
- JNIEnv* jni = ::base::android::AttachCurrentThread();
- JavaVM* jvm = NULL;
- RTC_CHECK_EQ(0, jni->GetJavaVM(&jvm));
- jobject context = ::base::android::GetApplicationContext().obj();
-
- RTC_CHECK_GE(webrtc_jni::InitGlobalJniVariables(jvm), 0);
- RTC_CHECK(rtc::InitializeSSL()) << "Failed to InitializeSSL()";
- webrtc_jni::LoadGlobalClassReferenceHolder();
-
- webrtc::VoiceEngine::SetAndroidObjects(jvm, context);
-}
-
-} // anonymous namespace
-
-void InitializeAndroidObjects() {
- RTC_CHECK_EQ(0, pthread_once(&g_initialize_once, &EnsureInitializedOnce));
-}
-
-} // namespace webrtc
Deleted: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/api/test/androidtestinitializer.h (212307 => 212308)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/api/test/androidtestinitializer.h 2017-02-14 18:51:24 UTC (rev 212307)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/api/test/androidtestinitializer.h 2017-02-14 18:52:31 UTC (rev 212308)
@@ -1,20 +0,0 @@
-/*
- * Copyright 2015 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef WEBRTC_API_TEST_ANDROIDTESTINITIALIZER_H_
-#define WEBRTC_API_TEST_ANDROIDTESTINITIALIZER_H_
-
-namespace webrtc {
-
-void InitializeAndroidObjects();
-
-} // namespace webrtc
-
-#endif // WEBRTC_API_TEST_ANDROIDTESTINITIALIZER_H_
Deleted: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/ifaddrs-android.cc (212307 => 212308)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/ifaddrs-android.cc 2017-02-14 18:51:24 UTC (rev 212307)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/ifaddrs-android.cc 2017-02-14 18:52:31 UTC (rev 212308)
@@ -1,223 +0,0 @@
-/*
- * Copyright 2012 The WebRTC Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#if defined(WEBRTC_ANDROID)
-#include "webrtc/base/ifaddrs-android.h"
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/utsname.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
-#include <net/if.h>
-#include <unistd.h>
-#include <errno.h>
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
-
-namespace {
-
-struct netlinkrequest {
- nlmsghdr header;
- ifaddrmsg msg;
-};
-
-const int kMaxReadSize = 4096;
-
-} // namespace
-
-namespace rtc {
-
-int set_ifname(struct ifaddrs* ifaddr, int interface) {
- char buf[IFNAMSIZ] = {0};
- char* name = if_indextoname(interface, buf);
- if (name == NULL) {
- return -1;
- }
- ifaddr->ifa_name = new char[strlen(name) + 1];
- strncpy(ifaddr->ifa_name, name, strlen(name) + 1);
- return 0;
-}
-
-int set_flags(struct ifaddrs* ifaddr) {
- int fd = socket(AF_INET, SOCK_DGRAM, 0);
- if (fd == -1) {
- return -1;
- }
- ifreq ifr;
- memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, ifaddr->ifa_name, IFNAMSIZ - 1);
- int rc = ioctl(fd, SIOCGIFFLAGS, &ifr);
- close(fd);
- if (rc == -1) {
- return -1;
- }
- ifaddr->ifa_flags = ifr.ifr_flags;
- return 0;
-}
-
-int set_addresses(struct ifaddrs* ifaddr, ifaddrmsg* msg, void* data,
- size_t len) {
- if (msg->ifa_family == AF_INET) {
- sockaddr_in* sa = new sockaddr_in;
- sa->sin_family = AF_INET;
- memcpy(&sa->sin_addr, data, len);
- ifaddr->ifa_addr = reinterpret_cast<sockaddr*>(sa);
- } else if (msg->ifa_family == AF_INET6) {
- sockaddr_in6* sa = new sockaddr_in6;
- sa->sin6_family = AF_INET6;
- sa->sin6_scope_id = msg->ifa_index;
- memcpy(&sa->sin6_addr, data, len);
- ifaddr->ifa_addr = reinterpret_cast<sockaddr*>(sa);
- } else {
- return -1;
- }
- return 0;
-}
-
-int make_prefixes(struct ifaddrs* ifaddr, int family, int prefixlen) {
- char* prefix = NULL;
- if (family == AF_INET) {
- sockaddr_in* mask = new sockaddr_in;
- mask->sin_family = AF_INET;
- memset(&mask->sin_addr, 0, sizeof(in_addr));
- ifaddr->ifa_netmask = reinterpret_cast<sockaddr*>(mask);
- if (prefixlen > 32) {
- prefixlen = 32;
- }
- prefix = reinterpret_cast<char*>(&mask->sin_addr);
- } else if (family == AF_INET6) {
- sockaddr_in6* mask = new sockaddr_in6;
- mask->sin6_family = AF_INET6;
- memset(&mask->sin6_addr, 0, sizeof(in6_addr));
- ifaddr->ifa_netmask = reinterpret_cast<sockaddr*>(mask);
- if (prefixlen > 128) {
- prefixlen = 128;
- }
- prefix = reinterpret_cast<char*>(&mask->sin6_addr);
- } else {
- return -1;
- }
- for (int i = 0; i < (prefixlen / 8); i++) {
- *prefix++ = 0xFF;
- }
- char remainder = 0xff;
- remainder <<= (8 - prefixlen % 8);
- *prefix = remainder;
- return 0;
-}
-
-int populate_ifaddrs(struct ifaddrs* ifaddr, ifaddrmsg* msg, void* bytes,
- size_t len) {
- if (set_ifname(ifaddr, msg->ifa_index) != 0) {
- return -1;
- }
- if (set_flags(ifaddr) != 0) {
- return -1;
- }
- if (set_addresses(ifaddr, msg, bytes, len) != 0) {
- return -1;
- }
- if (make_prefixes(ifaddr, msg->ifa_family, msg->ifa_prefixlen) != 0) {
- return -1;
- }
- return 0;
-}
-
-int getifaddrs(struct ifaddrs** result) {
- int fd = socket(PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
- if (fd < 0) {
- return -1;
- }
-
- netlinkrequest ifaddr_request;
- memset(&ifaddr_request, 0, sizeof(ifaddr_request));
- ifaddr_request.header.nlmsg_flags = NLM_F_ROOT | NLM_F_REQUEST;
- ifaddr_request.header.nlmsg_type = RTM_GETADDR;
- ifaddr_request.header.nlmsg_len = NLMSG_LENGTH(sizeof(ifaddrmsg));
-
- ssize_t count = send(fd, &ifaddr_request, ifaddr_request.header.nlmsg_len, 0);
- if (static_cast<size_t>(count) != ifaddr_request.header.nlmsg_len) {
- close(fd);
- return -1;
- }
- struct ifaddrs* start = NULL;
- struct ifaddrs* current = NULL;
- char buf[kMaxReadSize];
- ssize_t amount_read = recv(fd, &buf, kMaxReadSize, 0);
- while (amount_read > 0) {
- nlmsghdr* header = reinterpret_cast<nlmsghdr*>(&buf[0]);
- size_t header_size = static_cast<size_t>(amount_read);
- for ( ; NLMSG_OK(header, header_size);
- header = NLMSG_NEXT(header, header_size)) {
- switch (header->nlmsg_type) {
- case NLMSG_DONE:
- // Success. Return.
- *result = start;
- close(fd);
- return 0;
- case NLMSG_ERROR:
- close(fd);
- freeifaddrs(start);
- return -1;
- case RTM_NEWADDR: {
- ifaddrmsg* address_msg =
- reinterpret_cast<ifaddrmsg*>(NLMSG_DATA(header));
- rtattr* rta = IFA_RTA(address_msg);
- ssize_t payload_len = IFA_PAYLOAD(header);
- while (RTA_OK(rta, payload_len)) {
- if (rta->rta_type == IFA_ADDRESS) {
- int family = address_msg->ifa_family;
- if (family == AF_INET || family == AF_INET6) {
- ifaddrs* newest = new ifaddrs;
- memset(newest, 0, sizeof(ifaddrs));
- if (current) {
- current->ifa_next = newest;
- } else {
- start = newest;
- }
- if (populate_ifaddrs(newest, address_msg, RTA_DATA(rta),
- RTA_PAYLOAD(rta)) != 0) {
- freeifaddrs(start);
- *result = NULL;
- return -1;
- }
- current = newest;
- }
- }
- rta = RTA_NEXT(rta, payload_len);
- }
- break;
- }
- }
- }
- amount_read = recv(fd, &buf, kMaxReadSize, 0);
- }
- close(fd);
- freeifaddrs(start);
- return -1;
-}
-
-void freeifaddrs(struct ifaddrs* addrs) {
- struct ifaddrs* last = NULL;
- struct ifaddrs* cursor = addrs;
- while (cursor) {
- delete[] cursor->ifa_name;
- delete cursor->ifa_addr;
- delete cursor->ifa_netmask;
- last = cursor;
- cursor = cursor->ifa_next;
- delete last;
- }
-}
-
-} // namespace rtc
-#endif // defined(WEBRTC_ANDROID)
Deleted: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/ifaddrs-android.h (212307 => 212308)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/ifaddrs-android.h 2017-02-14 18:51:24 UTC (rev 212307)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/base/ifaddrs-android.h 2017-02-14 18:52:31 UTC (rev 212308)
@@ -1,39 +0,0 @@
-/*
- * Copyright 2013 The WebRTC Project Authors. All rights reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef WEBRTC_BASE_IFADDRS_ANDROID_H_
-#define WEBRTC_BASE_IFADDRS_ANDROID_H_
-
-#include <stdio.h>
-#include <sys/socket.h>
-
-
-// Implementation of getifaddrs for Android.
-// Fills out a list of ifaddr structs (see below) which contain information
-// about every network interface available on the host.
-// See 'man getifaddrs' on Linux or OS X (nb: it is not a POSIX function).
-struct ifaddrs {
- struct ifaddrs* ifa_next;
- char* ifa_name;
- unsigned int ifa_flags;
- struct sockaddr* ifa_addr;
- struct sockaddr* ifa_netmask;
- // Real ifaddrs has broadcast, point to point and data members.
- // We don't need them (yet?).
-};
-
-namespace rtc {
-
-int getifaddrs(struct ifaddrs** result);
-void freeifaddrs(struct ifaddrs* addrs);
-
-} // namespace rtc
-
-#endif // WEBRTC_BASE_IFADDRS_ANDROID_H_
Deleted: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/utility/include/helpers_android.h (212307 => 212308)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/utility/include/helpers_android.h 2017-02-14 18:51:24 UTC (rev 212307)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/utility/include/helpers_android.h 2017-02-14 18:52:31 UTC (rev 212308)
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_
-#define WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_
-
-#include <jni.h>
-#include <string>
-
-// Abort the process if |jni| has a Java exception pending.
-// TODO(henrika): merge with CHECK_JNI_EXCEPTION() in jni_helpers.h.
-#define CHECK_EXCEPTION(jni) \
- RTC_CHECK(!jni->ExceptionCheck()) \
- << (jni->ExceptionDescribe(), jni->ExceptionClear(), "")
-
-namespace webrtc {
-
-// Return a |JNIEnv*| usable on this thread or NULL if this thread is detached.
-JNIEnv* GetEnv(JavaVM* jvm);
-
-// Return a |jlong| that will correctly convert back to |ptr|. This is needed
-// because the alternative (of silently passing a 32-bit pointer to a vararg
-// function expecting a 64-bit param) picks up garbage in the high 32 bits.
-jlong PointerTojlong(void* ptr);
-
-// JNIEnv-helper methods that wraps the API which uses the JNI interface
-// pointer (JNIEnv*). It allows us to RTC_CHECK success and that no Java
-// exception is thrown while calling the method.
-jmethodID GetMethodID(
- JNIEnv* jni, jclass c, const char* name, const char* signature);
-
-jmethodID GetStaticMethodID(
- JNIEnv* jni, jclass c, const char* name, const char* signature);
-
-jclass FindClass(JNIEnv* jni, const char* name);
-
-jobject NewGlobalRef(JNIEnv* jni, jobject o);
-
-void DeleteGlobalRef(JNIEnv* jni, jobject o);
-
-// Return thread ID as a string.
-std::string GetThreadId();
-
-// Return thread ID as string suitable for debug logging.
-std::string GetThreadInfo();
-
-// Attach thread to JVM if necessary and detach at scope end if originally
-// attached.
-class AttachThreadScoped {
- public:
- explicit AttachThreadScoped(JavaVM* jvm);
- ~AttachThreadScoped();
- JNIEnv* env();
-
- private:
- bool attached_;
- JavaVM* jvm_;
- JNIEnv* env_;
-};
-
-// Scoped holder for global Java refs.
-template<class T> // T is jclass, jobject, jintArray, etc.
-class ScopedGlobalRef {
- public:
- ScopedGlobalRef(JNIEnv* jni, T obj)
- : jni_(jni), obj_(static_cast<T>(NewGlobalRef(jni, obj))) {}
- ~ScopedGlobalRef() {
- DeleteGlobalRef(jni_, obj_);
- }
- T operator*() const {
- return obj_;
- }
- private:
- JNIEnv* jni_;
- T obj_;
-};
-
-} // namespace webrtc
-
-#endif // WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_
Deleted: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/utility/include/jvm_android.h (212307 => 212308)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/utility/include/jvm_android.h 2017-02-14 18:51:24 UTC (rev 212307)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/utility/include/jvm_android.h 2017-02-14 18:52:31 UTC (rev 212308)
@@ -1,187 +0,0 @@
-/*
- * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_
-#define WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_
-
-#include <jni.h>
-
-#include <memory>
-#include <string>
-
-#include "webrtc/base/thread_checker.h"
-#include "webrtc/modules/utility/include/helpers_android.h"
-
-namespace webrtc {
-
-// The JNI interface pointer (JNIEnv) is valid only in the current thread.
-// Should another thread need to access the Java VM, it must first call
-// AttachCurrentThread() to attach itself to the VM and obtain a JNI interface
-// pointer. The native thread remains attached to the VM until it calls
-// DetachCurrentThread() to detach.
-class AttachCurrentThreadIfNeeded {
- public:
- AttachCurrentThreadIfNeeded();
- ~AttachCurrentThreadIfNeeded();
-
- private:
- rtc::ThreadChecker thread_checker_;
- bool attached_;
-};
-
-// This class is created by the NativeRegistration class and is used to wrap
-// the actual Java object handle (jobject) on which we can call methods from
-// C++ in to Java. See example in JVM for more details.
-// TODO(henrika): extend support for type of function calls.
-class GlobalRef {
- public:
- GlobalRef(JNIEnv* jni, jobject object);
- ~GlobalRef();
-
- jboolean CallBooleanMethod(jmethodID methodID, ...);
- jint CallIntMethod(jmethodID methodID, ...);
- void CallVoidMethod(jmethodID methodID, ...);
-
- private:
- JNIEnv* const jni_;
- const jobject j_object_;
-};
-
-// Wraps the jclass object on which we can call GetMethodId() functions to
-// query method IDs.
-class JavaClass {
- public:
- JavaClass(JNIEnv* jni, jclass clazz) : jni_(jni), j_class_(clazz) {}
- ~JavaClass() {}
-
- jmethodID GetMethodId(const char* name, const char* signature);
- jmethodID GetStaticMethodId(const char* name, const char* signature);
- jobject CallStaticObjectMethod(jmethodID methodID, ...);
- jint CallStaticIntMethod(jmethodID methodID, ...);
-
- protected:
- JNIEnv* const jni_;
- jclass const j_class_;
-};
-
-// Adds support of the NewObject factory method to the JavaClass class.
-// See example in JVM for more details on how to use it.
-class NativeRegistration : public JavaClass {
- public:
- NativeRegistration(JNIEnv* jni, jclass clazz);
- ~NativeRegistration();
-
- std::unique_ptr<GlobalRef> NewObject(
- const char* name, const char* signature, ...);
-
- private:
- JNIEnv* const jni_;
-};
-
-// This class is created by the JVM class and is used to expose methods that
-// needs the JNI interface pointer but its main purpose is to create a
-// NativeRegistration object given name of a Java class and a list of native
-// methods. See example in JVM for more details.
-class JNIEnvironment {
- public:
- explicit JNIEnvironment(JNIEnv* jni);
- ~JNIEnvironment();
-
- // Registers native methods with the Java class specified by |name|.
- // Note that the class name must be one of the names in the static
- // |loaded_classes| array defined in jvm_android.cc.
- // This method must be called on the construction thread.
- std::unique_ptr<NativeRegistration> RegisterNatives(
- const char* name, const JNINativeMethod *methods, int num_methods);
-
- // Converts from Java string to std::string.
- // This method must be called on the construction thread.
- std::string JavaToStdString(const jstring& j_string);
-
- private:
- rtc::ThreadChecker thread_checker_;
- JNIEnv* const jni_;
-};
-
-// Main class for working with Java from C++ using JNI in WebRTC.
-//
-// Example usage:
-//
-// // At initialization (e.g. in JNI_OnLoad), call JVM::Initialize.
-// JNIEnv* jni = ::base::android::AttachCurrentThread();
-// JavaVM* jvm = NULL;
-// jni->GetJavaVM(&jvm);
-// jobject context = ::base::android::GetApplicationContext();
-// webrtc::JVM::Initialize(jvm, context);
-//
-// // Header (.h) file of example class called User.
-// std::unique_ptr<JNIEnvironment> env;
-// std::unique_ptr<NativeRegistration> reg;
-// std::unique_ptr<GlobalRef> obj;
-//
-// // Construction (in .cc file) of User class.
-// User::User() {
-// // Calling thread must be attached to the JVM.
-// env = JVM::GetInstance()->environment();
-// reg = env->RegisterNatives("org/webrtc/WebRtcTest", ,);
-// obj = reg->NewObject("<init>", ,);
-// }
-//
-// // Each User method can now use |reg| and |obj| and call Java functions
-// // in WebRtcTest.java, e.g. boolean init() {}.
-// bool User::Foo() {
-// jmethodID id = reg->GetMethodId("init", "()Z");
-// return obj->CallBooleanMethod(id);
-// }
-//
-// // And finally, e.g. in JNI_OnUnLoad, call JVM::Uninitialize.
-// JVM::Uninitialize();
-class JVM {
- public:
- // Stores global handles to the Java VM interface and the application context.
- // Should be called once on a thread that is attached to the JVM.
- static void Initialize(JavaVM* jvm, jobject context);
- // Clears handles stored in Initialize(). Must be called on same thread as
- // Initialize().
- static void Uninitialize();
- // Gives access to the global Java VM interface pointer, which then can be
- // used to create a valid JNIEnvironment object or to get a JavaClass object.
- static JVM* GetInstance();
-
- // Creates a JNIEnvironment object.
- // This method returns a NULL pointer if AttachCurrentThread() has not been
- // called successfully. Use the AttachCurrentThreadIfNeeded class if needed.
- std::unique_ptr<JNIEnvironment> environment();
-
- // Returns a JavaClass object given class |name|.
- // Note that the class name must be one of the names in the static
- // |loaded_classes| array defined in jvm_android.cc.
- // This method must be called on the construction thread.
- JavaClass GetClass(const char* name);
-
- // TODO(henrika): can we make these private?
- JavaVM* jvm() const { return jvm_; }
- jobject context() const { return context_; }
-
- protected:
- JVM(JavaVM* jvm, jobject context);
- ~JVM();
-
- private:
- JNIEnv* jni() const { return GetEnv(jvm_); }
-
- rtc::ThreadChecker thread_checker_;
- JavaVM* const jvm_;
- jobject context_;
-};
-
-} // namespace webrtc
-
-#endif // WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_
Deleted: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/utility/source/helpers_android.cc (212307 => 212308)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/utility/source/helpers_android.cc 2017-02-14 18:51:24 UTC (rev 212307)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/utility/source/helpers_android.cc 2017-02-14 18:52:31 UTC (rev 212308)
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "webrtc/base/checks.h"
-#include "webrtc/modules/utility/include/helpers_android.h"
-
-#include <android/log.h>
-#include <assert.h>
-#include <pthread.h>
-#include <stddef.h>
-#include <unistd.h>
-
-#define TAG "HelpersAndroid"
-#define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, TAG, __VA_ARGS__)
-
-namespace webrtc {
-
-JNIEnv* GetEnv(JavaVM* jvm) {
- void* env = NULL;
- jint status = jvm->GetEnv(&env, JNI_VERSION_1_6);
- RTC_CHECK(((env != NULL) && (status == JNI_OK)) ||
- ((env == NULL) && (status == JNI_EDETACHED)))
- << "Unexpected GetEnv return: " << status << ":" << env;
- return reinterpret_cast<JNIEnv*>(env);
-}
-
-// Return a |jlong| that will correctly convert back to |ptr|. This is needed
-// because the alternative (of silently passing a 32-bit pointer to a vararg
-// function expecting a 64-bit param) picks up garbage in the high 32 bits.
-jlong PointerTojlong(void* ptr) {
- static_assert(sizeof(intptr_t) <= sizeof(jlong),
- "Time to rethink the use of jlongs");
- // Going through intptr_t to be obvious about the definedness of the
- // conversion from pointer to integral type. intptr_t to jlong is a standard
- // widening by the static_assert above.
- jlong ret = reinterpret_cast<intptr_t>(ptr);
- RTC_DCHECK(reinterpret_cast<void*>(ret) == ptr);
- return ret;
-}
-
-jmethodID GetMethodID (
- JNIEnv* jni, jclass c, const char* name, const char* signature) {
- jmethodID m = jni->GetMethodID(c, name, signature);
- CHECK_EXCEPTION(jni) << "Error during GetMethodID: " << name << ", "
- << signature;
- RTC_CHECK(m) << name << ", " << signature;
- return m;
-}
-
-jmethodID GetStaticMethodID (
- JNIEnv* jni, jclass c, const char* name, const char* signature) {
- jmethodID m = jni->GetStaticMethodID(c, name, signature);
- CHECK_EXCEPTION(jni) << "Error during GetStaticMethodID: " << name << ", "
- << signature;
- RTC_CHECK(m) << name << ", " << signature;
- return m;
-}
-
-jclass FindClass(JNIEnv* jni, const char* name) {
- jclass c = jni->FindClass(name);
- CHECK_EXCEPTION(jni) << "Error during FindClass: " << name;
- RTC_CHECK(c) << name;
- return c;
-}
-
-jobject NewGlobalRef(JNIEnv* jni, jobject o) {
- jobject ret = jni->NewGlobalRef(o);
- CHECK_EXCEPTION(jni) << "Error during NewGlobalRef";
- RTC_CHECK(ret);
- return ret;
-}
-
-void DeleteGlobalRef(JNIEnv* jni, jobject o) {
- jni->DeleteGlobalRef(o);
- CHECK_EXCEPTION(jni) << "Error during DeleteGlobalRef";
-}
-
-std::string GetThreadId() {
- char buf[21]; // Big enough to hold a kuint64max plus terminating NULL.
- int thread_id = gettid();
- RTC_CHECK_LT(snprintf(buf, sizeof(buf), "%i", thread_id),
- static_cast<int>(sizeof(buf)))
- << "Thread id is bigger than uint64??";
- return std::string(buf);
-}
-
-std::string GetThreadInfo() {
- return "@[tid=" + GetThreadId() + "]";
-}
-
-AttachThreadScoped::AttachThreadScoped(JavaVM* jvm)
- : attached_(false), jvm_(jvm), env_(NULL) {
- env_ = GetEnv(jvm);
- if (!env_) {
- // Adding debug log here so we can track down potential leaks and figure
- // out why we sometimes see "Native thread exiting without having called
- // DetachCurrentThread" in logcat outputs.
- ALOGD("Attaching thread to JVM%s", GetThreadInfo().c_str());
- jint res = jvm->AttachCurrentThread(&env_, NULL);
- attached_ = (res == JNI_OK);
- RTC_CHECK(attached_) << "AttachCurrentThread failed: " << res;
- }
-}
-
-AttachThreadScoped::~AttachThreadScoped() {
- if (attached_) {
- ALOGD("Detaching thread from JVM%s", GetThreadInfo().c_str());
- jint res = jvm_->DetachCurrentThread();
- RTC_CHECK(res == JNI_OK) << "DetachCurrentThread failed: " << res;
- RTC_CHECK(!GetEnv(jvm_));
- }
-}
-
-JNIEnv* AttachThreadScoped::env() { return env_; }
-
-} // namespace webrtc
Deleted: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/utility/source/jvm_android.cc (212307 => 212308)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/utility/source/jvm_android.cc 2017-02-14 18:51:24 UTC (rev 212307)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/modules/utility/source/jvm_android.cc 2017-02-14 18:52:31 UTC (rev 212308)
@@ -1,276 +0,0 @@
-/*
- * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include <android/log.h>
-
-#include <memory>
-
-#include "webrtc/modules/utility/include/jvm_android.h"
-
-#include "webrtc/base/checks.h"
-
-#define TAG "JVM"
-#define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, TAG, __VA_ARGS__)
-#define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, TAG, __VA_ARGS__)
-
-namespace webrtc {
-
-JVM* g_jvm;
-
-// TODO(henrika): add more clases here if needed.
-struct {
- const char* name;
- jclass clazz;
-} loaded_classes[] = {
- {"org/webrtc/voiceengine/BuildInfo", nullptr},
- {"org/webrtc/voiceengine/WebRtcAudioManager", nullptr},
- {"org/webrtc/voiceengine/WebRtcAudioRecord", nullptr},
- {"org/webrtc/voiceengine/WebRtcAudioTrack", nullptr},
-};
-
-// Android's FindClass() is trickier than usual because the app-specific
-// ClassLoader is not consulted when there is no app-specific frame on the
-// stack. Consequently, we only look up all classes once in native WebRTC.
-// http://developer.android.com/training/articles/perf-jni.html#faq_FindClass
-void LoadClasses(JNIEnv* jni) {
- ALOGD("LoadClasses");
- for (auto& c : loaded_classes) {
- jclass localRef = FindClass(jni, c.name);
- ALOGD("name: %s", c.name);
- CHECK_EXCEPTION(jni) << "Error during FindClass: " << c.name;
- RTC_CHECK(localRef) << c.name;
- jclass globalRef = reinterpret_cast<jclass>(jni->NewGlobalRef(localRef));
- CHECK_EXCEPTION(jni) << "Error during NewGlobalRef: " << c.name;
- RTC_CHECK(globalRef) << c.name;
- c.clazz = globalRef;
- }
-}
-
-void FreeClassReferences(JNIEnv* jni) {
- for (auto& c : loaded_classes) {
- jni->DeleteGlobalRef(c.clazz);
- c.clazz = nullptr;
- }
-}
-
-jclass LookUpClass(const char* name) {
- for (auto& c : loaded_classes) {
- if (strcmp(c.name, name) == 0)
- return c.clazz;
- }
- RTC_CHECK(false) << "Unable to find class in lookup table";
- return 0;
-}
-
-// AttachCurrentThreadIfNeeded implementation.
-AttachCurrentThreadIfNeeded::AttachCurrentThreadIfNeeded()
- : attached_(false) {
- ALOGD("AttachCurrentThreadIfNeeded::ctor%s", GetThreadInfo().c_str());
- JavaVM* jvm = JVM::GetInstance()->jvm();
- RTC_CHECK(jvm);
- JNIEnv* jni = GetEnv(jvm);
- if (!jni) {
- ALOGD("Attaching thread to JVM");
- JNIEnv* env = nullptr;
- jint ret = jvm->AttachCurrentThread(&env, nullptr);
- attached_ = (ret == JNI_OK);
- }
-}
-
-AttachCurrentThreadIfNeeded::~AttachCurrentThreadIfNeeded() {
- ALOGD("AttachCurrentThreadIfNeeded::dtor%s", GetThreadInfo().c_str());
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
- if (attached_) {
- ALOGD("Detaching thread from JVM");
- jint res = JVM::GetInstance()->jvm()->DetachCurrentThread();
- RTC_CHECK(res == JNI_OK) << "DetachCurrentThread failed: " << res;
- }
-}
-
-// GlobalRef implementation.
-GlobalRef::GlobalRef(JNIEnv* jni, jobject object)
- : jni_(jni), j_object_(NewGlobalRef(jni, object)) {
- ALOGD("GlobalRef::ctor%s", GetThreadInfo().c_str());
-}
-
-GlobalRef::~GlobalRef() {
- ALOGD("GlobalRef::dtor%s", GetThreadInfo().c_str());
- DeleteGlobalRef(jni_, j_object_);
-}
-
-jboolean GlobalRef::CallBooleanMethod(jmethodID methodID, ...) {
- va_list args;
- va_start(args, methodID);
- jboolean res = jni_->CallBooleanMethodV(j_object_, methodID, args);
- CHECK_EXCEPTION(jni_) << "Error during CallBooleanMethod";
- va_end(args);
- return res;
-}
-
-jint GlobalRef::CallIntMethod(jmethodID methodID, ...) {
- va_list args;
- va_start(args, methodID);
- jint res = jni_->CallIntMethodV(j_object_, methodID, args);
- CHECK_EXCEPTION(jni_) << "Error during CallIntMethod";
- va_end(args);
- return res;
-}
-
-void GlobalRef::CallVoidMethod(jmethodID methodID, ...) {
- va_list args;
- va_start(args, methodID);
- jni_->CallVoidMethodV(j_object_, methodID, args);
- CHECK_EXCEPTION(jni_) << "Error during CallVoidMethod";
- va_end(args);
-}
-
-// NativeRegistration implementation.
-NativeRegistration::NativeRegistration(JNIEnv* jni, jclass clazz)
- : JavaClass(jni, clazz), jni_(jni) {
- ALOGD("NativeRegistration::ctor%s", GetThreadInfo().c_str());
-}
-
-NativeRegistration::~NativeRegistration() {
- ALOGD("NativeRegistration::dtor%s", GetThreadInfo().c_str());
- jni_->UnregisterNatives(j_class_);
- CHECK_EXCEPTION(jni_) << "Error during UnregisterNatives";
-}
-
-std::unique_ptr<GlobalRef> NativeRegistration::NewObject(
- const char* name, const char* signature, ...) {
- ALOGD("NativeRegistration::NewObject%s", GetThreadInfo().c_str());
- va_list args;
- va_start(args, signature);
- jobject obj = jni_->NewObjectV(j_class_,
- GetMethodID(jni_, j_class_, name, signature),
- args);
- CHECK_EXCEPTION(jni_) << "Error during NewObjectV";
- va_end(args);
- return std::unique_ptr<GlobalRef>(new GlobalRef(jni_, obj));
-}
-
-// JavaClass implementation.
-jmethodID JavaClass::GetMethodId(
- const char* name, const char* signature) {
- return GetMethodID(jni_, j_class_, name, signature);
-}
-
-jmethodID JavaClass::GetStaticMethodId(
- const char* name, const char* signature) {
- return GetStaticMethodID(jni_, j_class_, name, signature);
-}
-
-jobject JavaClass::CallStaticObjectMethod(jmethodID methodID, ...) {
- va_list args;
- va_start(args, methodID);
- jobject res = jni_->CallStaticObjectMethod(j_class_, methodID, args);
- CHECK_EXCEPTION(jni_) << "Error during CallStaticObjectMethod";
- return res;
-}
-
-jint JavaClass::CallStaticIntMethod(jmethodID methodID, ...) {
- va_list args;
- va_start(args, methodID);
- jint res = jni_->CallStaticIntMethod(j_class_, methodID, args);
- CHECK_EXCEPTION(jni_) << "Error during CallStaticIntMethod";
- return res;
-}
-
-// JNIEnvironment implementation.
-JNIEnvironment::JNIEnvironment(JNIEnv* jni) : jni_(jni) {
- ALOGD("JNIEnvironment::ctor%s", GetThreadInfo().c_str());
-}
-
-JNIEnvironment::~JNIEnvironment() {
- ALOGD("JNIEnvironment::dtor%s", GetThreadInfo().c_str());
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
-}
-
-std::unique_ptr<NativeRegistration> JNIEnvironment::RegisterNatives(
- const char* name, const JNINativeMethod *methods, int num_methods) {
- ALOGD("JNIEnvironment::RegisterNatives(%s)", name);
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
- jclass clazz = LookUpClass(name);
- jni_->RegisterNatives(clazz, methods, num_methods);
- CHECK_EXCEPTION(jni_) << "Error during RegisterNatives";
- return std::unique_ptr<NativeRegistration>(
- new NativeRegistration(jni_, clazz));
-}
-
-std::string JNIEnvironment::JavaToStdString(const jstring& j_string) {
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
- const char* jchars = jni_->GetStringUTFChars(j_string, nullptr);
- CHECK_EXCEPTION(jni_);
- const int size = jni_->GetStringUTFLength(j_string);
- CHECK_EXCEPTION(jni_);
- std::string ret(jchars, size);
- jni_->ReleaseStringUTFChars(j_string, jchars);
- CHECK_EXCEPTION(jni_);
- return ret;
-}
-
-// static
-void JVM::Initialize(JavaVM* jvm, jobject context) {
- ALOGD("JVM::Initialize%s", GetThreadInfo().c_str());
- RTC_CHECK(!g_jvm);
- g_jvm = new JVM(jvm, context);
-}
-
-// static
-void JVM::Uninitialize() {
- ALOGD("JVM::Uninitialize%s", GetThreadInfo().c_str());
- RTC_DCHECK(g_jvm);
- delete g_jvm;
- g_jvm = nullptr;
-}
-
-// static
-JVM* JVM::GetInstance() {
- RTC_DCHECK(g_jvm);
- return g_jvm;
-}
-
-JVM::JVM(JavaVM* jvm, jobject context)
- : jvm_(jvm) {
- ALOGD("JVM::JVM%s", GetThreadInfo().c_str());
- RTC_CHECK(jni()) << "AttachCurrentThread() must be called on this thread.";
- context_ = NewGlobalRef(jni(), context);
- LoadClasses(jni());
-}
-
-JVM::~JVM() {
- ALOGD("JVM::~JVM%s", GetThreadInfo().c_str());
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
- FreeClassReferences(jni());
- DeleteGlobalRef(jni(), context_);
-}
-
-std::unique_ptr<JNIEnvironment> JVM::environment() {
- ALOGD("JVM::environment%s", GetThreadInfo().c_str());
- // The JNIEnv is used for thread-local storage. For this reason, we cannot
- // share a JNIEnv between threads. If a piece of code has no other way to get
- // its JNIEnv, we should share the JavaVM, and use GetEnv to discover the
- // thread's JNIEnv. (Assuming it has one, if not, use AttachCurrentThread).
- // See // http://developer.android.com/training/articles/perf-jni.html.
- JNIEnv* jni = GetEnv(jvm_);
- if (!jni) {
- ALOGE("AttachCurrentThread() has not been called on this thread.");
- return std::unique_ptr<JNIEnvironment>();
- }
- return std::unique_ptr<JNIEnvironment>(new JNIEnvironment(jni));
-}
-
-JavaClass JVM::GetClass(const char* name) {
- ALOGD("JVM::GetClass(%s)%s", name, GetThreadInfo().c_str());
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
- return JavaClass(jni(), LookUpClass(name));
-}
-
-} // namespace webrtc
Deleted: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/system_wrappers/source/cpu_features_android.c (212307 => 212308)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/system_wrappers/source/cpu_features_android.c 2017-02-14 18:51:24 UTC (rev 212307)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/system_wrappers/source/cpu_features_android.c 2017-02-14 18:52:31 UTC (rev 212308)
@@ -1,15 +0,0 @@
-/*
- * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include <cpu-features.h>
-
-uint64_t WebRtc_GetCPUFeaturesARM(void) {
- return android_getCpuFeatures();
-}
Modified: trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj (212307 => 212308)
--- trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj 2017-02-14 18:51:24 UTC (rev 212307)
+++ trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj 2017-02-14 18:52:31 UTC (rev 212308)
@@ -840,8 +840,6 @@
5C63F8001E416288002CA531 /* httpserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C63F6E51E416287002CA531 /* httpserver.h */; };
5C63F8011E416288002CA531 /* ifaddrs_converter.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5C63F6E61E416287002CA531 /* ifaddrs_converter.cc */; };
5C63F8021E416288002CA531 /* ifaddrs_converter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C63F6E71E416287002CA531 /* ifaddrs_converter.h */; };
- 5C63F8031E416288002CA531 /* ifaddrs-android.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5C63F6E81E416287002CA531 /* ifaddrs-android.cc */; };
- 5C63F8041E416288002CA531 /* ifaddrs-android.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C63F6E91E416287002CA531 /* ifaddrs-android.h */; };
5C63F8051E416288002CA531 /* ignore_wundef.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C63F6EA1E416287002CA531 /* ignore_wundef.h */; };
5C63F8061E416288002CA531 /* ipaddress.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5C63F6EB1E416287002CA531 /* ipaddress.cc */; };
5C63F8071E416288002CA531 /* ipaddress.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C63F6EC1E416287002CA531 /* ipaddress.h */; };
@@ -3481,8 +3479,6 @@
5C63F6E51E416287002CA531 /* httpserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = httpserver.h; sourceTree = "<group>"; };
5C63F6E61E416287002CA531 /* ifaddrs_converter.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ifaddrs_converter.cc; sourceTree = "<group>"; };
5C63F6E71E416287002CA531 /* ifaddrs_converter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ifaddrs_converter.h; sourceTree = "<group>"; };
- 5C63F6E81E416287002CA531 /* ifaddrs-android.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "ifaddrs-android.cc"; sourceTree = "<group>"; };
- 5C63F6E91E416287002CA531 /* ifaddrs-android.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ifaddrs-android.h"; sourceTree = "<group>"; };
5C63F6EA1E416287002CA531 /* ignore_wundef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ignore_wundef.h; sourceTree = "<group>"; };
5C63F6EB1E416287002CA531 /* ipaddress.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ipaddress.cc; sourceTree = "<group>"; };
5C63F6EC1E416287002CA531 /* ipaddress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ipaddress.h; sourceTree = "<group>"; };
@@ -6685,8 +6681,6 @@
5C63F6E31E416287002CA531 /* httprequest.h */,
5C63F6E41E416287002CA531 /* httpserver.cc */,
5C63F6E51E416287002CA531 /* httpserver.h */,
- 5C63F6E81E416287002CA531 /* ifaddrs-android.cc */,
- 5C63F6E91E416287002CA531 /* ifaddrs-android.h */,
5C63F6E61E416287002CA531 /* ifaddrs_converter.cc */,
5C63F6E71E416287002CA531 /* ifaddrs_converter.h */,
5C63F6EA1E416287002CA531 /* ignore_wundef.h */,
@@ -9716,7 +9710,6 @@
5C63F7FE1E416288002CA531 /* httprequest.h in Headers */,
5C63F8001E416288002CA531 /* httpserver.h in Headers */,
5C4B48E41E42C1E3002651C8 /* hybriddataengine.h in Headers */,
- 5C63F8041E416288002CA531 /* ifaddrs-android.h in Headers */,
5C63F8021E416288002CA531 /* ifaddrs_converter.h in Headers */,
5C63F8051E416288002CA531 /* ignore_wundef.h in Headers */,
5CDD8BB41E43C2B500621E92 /* ilbc.h in Headers */,
@@ -11455,7 +11448,6 @@
5C63F7FF1E416288002CA531 /* httpserver.cc in Sources */,
5CDD90501E43D0E900621E92 /* i420.cc in Sources */,
5C4B4C1B1E431F75002651C8 /* i420_buffer_pool.cc in Sources */,
- 5C63F8031E416288002CA531 /* ifaddrs-android.cc in Sources */,
5C63F8011E416288002CA531 /* ifaddrs_converter.cc in Sources */,
5CDD8BB31E43C2B500621E92 /* ilbc.c in Sources */,
5CDD86591E43B8B500621E92 /* ilbc_specific_functions.c in Sources */,
