[Pkg-voip-commits] [mediastreamer2] 02/05: Merge tag 'upstream/2.16.1'

Dr. Tobias Quathamer toddy at debian.org
Mon Nov 6 21:35:57 UTC 2017


This is an automated email from the git hooks/post-receive script.

toddy pushed a commit to branch master
in repository mediastreamer2.

commit a1f2d2a531ce18779a3ea46f8ce04a08329679f4
Merge: d81d949 e4bfeee
Author: Dr. Tobias Quathamer <toddy at debian.org>
Date:   Mon Nov 6 22:02:59 2017 +0100

    Merge tag 'upstream/2.16.1'
    
    Upstream version 2.16.1

 .gitignore                                         |   1 +
 CMakeLists.txt                                     | 130 ++--
 Makefile.am                                        |   5 -
 NEWS                                               |   7 +
 README.md                                          |   9 +
 build/CMakeLists.txt                               |  52 ++
 build/osx/Info_base.plist.in                       |  42 ++
 build/osx/Info_voip.plist.in                       |  42 ++
 build/rpm/mediastreamer2.spec.cmake                | 103 ++++
 cmake/FindFFMpeg.cmake                             |  19 +-
 src/gitversion.cmake => cmake/FindGlew.cmake       |  51 +-
 cmake/FindTurboJpeg.cmake                          |  27 +-
 cmake/Mediastreamer2Config.cmake.in                |  49 +-
 configure.ac                                       |  24 +-
 help/Doxyfile.in                                   |   9 +-
 include/mediastreamer2/allfilters.h                |   7 +-
 include/mediastreamer2/bitratecontrol.h            |   2 +
 include/mediastreamer2/flowcontrol.h               |  24 +-
 include/mediastreamer2/ice.h                       |  10 +
 include/mediastreamer2/mediastream.h               |  11 +-
 include/mediastreamer2/mscommon.h                  |   4 +-
 include/mediastreamer2/msfactory.h                 |  44 +-
 include/mediastreamer2/msfilter.h                  |  15 +-
 include/mediastreamer2/msjava.h                    |   2 +-
 include/mediastreamer2/msogl_functions.h           |  12 +-
 include/mediastreamer2/msqueue.h                   |  47 ++
 include/mediastreamer2/msrtp.h                     |   4 +-
 include/mediastreamer2/msticker.h                  |  43 +-
 include/mediastreamer2/msvideo.h                   |   2 +
 include/mediastreamer2/mswebcam.h                  |   4 +-
 include/mediastreamer2/zrtp.h                      |  36 +-
 java/AndroidManifest.xml                           |  25 +-
 java/build.xml                                     |  93 ---
 java/custom_rules.xml                              |  79 ---
 java/gradle/wrapper/gradle-wrapper.jar             | Bin 0 -> 54212 bytes
 java/gradle/wrapper/gradle-wrapper.properties      |   6 +
 java/gradlew                                       | 172 ++++++
 java/gradlew.bat                                   |  84 +++
 java/jni/Application.mk                            |   1 -
 java/mediastreamerSdk.gradle                       |  83 +++
 java/res/drawable-hdpi/icon.png                    | Bin 4147 -> 0 bytes
 java/res/drawable-ldpi/icon.png                    | Bin 1723 -> 0 bytes
 java/res/drawable-mdpi/icon.png                    | Bin 2574 -> 0 bytes
 java/res/layout-land/main.xml                      |  18 -
 java/res/layout/main.xml                           |  18 -
 java/res/menu/videocall_activity_menu.xml          |  36 --
 java/res/values/strings.xml                        |   5 -
 .../mediastream/MediastreamerActivity.java.ignored | 397 ------------
 .../video/capture/AndroidVideoApi5JniWrapper.java  |  77 +--
 .../video/capture/AndroidVideoApi9JniWrapper.java  |  31 +-
 .../hwconf/AndroidCameraConfigurationReader21.java |   2 +-
 mediastreamer2.spec.in                             |   3 +-
 src/CMakeLists.txt                                 | 107 ++--
 src/Makefile.am                                    |   4 +
 src/android/androidsound.cpp                       |  16 +-
 src/android/androidsound_depr.cpp                  |  17 +-
 src/android/androidsound_opensles.cpp              |  78 +--
 src/audiofilters/alsa.c                            |  18 +-
 src/audiofilters/aqsnd.m                           |  14 +-
 src/audiofilters/devices.c                         |  90 ++-
 src/audiofilters/dtmfgen.c                         |   5 +-
 src/audiofilters/flowcontrol.c                     | 176 +++++-
 src/audiofilters/g729.c                            | 325 ++++++++++
 src/audiofilters/macsnd.c                          |  63 +-
 src/audiofilters/msiounit.m                        |  95 +--
 src/audiofilters/msopus.c                          |   6 +-
 src/audiofilters/msresample.c                      |   4 +-
 src/audiofilters/msspeex.c                         |   4 +-
 src/audiofilters/msvolume.c                        |   3 +-
 src/audiofilters/mswasapi.cpp                      | 636 +++++++++++++++++++
 src/audiofilters/mswasapi.h                        |  83 +++
 src/audiofilters/mswasapi_reader.cpp               | 405 +++++++++++++
 src/audiofilters/mswasapi_reader.h                 | 107 ++++
 src/audiofilters/mswasapi_writer.cpp               | 449 ++++++++++++++
 src/audiofilters/mswasapi_writer.h                 | 114 ++++
 src/audiofilters/pulseaudio.c                      | 159 +++--
 src/audiofilters/speexec.c                         |  74 +--
 src/audiofilters/winsnd3.c                         |  24 +-
 src/base/mscommon.c                                |   4 +-
 src/base/msfactory.c                               |  54 +-
 src/base/msqueue.c                                 |  98 ++-
 src/base/msticker.c                                |  27 +-
 src/base/mswebcam.c                                |   8 +
 src/base/mtu.c                                     |   2 +-
 src/crypto/zrtp.c                                  | 306 +++++-----
 src/generate_yuv2rgb_header.cmake                  |   7 +-
 src/gitversion.h.in                                |  21 -
 src/ortp-deps/ortp/port.h                          |   6 +-
 src/otherfilters/msrtp.c                           |  19 +-
 src/utils/h264utils.c                              |  52 ++
 src/utils/h264utils.h                              |  12 +
 src/utils/msjava.c                                 |   2 +-
 src/utils/opengl_functions.c                       |   2 +-
 src/utils/opengles_display.c                       | 674 +++++++++++----------
 src/utils/opengles_display.h                       |   2 +-
 src/videofilters/avfound-capture.m                 |  10 +-
 src/videofilters/generic_opengl_display.c          |  50 +-
 src/videofilters/mkv.c                             | 235 ++++---
 src/videofilters/msv4l.c                           |   6 +-
 src/videofilters/nowebcam.c                        |  30 +-
 src/videofilters/turbojpegnowebcam.c               |  81 ++-
 src/videofilters/turbojpegwriter.c                 |   6 +-
 src/videofilters/videodec.c                        |  13 +-
 src/videofilters/videoout.c                        |  12 +-
 src/videofilters/videotoolbox.c                    |  55 +-
 src/videofilters/vp8.c                             |  24 +-
 src/videofilters/wincevideods.c                    |   9 +-
 src/videofilters/winvideo.c                        |   9 +-
 src/videofilters/winvideods.c                      |   7 +-
 src/voip/audiostream.c                             |  43 +-
 src/voip/bandwidthcontroller.c                     |  37 +-
 src/voip/bitratecontrol.c                          |   4 +-
 src/voip/ice.c                                     |  45 +-
 src/voip/mediastream.c                             |  43 +-
 src/voip/msmediaplayer.c                           |   1 +
 src/voip/msvideo.c                                 |  43 +-
 src/voip/msvoip.c                                  |  30 +-
 src/voip/nowebcam.h                                |   2 +-
 src/voip/private.h                                 |  15 +-
 src/voip/qosanalyzer.c                             |   6 +-
 src/voip/qualityindicator.c                        |   4 +
 src/voip/rfc3984.c                                 |  19 +-
 src/voip/scaler.c                                  |  13 +-
 src/voip/videostream.c                             | 104 ++--
 tester/CMakeLists.txt                              |  10 +-
 tester/mediastreamer2_adaptive_tester.c            |  34 +-
 tester/mediastreamer2_codec_impl_testers.c         |  63 +-
 tester/mediastreamer2_jitterbuffer_tester.c        |  11 +-
 tester/mediastreamer2_tester.c                     |   2 +-
 tester/mediastreamer2_tester_ios.m                 |   1 +
 tester/mediastreamer2_tester_windows.cpp           |  10 +-
 tester/mediastreamer2_video_stream_tester.c        |   4 +-
 tester/scenarios/h264_one_nalu_per_frame.pcap      | Bin 29184 -> 90908 bytes
 tools/CMakeLists.txt                               |  14 +-
 tools/mediastream.c                                |  31 +-
 tools/pcap_playback.c                              |   8 +-
 tools/ring_jni.c                                   |   4 +-
 tools/xxd.py                                       |   2 +-
 138 files changed, 5307 insertions(+), 2182 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/mediastreamer2.git



More information about the Pkg-voip-commits mailing list