From bfa92bd59c41a8e0824bf00cd9e0f0ee327d763a Mon Sep 17 00:00:00 2001 From: Grishka Date: Tue, 12 Mar 2019 16:15:22 +0300 Subject: [PATCH] Updated projects --- Makefile.am | 23 +++- Makefile.in | 105 ++++++++++++++---- configure | 22 ++-- configure.ac | 2 +- libtgvoip.gyp | 10 ++ libtgvoip_osx.xcodeproj/project.pbxproj | 50 +++++++++ .../SampleBufferDisplayLayerRenderer.cpp | 35 ------ os/darwin/VideoToolboxEncoderSource.cpp | 39 ------- 8 files changed, 172 insertions(+), 114 deletions(-) delete mode 100644 os/darwin/SampleBufferDisplayLayerRenderer.cpp delete mode 100644 os/darwin/VideoToolboxEncoderSource.cpp diff --git a/Makefile.am b/Makefile.am index 91b2d33..0d1f1b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,6 +25,7 @@ audio/Resampler.cpp \ os/posix/NetworkSocketPosix.cpp \ video/VideoSource.cpp \ video/VideoRenderer.cpp \ +video/ScreamCongestionController.cpp \ json11.cpp TGVOIP_HDRS = \ @@ -51,6 +52,7 @@ audio/Resampler.h \ os/posix/NetworkSocketPosix.h \ video/VideoSource.h \ video/VideoRenderer.h \ +video/ScreamCongestionController.h \ json11.hpp \ utils.h @@ -62,7 +64,11 @@ os/darwin/AudioOutputAudioUnit.cpp \ os/darwin/AudioUnitIO.cpp \ os/darwin/AudioInputAudioUnitOSX.cpp \ os/darwin/AudioOutputAudioUnitOSX.cpp \ -os/darwin/DarwinSpecific.mm +os/darwin/DarwinSpecific.mm \ +os/darwin/SampleBufferDisplayLayerRenderer.mm \ +os/darwin/TGVVideoRenderer.mm \ +os/darwin/TGVVideoSource.mm \ +os/darwin/VideoToolboxEncoderSource.mm TGVOIP_HDRS += \ os/darwin/AudioInputAudioUnit.h \ @@ -70,12 +76,17 @@ os/darwin/AudioOutputAudioUnit.h \ os/darwin/AudioUnitIO.h \ os/darwin/AudioInputAudioUnitOSX.h \ os/darwin/AudioOutputAudioUnitOSX.h \ -os/darwin/DarwinSpecific.h +os/darwin/DarwinSpecific.h \ +os/darwin/SampleBufferDisplayLayerRenderer.h \ +os/darwin/TGVVideoRenderer.h \ +os/darwin/TGVVideoSource.h \ +os/darwin/VideoToolboxEncoderSource.h -LDFLAGS += -framework Foundation -framework CoreFoundation -framework CoreAudio -framework AudioToolbox +LDFLAGS += -framework Foundation -framework CoreFoundation -framework CoreAudio -framework AudioToolbox -framework VideoToolbox -framework CoreMedia -framework CoreVideo else # Linux-specific + if WITH_ALSA SRC += \ os/linux/AudioInputALSA.cpp \ @@ -742,4 +753,8 @@ libtgvoip_la_SOURCES = $(SRC) $(TGVOIP_HDRS) tgvoipincludedir = $(includedir)/tgvoip nobase_tgvoipinclude_HEADERS = $(TGVOIP_HDRS) -CXXFLAGS += -std=gnu++0x $(CFLAGS) \ No newline at end of file +CXXFLAGS += -std=gnu++0x $(CFLAGS) +if TARGET_OS_OSX +OBJCFLAGS = $(CFLAGS) +OBJCXXFLAGS += -std=gnu++0x $(CFLAGS) +endif \ No newline at end of file diff --git a/Makefile.in b/Makefile.in index 8645a62..c401d28 100644 --- a/Makefile.in +++ b/Makefile.in @@ -95,7 +95,11 @@ host_triplet = @host@ @TARGET_OS_OSX_TRUE@os/darwin/AudioUnitIO.cpp \ @TARGET_OS_OSX_TRUE@os/darwin/AudioInputAudioUnitOSX.cpp \ @TARGET_OS_OSX_TRUE@os/darwin/AudioOutputAudioUnitOSX.cpp \ -@TARGET_OS_OSX_TRUE@os/darwin/DarwinSpecific.mm +@TARGET_OS_OSX_TRUE@os/darwin/DarwinSpecific.mm \ +@TARGET_OS_OSX_TRUE@os/darwin/SampleBufferDisplayLayerRenderer.mm \ +@TARGET_OS_OSX_TRUE@os/darwin/TGVVideoRenderer.mm \ +@TARGET_OS_OSX_TRUE@os/darwin/TGVVideoSource.mm \ +@TARGET_OS_OSX_TRUE@os/darwin/VideoToolboxEncoderSource.mm @TARGET_OS_OSX_TRUE@am__append_2 = \ @TARGET_OS_OSX_TRUE@os/darwin/AudioInputAudioUnit.h \ @@ -103,9 +107,13 @@ host_triplet = @host@ @TARGET_OS_OSX_TRUE@os/darwin/AudioUnitIO.h \ @TARGET_OS_OSX_TRUE@os/darwin/AudioInputAudioUnitOSX.h \ @TARGET_OS_OSX_TRUE@os/darwin/AudioOutputAudioUnitOSX.h \ -@TARGET_OS_OSX_TRUE@os/darwin/DarwinSpecific.h +@TARGET_OS_OSX_TRUE@os/darwin/DarwinSpecific.h \ +@TARGET_OS_OSX_TRUE@os/darwin/SampleBufferDisplayLayerRenderer.h \ +@TARGET_OS_OSX_TRUE@os/darwin/TGVVideoRenderer.h \ +@TARGET_OS_OSX_TRUE@os/darwin/TGVVideoSource.h \ +@TARGET_OS_OSX_TRUE@os/darwin/VideoToolboxEncoderSource.h -@TARGET_OS_OSX_TRUE@am__append_3 = -framework Foundation -framework CoreFoundation -framework CoreAudio -framework AudioToolbox +@TARGET_OS_OSX_TRUE@am__append_3 = -framework Foundation -framework CoreFoundation -framework CoreAudio -framework AudioToolbox -framework VideoToolbox -framework CoreMedia -framework CoreVideo # Linux-specific @TARGET_OS_OSX_FALSE@@WITH_ALSA_TRUE@am__append_4 = \ @@ -754,6 +762,7 @@ host_triplet = @host@ @ENABLE_DSP_TRUE@webrtc_dsp/common_audio/vad/vad_filterbank.h @ENABLE_DSP_FALSE@am__append_24 = -DTGVOIP_NO_DSP +@TARGET_OS_OSX_TRUE@am__append_25 = -std=gnu++0x $(CFLAGS) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -807,14 +816,18 @@ am__libtgvoip_la_SOURCES_DIST = VoIPController.cpp Buffers.cpp \ VoIPServerConfig.cpp audio/AudioIO.cpp audio/AudioInput.cpp \ audio/AudioOutput.cpp audio/Resampler.cpp \ os/posix/NetworkSocketPosix.cpp video/VideoSource.cpp \ - video/VideoRenderer.cpp json11.cpp \ - os/darwin/AudioInputAudioUnit.cpp \ + video/VideoRenderer.cpp video/ScreamCongestionController.cpp \ + json11.cpp os/darwin/AudioInputAudioUnit.cpp \ os/darwin/AudioOutputAudioUnit.cpp os/darwin/AudioUnitIO.cpp \ os/darwin/AudioInputAudioUnitOSX.cpp \ os/darwin/AudioOutputAudioUnitOSX.cpp \ - os/darwin/DarwinSpecific.mm os/linux/AudioInputALSA.cpp \ - os/linux/AudioOutputALSA.cpp os/linux/AudioOutputPulse.cpp \ - os/linux/AudioInputPulse.cpp os/linux/AudioPulse.cpp \ + os/darwin/DarwinSpecific.mm \ + os/darwin/SampleBufferDisplayLayerRenderer.mm \ + os/darwin/TGVVideoRenderer.mm os/darwin/TGVVideoSource.mm \ + os/darwin/VideoToolboxEncoderSource.mm \ + os/linux/AudioInputALSA.cpp os/linux/AudioOutputALSA.cpp \ + os/linux/AudioOutputPulse.cpp os/linux/AudioInputPulse.cpp \ + os/linux/AudioPulse.cpp \ ./webrtc_dsp/system_wrappers/source/field_trial.cc \ ./webrtc_dsp/system_wrappers/source/metrics.cc \ ./webrtc_dsp/system_wrappers/source/cpu_features.cc \ @@ -1415,11 +1428,15 @@ am__libtgvoip_la_SOURCES_DIST = VoIPController.cpp Buffers.cpp \ OpusEncoder.h PacketReassembler.h VoIPServerConfig.h \ audio/AudioIO.h audio/AudioInput.h audio/AudioOutput.h \ audio/Resampler.h os/posix/NetworkSocketPosix.h \ - video/VideoSource.h video/VideoRenderer.h json11.hpp utils.h \ + video/VideoSource.h video/VideoRenderer.h \ + video/ScreamCongestionController.h json11.hpp utils.h \ os/darwin/AudioInputAudioUnit.h \ os/darwin/AudioOutputAudioUnit.h os/darwin/AudioUnitIO.h \ os/darwin/AudioInputAudioUnitOSX.h \ os/darwin/AudioOutputAudioUnitOSX.h os/darwin/DarwinSpecific.h \ + os/darwin/SampleBufferDisplayLayerRenderer.h \ + os/darwin/TGVVideoRenderer.h os/darwin/TGVVideoSource.h \ + os/darwin/VideoToolboxEncoderSource.h \ os/linux/AudioInputALSA.h os/linux/AudioOutputALSA.h \ os/linux/AudioOutputPulse.h os/linux/AudioInputPulse.h \ os/linux/AudioPulse.h os/linux/PulseFunctions.h \ @@ -1430,7 +1447,11 @@ am__dirstamp = $(am__leading_dot)dirstamp @TARGET_OS_OSX_TRUE@ os/darwin/AudioUnitIO.lo \ @TARGET_OS_OSX_TRUE@ os/darwin/AudioInputAudioUnitOSX.lo \ @TARGET_OS_OSX_TRUE@ os/darwin/AudioOutputAudioUnitOSX.lo \ -@TARGET_OS_OSX_TRUE@ os/darwin/DarwinSpecific.lo +@TARGET_OS_OSX_TRUE@ os/darwin/DarwinSpecific.lo \ +@TARGET_OS_OSX_TRUE@ os/darwin/SampleBufferDisplayLayerRenderer.lo \ +@TARGET_OS_OSX_TRUE@ os/darwin/TGVVideoRenderer.lo \ +@TARGET_OS_OSX_TRUE@ os/darwin/TGVVideoSource.lo \ +@TARGET_OS_OSX_TRUE@ os/darwin/VideoToolboxEncoderSource.lo @TARGET_OS_OSX_FALSE@@WITH_ALSA_TRUE@am__objects_2 = os/linux/AudioInputALSA.lo \ @TARGET_OS_OSX_FALSE@@WITH_ALSA_TRUE@ os/linux/AudioOutputALSA.lo @TARGET_OS_OSX_FALSE@@WITH_PULSE_TRUE@am__objects_3 = os/linux/AudioOutputPulse.lo \ @@ -1722,11 +1743,11 @@ am__objects_12 = VoIPController.lo Buffers.lo CongestionControl.lo \ VoIPServerConfig.lo audio/AudioIO.lo audio/AudioInput.lo \ audio/AudioOutput.lo audio/Resampler.lo \ os/posix/NetworkSocketPosix.lo video/VideoSource.lo \ - video/VideoRenderer.lo json11.lo $(am__objects_1) \ - $(am__objects_2) $(am__objects_3) $(am__objects_4) \ - $(am__objects_5) $(am__objects_6) $(am__objects_7) \ - $(am__objects_8) $(am__objects_9) $(am__objects_10) \ - $(am__objects_11) + video/VideoRenderer.lo video/ScreamCongestionController.lo \ + json11.lo $(am__objects_1) $(am__objects_2) $(am__objects_3) \ + $(am__objects_4) $(am__objects_5) $(am__objects_6) \ + $(am__objects_7) $(am__objects_8) $(am__objects_9) \ + $(am__objects_10) $(am__objects_11) am__objects_13 = $(am__objects_11) $(am__objects_11) $(am__objects_11) \ $(am__objects_11) am_libtgvoip_la_OBJECTS = $(am__objects_12) $(am__objects_13) @@ -2033,12 +2054,17 @@ am__depfiles_remade = ./$(DEPDIR)/Buffers.Plo \ os/darwin/$(DEPDIR)/AudioOutputAudioUnitOSX.Plo \ os/darwin/$(DEPDIR)/AudioUnitIO.Plo \ os/darwin/$(DEPDIR)/DarwinSpecific.Plo \ + os/darwin/$(DEPDIR)/SampleBufferDisplayLayerRenderer.Plo \ + os/darwin/$(DEPDIR)/TGVVideoRenderer.Plo \ + os/darwin/$(DEPDIR)/TGVVideoSource.Plo \ + os/darwin/$(DEPDIR)/VideoToolboxEncoderSource.Plo \ os/linux/$(DEPDIR)/AudioInputALSA.Plo \ os/linux/$(DEPDIR)/AudioInputPulse.Plo \ os/linux/$(DEPDIR)/AudioOutputALSA.Plo \ os/linux/$(DEPDIR)/AudioOutputPulse.Plo \ os/linux/$(DEPDIR)/AudioPulse.Plo \ os/posix/$(DEPDIR)/NetworkSocketPosix.Plo \ + video/$(DEPDIR)/ScreamCongestionController.Plo \ video/$(DEPDIR)/VideoRenderer.Plo \ video/$(DEPDIR)/VideoSource.Plo \ webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/complex_bit_reverse.Plo \ @@ -2134,11 +2160,15 @@ am__nobase_tgvoipinclude_HEADERS_DIST = VoIPController.h Buffers.h \ OpusEncoder.h PacketReassembler.h VoIPServerConfig.h \ audio/AudioIO.h audio/AudioInput.h audio/AudioOutput.h \ audio/Resampler.h os/posix/NetworkSocketPosix.h \ - video/VideoSource.h video/VideoRenderer.h json11.hpp utils.h \ + video/VideoSource.h video/VideoRenderer.h \ + video/ScreamCongestionController.h json11.hpp utils.h \ os/darwin/AudioInputAudioUnit.h \ os/darwin/AudioOutputAudioUnit.h os/darwin/AudioUnitIO.h \ os/darwin/AudioInputAudioUnitOSX.h \ os/darwin/AudioOutputAudioUnitOSX.h os/darwin/DarwinSpecific.h \ + os/darwin/SampleBufferDisplayLayerRenderer.h \ + os/darwin/TGVVideoRenderer.h os/darwin/TGVVideoSource.h \ + os/darwin/VideoToolboxEncoderSource.h \ os/linux/AudioInputALSA.h os/linux/AudioOutputALSA.h \ os/linux/AudioOutputPulse.h os/linux/AudioInputPulse.h \ os/linux/AudioPulse.h os/linux/PulseFunctions.h \ @@ -2242,7 +2272,7 @@ NM = @NM@ NMEDIT = @NMEDIT@ OBJCXX = @OBJCXX@ OBJCXXDEPMODE = @OBJCXXDEPMODE@ -OBJCXXFLAGS = @OBJCXXFLAGS@ +OBJCXXFLAGS = @OBJCXXFLAGS@ $(am__append_25) OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ @@ -2324,11 +2354,11 @@ SRC = VoIPController.cpp Buffers.cpp CongestionControl.cpp \ VoIPGroupController.cpp VoIPServerConfig.cpp audio/AudioIO.cpp \ audio/AudioInput.cpp audio/AudioOutput.cpp audio/Resampler.cpp \ os/posix/NetworkSocketPosix.cpp video/VideoSource.cpp \ - video/VideoRenderer.cpp json11.cpp $(am__append_1) \ - $(am__append_4) $(am__append_6) $(am__append_10) \ - $(am__append_12) $(am__append_14) $(am__append_16) \ - $(am__append_18) $(am__append_21) $(am__append_22) \ - $(am__append_23) + video/VideoRenderer.cpp video/ScreamCongestionController.cpp \ + json11.cpp $(am__append_1) $(am__append_4) $(am__append_6) \ + $(am__append_10) $(am__append_12) $(am__append_14) \ + $(am__append_16) $(am__append_18) $(am__append_21) \ + $(am__append_22) $(am__append_23) TGVOIP_HDRS = VoIPController.h Buffers.h BlockingQueue.h \ PrivateDefines.h CongestionControl.h EchoCanceller.h \ JitterBuffer.h logging.h threading.h MediaStreamItf.h \ @@ -2336,11 +2366,13 @@ TGVOIP_HDRS = VoIPController.h Buffers.h BlockingQueue.h \ PacketReassembler.h VoIPServerConfig.h audio/AudioIO.h \ audio/AudioInput.h audio/AudioOutput.h audio/Resampler.h \ os/posix/NetworkSocketPosix.h video/VideoSource.h \ - video/VideoRenderer.h json11.hpp utils.h $(am__append_2) \ - $(am__append_5) $(am__append_7) $(am__append_17) + video/VideoRenderer.h video/ScreamCongestionController.h \ + json11.hpp utils.h $(am__append_2) $(am__append_5) \ + $(am__append_7) $(am__append_17) libtgvoip_la_SOURCES = $(SRC) $(TGVOIP_HDRS) tgvoipincludedir = $(includedir)/tgvoip nobase_tgvoipinclude_HEADERS = $(TGVOIP_HDRS) +@TARGET_OS_OSX_TRUE@OBJCFLAGS = $(CFLAGS) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -2461,6 +2493,8 @@ video/VideoSource.lo: video/$(am__dirstamp) \ video/$(DEPDIR)/$(am__dirstamp) video/VideoRenderer.lo: video/$(am__dirstamp) \ video/$(DEPDIR)/$(am__dirstamp) +video/ScreamCongestionController.lo: video/$(am__dirstamp) \ + video/$(DEPDIR)/$(am__dirstamp) os/darwin/$(am__dirstamp): @$(MKDIR_P) os/darwin @: > os/darwin/$(am__dirstamp) @@ -2479,6 +2513,14 @@ os/darwin/AudioOutputAudioUnitOSX.lo: os/darwin/$(am__dirstamp) \ os/darwin/$(DEPDIR)/$(am__dirstamp) os/darwin/DarwinSpecific.lo: os/darwin/$(am__dirstamp) \ os/darwin/$(DEPDIR)/$(am__dirstamp) +os/darwin/SampleBufferDisplayLayerRenderer.lo: \ + os/darwin/$(am__dirstamp) os/darwin/$(DEPDIR)/$(am__dirstamp) +os/darwin/TGVVideoRenderer.lo: os/darwin/$(am__dirstamp) \ + os/darwin/$(DEPDIR)/$(am__dirstamp) +os/darwin/TGVVideoSource.lo: os/darwin/$(am__dirstamp) \ + os/darwin/$(DEPDIR)/$(am__dirstamp) +os/darwin/VideoToolboxEncoderSource.lo: os/darwin/$(am__dirstamp) \ + os/darwin/$(DEPDIR)/$(am__dirstamp) os/linux/$(am__dirstamp): @$(MKDIR_P) os/linux @: > os/linux/$(am__dirstamp) @@ -3875,12 +3917,17 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@os/darwin/$(DEPDIR)/AudioOutputAudioUnitOSX.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@os/darwin/$(DEPDIR)/AudioUnitIO.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@os/darwin/$(DEPDIR)/DarwinSpecific.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@os/darwin/$(DEPDIR)/SampleBufferDisplayLayerRenderer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@os/darwin/$(DEPDIR)/TGVVideoRenderer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@os/darwin/$(DEPDIR)/TGVVideoSource.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@os/darwin/$(DEPDIR)/VideoToolboxEncoderSource.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@os/linux/$(DEPDIR)/AudioInputALSA.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@os/linux/$(DEPDIR)/AudioInputPulse.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@os/linux/$(DEPDIR)/AudioOutputALSA.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@os/linux/$(DEPDIR)/AudioOutputPulse.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@os/linux/$(DEPDIR)/AudioPulse.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@os/posix/$(DEPDIR)/NetworkSocketPosix.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@video/$(DEPDIR)/ScreamCongestionController.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@video/$(DEPDIR)/VideoRenderer.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@video/$(DEPDIR)/VideoSource.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/complex_bit_reverse.Plo@am__quote@ # am--include-marker @@ -4738,12 +4785,17 @@ distclean: distclean-am -rm -f os/darwin/$(DEPDIR)/AudioOutputAudioUnitOSX.Plo -rm -f os/darwin/$(DEPDIR)/AudioUnitIO.Plo -rm -f os/darwin/$(DEPDIR)/DarwinSpecific.Plo + -rm -f os/darwin/$(DEPDIR)/SampleBufferDisplayLayerRenderer.Plo + -rm -f os/darwin/$(DEPDIR)/TGVVideoRenderer.Plo + -rm -f os/darwin/$(DEPDIR)/TGVVideoSource.Plo + -rm -f os/darwin/$(DEPDIR)/VideoToolboxEncoderSource.Plo -rm -f os/linux/$(DEPDIR)/AudioInputALSA.Plo -rm -f os/linux/$(DEPDIR)/AudioInputPulse.Plo -rm -f os/linux/$(DEPDIR)/AudioOutputALSA.Plo -rm -f os/linux/$(DEPDIR)/AudioOutputPulse.Plo -rm -f os/linux/$(DEPDIR)/AudioPulse.Plo -rm -f os/posix/$(DEPDIR)/NetworkSocketPosix.Plo + -rm -f video/$(DEPDIR)/ScreamCongestionController.Plo -rm -f video/$(DEPDIR)/VideoRenderer.Plo -rm -f video/$(DEPDIR)/VideoSource.Plo -rm -f webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/complex_bit_reverse.Plo @@ -5096,12 +5148,17 @@ maintainer-clean: maintainer-clean-am -rm -f os/darwin/$(DEPDIR)/AudioOutputAudioUnitOSX.Plo -rm -f os/darwin/$(DEPDIR)/AudioUnitIO.Plo -rm -f os/darwin/$(DEPDIR)/DarwinSpecific.Plo + -rm -f os/darwin/$(DEPDIR)/SampleBufferDisplayLayerRenderer.Plo + -rm -f os/darwin/$(DEPDIR)/TGVVideoRenderer.Plo + -rm -f os/darwin/$(DEPDIR)/TGVVideoSource.Plo + -rm -f os/darwin/$(DEPDIR)/VideoToolboxEncoderSource.Plo -rm -f os/linux/$(DEPDIR)/AudioInputALSA.Plo -rm -f os/linux/$(DEPDIR)/AudioInputPulse.Plo -rm -f os/linux/$(DEPDIR)/AudioOutputALSA.Plo -rm -f os/linux/$(DEPDIR)/AudioOutputPulse.Plo -rm -f os/linux/$(DEPDIR)/AudioPulse.Plo -rm -f os/posix/$(DEPDIR)/NetworkSocketPosix.Plo + -rm -f video/$(DEPDIR)/ScreamCongestionController.Plo -rm -f video/$(DEPDIR)/VideoRenderer.Plo -rm -f video/$(DEPDIR)/VideoSource.Plo -rm -f webrtc_dsp/common_audio/signal_processing/$(DEPDIR)/complex_bit_reverse.Plo diff --git a/configure b/configure index 719376e..2cdfbf6 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libtgvoip 2.4.2. +# Generated by GNU Autoconf 2.69 for libtgvoip 2.4.4. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libtgvoip' PACKAGE_TARNAME='libtgvoip' -PACKAGE_VERSION='2.4.2' -PACKAGE_STRING='libtgvoip 2.4.2' +PACKAGE_VERSION='2.4.4' +PACKAGE_STRING='libtgvoip 2.4.4' PACKAGE_BUGREPORT='https://github.com/grishka/libtgvoip/issues' PACKAGE_URL='' @@ -1360,7 +1360,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libtgvoip 2.4.2 to adapt to many kinds of systems. +\`configure' configures libtgvoip 2.4.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1430,7 +1430,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libtgvoip 2.4.2:";; + short | recursive ) echo "Configuration of libtgvoip 2.4.4:";; esac cat <<\_ACEOF @@ -1552,7 +1552,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libtgvoip configure 2.4.2 +libtgvoip configure 2.4.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2264,7 +2264,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libtgvoip $as_me 2.4.2, which was +It was created by libtgvoip $as_me 2.4.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3130,7 +3130,7 @@ fi # Define the identity of the package. PACKAGE='libtgvoip' - VERSION='2.4.2' + VERSION='2.4.4' cat >>confdefs.h <<_ACEOF @@ -17686,7 +17686,7 @@ fi if test "${enable_audio_callback+set}" = set; then : enableval=$enable_audio_callback; else - enable_audio_callback=yes + enable_audio_callback=no fi if test "x$enable_audio_callback" == xyes; then @@ -19163,7 +19163,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libtgvoip $as_me 2.4.2, which was +This file was extended by libtgvoip $as_me 2.4.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19229,7 +19229,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libtgvoip config.status 2.4.2 +libtgvoip config.status 2.4.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index c21f162..222f541 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([libtgvoip], [2.4.2], [https://github.com/grishka/libtgvoip/issues]) +AC_INIT([libtgvoip], [2.4.4], [https://github.com/grishka/libtgvoip/issues]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([subdir-objects]) diff --git a/libtgvoip.gyp b/libtgvoip.gyp index 8c62b56..0b2b88f 100644 --- a/libtgvoip.gyp +++ b/libtgvoip.gyp @@ -66,6 +66,8 @@ '<(tgvoip_src_loc)/MessageThread.h', '<(tgvoip_src_loc)/audio/AudioIO.cpp', '<(tgvoip_src_loc)/audio/AudioIO.h', + '<(tgvoip_src_loc)/video/ScreamCongestionController.cpp', + '<(tgvoip_src_loc)/video/ScreamCongestionController.h', '<(tgvoip_src_loc)/video/VideoSource.cpp', '<(tgvoip_src_loc)/video/VideoSource.h', '<(tgvoip_src_loc)/video/VideoRenderer.cpp', @@ -100,6 +102,14 @@ '<(tgvoip_src_loc)/os/darwin/AudioUnitIO.h', '<(tgvoip_src_loc)/os/darwin/DarwinSpecific.mm', '<(tgvoip_src_loc)/os/darwin/DarwinSpecific.h', + '<(tgvoip_src_loc)/os/darwin/TGVVideoRenderer.mm', + '<(tgvoip_src_loc)/os/darwin/TGVVideoRenderer.h', + '<(tgvoip_src_loc)/os/darwin/TGVVideoSource.mm', + '<(tgvoip_src_loc)/os/darwin/TGVVideoSource.h', + '<(tgvoip_src_loc)/os/darwin/VideoToolboxEncoderSource.mm', + '<(tgvoip_src_loc)/os/darwin/VideoToolboxEncoderSource.h', + '<(tgvoip_src_loc)/os/darwin/SampleBufferDisplayLayerRenderer.mm', + '<(tgvoip_src_loc)/os/darwin/SampleBufferDisplayLayerRenderer.h', # Linux '<(tgvoip_src_loc)/os/linux/AudioInputALSA.cpp', diff --git a/libtgvoip_osx.xcodeproj/project.pbxproj b/libtgvoip_osx.xcodeproj/project.pbxproj index e1ef990..96ef434 100644 --- a/libtgvoip_osx.xcodeproj/project.pbxproj +++ b/libtgvoip_osx.xcodeproj/project.pbxproj @@ -317,6 +317,21 @@ 69A2076521AF628A003AC4F9 /* json11.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69A2076421AF6289003AC4F9 /* json11.cpp */; }; 69A6DF431E9614B700000E69 /* AudioInputAudioUnitOSX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69A6DF3F1E9614B700000E69 /* AudioInputAudioUnitOSX.cpp */; }; 69A6DF451E9614B700000E69 /* AudioOutputAudioUnitOSX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69A6DF411E9614B700000E69 /* AudioOutputAudioUnitOSX.cpp */; }; + 69DF15622237DEBB00C1F8ED /* ScreamCongestionController.h in Headers */ = {isa = PBXBuildFile; fileRef = 69DF15602237DEBB00C1F8ED /* ScreamCongestionController.h */; }; + 69DF15632237DEBB00C1F8ED /* ScreamCongestionController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69DF15612237DEBB00C1F8ED /* ScreamCongestionController.cpp */; }; + 69DF15642237DEBB00C1F8ED /* ScreamCongestionController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69DF15612237DEBB00C1F8ED /* ScreamCongestionController.cpp */; }; + 69DF156D2237DEDC00C1F8ED /* TGVVideoRenderer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 69DF15652237DEDA00C1F8ED /* TGVVideoRenderer.mm */; }; + 69DF156E2237DEDC00C1F8ED /* TGVVideoRenderer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 69DF15652237DEDA00C1F8ED /* TGVVideoRenderer.mm */; }; + 69DF15712237DEDC00C1F8ED /* TGVVideoRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 69DF15672237DEDB00C1F8ED /* TGVVideoRenderer.h */; }; + 69DF15722237DEDC00C1F8ED /* TGVVideoSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 69DF15682237DEDB00C1F8ED /* TGVVideoSource.h */; }; + 69DF15732237DEDC00C1F8ED /* TGVVideoSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 69DF15692237DEDB00C1F8ED /* TGVVideoSource.mm */; }; + 69DF15742237DEDC00C1F8ED /* TGVVideoSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 69DF15692237DEDB00C1F8ED /* TGVVideoSource.mm */; }; + 69DF15772237DEDC00C1F8ED /* VideoToolboxEncoderSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 69DF156B2237DEDC00C1F8ED /* VideoToolboxEncoderSource.h */; }; + 69DF15782237DEDC00C1F8ED /* VideoToolboxEncoderSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 69DF156C2237DEDC00C1F8ED /* VideoToolboxEncoderSource.mm */; }; + 69DF15792237DEDC00C1F8ED /* VideoToolboxEncoderSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 69DF156C2237DEDC00C1F8ED /* VideoToolboxEncoderSource.mm */; }; + 69DF157B2237DFE100C1F8ED /* SampleBufferDisplayLayerRenderer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 69DF157A2237DFE100C1F8ED /* SampleBufferDisplayLayerRenderer.mm */; }; + 69DF157C2237DFE100C1F8ED /* SampleBufferDisplayLayerRenderer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 69DF157A2237DFE100C1F8ED /* SampleBufferDisplayLayerRenderer.mm */; }; + 69DF157E2237DFE700C1F8ED /* SampleBufferDisplayLayerRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 69DF157D2237DFE700C1F8ED /* SampleBufferDisplayLayerRenderer.h */; }; 69EBC7912136D220003CFE90 /* AudioInputAudioUnitOSX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A87DDC1F4B6A61002D3F73 /* AudioInputAudioUnitOSX.cpp */; }; 69EBC7922136D220003CFE90 /* AudioOutputAudioUnitOSX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A87DDE1F4B6A61002D3F73 /* AudioOutputAudioUnitOSX.cpp */; }; 69EBC7942136D277003CFE90 /* DarwinSpecific.mm in Sources */ = {isa = PBXBuildFile; fileRef = 69EBC7932136D277003CFE90 /* DarwinSpecific.mm */; }; @@ -1045,6 +1060,16 @@ 69A6DF401E9614B700000E69 /* AudioInputAudioUnitOSX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioInputAudioUnitOSX.h; path = os/darwin/AudioInputAudioUnitOSX.h; sourceTree = SOURCE_ROOT; }; 69A6DF411E9614B700000E69 /* AudioOutputAudioUnitOSX.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AudioOutputAudioUnitOSX.cpp; path = os/darwin/AudioOutputAudioUnitOSX.cpp; sourceTree = SOURCE_ROOT; }; 69A6DF421E9614B700000E69 /* AudioOutputAudioUnitOSX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AudioOutputAudioUnitOSX.h; path = os/darwin/AudioOutputAudioUnitOSX.h; sourceTree = SOURCE_ROOT; }; + 69DF15602237DEBB00C1F8ED /* ScreamCongestionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScreamCongestionController.h; sourceTree = ""; }; + 69DF15612237DEBB00C1F8ED /* ScreamCongestionController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScreamCongestionController.cpp; sourceTree = ""; }; + 69DF15652237DEDA00C1F8ED /* TGVVideoRenderer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TGVVideoRenderer.mm; sourceTree = ""; }; + 69DF15672237DEDB00C1F8ED /* TGVVideoRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TGVVideoRenderer.h; sourceTree = ""; }; + 69DF15682237DEDB00C1F8ED /* TGVVideoSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TGVVideoSource.h; sourceTree = ""; }; + 69DF15692237DEDB00C1F8ED /* TGVVideoSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TGVVideoSource.mm; sourceTree = ""; }; + 69DF156B2237DEDC00C1F8ED /* VideoToolboxEncoderSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoToolboxEncoderSource.h; sourceTree = ""; }; + 69DF156C2237DEDC00C1F8ED /* VideoToolboxEncoderSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = VideoToolboxEncoderSource.mm; sourceTree = ""; }; + 69DF157A2237DFE100C1F8ED /* SampleBufferDisplayLayerRenderer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SampleBufferDisplayLayerRenderer.mm; sourceTree = ""; }; + 69DF157D2237DFE700C1F8ED /* SampleBufferDisplayLayerRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SampleBufferDisplayLayerRenderer.h; sourceTree = ""; }; 69EBC7932136D277003CFE90 /* DarwinSpecific.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DarwinSpecific.mm; path = os/darwin/DarwinSpecific.mm; sourceTree = SOURCE_ROOT; }; 69EBC7952136D2A9003CFE90 /* Resampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Resampler.h; path = audio/Resampler.h; sourceTree = SOURCE_ROOT; }; 69F842361E67540700C110F7 /* libtgvoip.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = libtgvoip.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -2289,6 +2314,14 @@ 69A6DF421E9614B700000E69 /* AudioOutputAudioUnitOSX.h */, 695B20601EBD39FF00E31757 /* DarwinSpecific.h */, 69EBC7932136D277003CFE90 /* DarwinSpecific.mm */, + 69DF15672237DEDB00C1F8ED /* TGVVideoRenderer.h */, + 69DF15652237DEDA00C1F8ED /* TGVVideoRenderer.mm */, + 69DF157A2237DFE100C1F8ED /* SampleBufferDisplayLayerRenderer.mm */, + 69DF157D2237DFE700C1F8ED /* SampleBufferDisplayLayerRenderer.h */, + 69DF15682237DEDB00C1F8ED /* TGVVideoSource.h */, + 69DF15692237DEDB00C1F8ED /* TGVVideoSource.mm */, + 69DF156B2237DEDC00C1F8ED /* VideoToolboxEncoderSource.h */, + 69DF156C2237DEDC00C1F8ED /* VideoToolboxEncoderSource.mm */, ); name = darwin; path = os/darwin; @@ -2326,6 +2359,8 @@ 694DE89D219F2265009C09A7 /* VideoRenderer.cpp */, 694DE89E219F2265009C09A7 /* VideoSource.cpp */, 694DE89F219F2265009C09A7 /* VideoSource.h */, + 69DF15612237DEBB00C1F8ED /* ScreamCongestionController.cpp */, + 69DF15602237DEBB00C1F8ED /* ScreamCongestionController.h */, ); path = video; sourceTree = ""; @@ -2382,8 +2417,13 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + 69DF15622237DEBB00C1F8ED /* ScreamCongestionController.h in Headers */, 692AB9051E6759DD00706ACC /* VoIPServerConfig.h in Headers */, + 69DF15722237DEDC00C1F8ED /* TGVVideoSource.h in Headers */, + 69DF157E2237DFE700C1F8ED /* SampleBufferDisplayLayerRenderer.h in Headers */, 692AB9031E6759DD00706ACC /* VoIPController.h in Headers */, + 69DF15772237DEDC00C1F8ED /* VideoToolboxEncoderSource.h in Headers */, + 69DF15712237DEDC00C1F8ED /* TGVVideoRenderer.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2543,7 +2583,12 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 69DF15742237DEDC00C1F8ED /* TGVVideoSource.mm in Sources */, + 69DF157C2237DFE100C1F8ED /* SampleBufferDisplayLayerRenderer.mm in Sources */, 697B6FDF2136F01E004C8E54 /* MockReflector.cpp in Sources */, + 69DF15792237DEDC00C1F8ED /* VideoToolboxEncoderSource.mm in Sources */, + 69DF15642237DEBB00C1F8ED /* ScreamCongestionController.cpp in Sources */, + 69DF156E2237DEDC00C1F8ED /* TGVVideoRenderer.mm in Sources */, 697B6FC72136DBA4004C8E54 /* libtgvoipTests.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -2577,6 +2622,7 @@ 691E064221A4FD7600F838EF /* spl_sqrt.c in Sources */, 691E062321A4FD7600F838EF /* filter_ar_fast_q12.c in Sources */, 691E07A821A4FD7700F838EF /* fft_buffer.cc in Sources */, + 69DF15732237DEDC00C1F8ED /* TGVVideoSource.mm in Sources */, 691E05CA21A4FD7600F838EF /* string_view.cc in Sources */, 691E079C21A4FD7700F838EF /* echo_remover.cc in Sources */, 691E061921A4FD7600F838EF /* splitting_filter1.c in Sources */, @@ -2595,6 +2641,7 @@ 691E069021A4FD7600F838EF /* crc.c in Sources */, 691E064121A4FD7600F838EF /* spl_inl.c in Sources */, 691E06AA21A4FD7600F838EF /* nsx_core_c.c in Sources */, + 69DF157B2237DFE100C1F8ED /* SampleBufferDisplayLayerRenderer.mm in Sources */, 691E06A421A4FD7600F838EF /* splitting_filter.cc in Sources */, 691E07E321A4FD7700F838EF /* string_builder.cc in Sources */, 691E071421A4FD7700F838EF /* low_cut_filter.cc in Sources */, @@ -2637,6 +2684,7 @@ 691E06E521A4FD7600F838EF /* pitch_search.cc in Sources */, 691E062421A4FD7600F838EF /* spl_init.c in Sources */, 691E06EF21A4FD7600F838EF /* agc2_testing_common.cc in Sources */, + 69DF15632237DEBB00C1F8ED /* ScreamCongestionController.cpp in Sources */, 691E066421A4FD7600F838EF /* cpu_features.cc in Sources */, 691E07DB21A4FD7700F838EF /* block_mean_calculator.cc in Sources */, 692AB9041E6759DD00706ACC /* VoIPServerConfig.cpp in Sources */, @@ -2672,6 +2720,7 @@ 691E069E21A4FD7600F838EF /* normalized_covariance_estimator.cc in Sources */, 692AB8D81E6759DD00706ACC /* CongestionControl.cpp in Sources */, 692AB8EB1E6759DD00706ACC /* OpusDecoder.cpp in Sources */, + 69DF156D2237DEDC00C1F8ED /* TGVVideoRenderer.mm in Sources */, 691E071821A4FD7700F838EF /* echo_cancellation.cc in Sources */, 691E077821A4FD7700F838EF /* block_framer.cc in Sources */, 691E081121A4FD7700F838EF /* platform_thread_types.cc in Sources */, @@ -2679,6 +2728,7 @@ 691E075121A4FD7700F838EF /* echo_remover_metrics.cc in Sources */, 691E066621A4FD7600F838EF /* fft.c in Sources */, 691E06F121A4FD7600F838EF /* fixed_gain_controller.cc in Sources */, + 69DF15782237DEDC00C1F8ED /* VideoToolboxEncoderSource.mm in Sources */, 691E077F21A4FD7700F838EF /* subtractor_output.cc in Sources */, 697B6FD62136E1F3004C8E54 /* AudioIO.cpp in Sources */, 691E072D21A4FD7700F838EF /* digital_agc.c in Sources */, diff --git a/os/darwin/SampleBufferDisplayLayerRenderer.cpp b/os/darwin/SampleBufferDisplayLayerRenderer.cpp deleted file mode 100644 index 1a0046f..0000000 --- a/os/darwin/SampleBufferDisplayLayerRenderer.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// -// libtgvoip is free and unencumbered public domain software. -// For more information, see http://unlicense.org or the UNLICENSE file -// you should have received with this source code distribution. -// - -#include "SampleBufferDisplayLayerRenderer.h" -#include "../../PrivateDefines.h" - -using namespace tgvoip; -using namespace tgvoip::video; - -SampleBufferDisplayLayerRenderer::SampleBufferDisplayLayerRenderer(){ - -} - -SampleBufferDisplayLayerRenderer::~SampleBufferDisplayLayerRenderer(){ - -} - -void SampleBufferDisplayLayerRenderer::Reset(uint32_t codec, unsigned int width, unsigned int height, std::vector& csd){ - -} - -void SampleBufferDisplayLayerRenderer::DecodeAndDisplay(Buffer frame, uint32_t pts){ - -} - -void SampleBufferDisplayLayerRenderer::SetStreamEnabled(bool enabled){ - -} - -int SampleBufferDisplayLayerRenderer::GetMaximumResolution(){ - return INIT_VIDEO_RES_1080; -} diff --git a/os/darwin/VideoToolboxEncoderSource.cpp b/os/darwin/VideoToolboxEncoderSource.cpp deleted file mode 100644 index 602c31d..0000000 --- a/os/darwin/VideoToolboxEncoderSource.cpp +++ /dev/null @@ -1,39 +0,0 @@ -// -// libtgvoip is free and unencumbered public domain software. -// For more information, see http://unlicense.org or the UNLICENSE file -// you should have received with this source code distribution. -// - -#include "VideoToolboxEncoderSource.h" -#include "../../PrivateDefines.h" - -using namespace tgvoip; -using namespace tgvoip::video; - -VideoToolboxEncoderSource::VideoToolboxEncoderSource(){ - -} - -VideoToolboxEncoderSource::~VideoToolboxEncoderSource(){ - -} - -void VideoToolboxEncoderSource::Start(){ - -} - -void VideoToolboxEncoderSource::Stop(){ - -} - -void VideoToolboxEncoderSource::Reset(uint32_t codec, int maxResolution){ - -} - -void VideoToolboxEncoderSource::RequestKeyFrame(){ - -} - -void VideoToolboxEncoderSource::EncodeFrame(CMSampleBufferRef frame){ - -}