diff --git a/Makefile.am b/Makefile.am index d27a471..7ee66a3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,7 +55,7 @@ audio/AudioOutput.h \ audio/Resampler.h \ os/posix/NetworkSocketPosix.h \ video/VideoSource.h \ -video/Videocontroller/PacketSender.h \ +video/VideoPacketSender.h \ video/VideoFEC.h \ video/VideoRenderer.h \ video/ScreamCongestionController.h \ diff --git a/Makefile.in b/Makefile.in index 6231a75..7a96955 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1437,10 +1437,9 @@ am__libtgvoip_la_SOURCES_DIST = TgVoip.cpp VoIPController.cpp \ controller/PacketReassembler.h VoIPServerConfig.h \ audio/AudioIO.h audio/AudioInput.h audio/AudioOutput.h \ audio/Resampler.h os/posix/NetworkSocketPosix.h \ - video/VideoSource.h video/Videocontroller/PacketSender.h \ - video/VideoFEC.h video/VideoRenderer.h \ - video/ScreamCongestionController.h tools/json11.hpp \ - tools/utils.h os/darwin/AudioInputAudioUnit.h \ + video/VideoSource.h video/VideoPacketSender.h video/VideoFEC.h \ + video/VideoRenderer.h video/ScreamCongestionController.h \ + tools/json11.hpp tools/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 \ @@ -2185,10 +2184,9 @@ am__nobase_tgvoipinclude_HEADERS_DIST = TgVoip.h VoIPController.h \ controller/PacketReassembler.h VoIPServerConfig.h \ audio/AudioIO.h audio/AudioInput.h audio/AudioOutput.h \ audio/Resampler.h os/posix/NetworkSocketPosix.h \ - video/VideoSource.h video/Videocontroller/PacketSender.h \ - video/VideoFEC.h video/VideoRenderer.h \ - video/ScreamCongestionController.h tools/json11.hpp \ - tools/utils.h os/darwin/AudioInputAudioUnit.h \ + video/VideoSource.h video/VideoPacketSender.h video/VideoFEC.h \ + video/VideoRenderer.h video/ScreamCongestionController.h \ + tools/json11.hpp tools/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 \ @@ -2401,11 +2399,10 @@ TGVOIP_HDRS = TgVoip.h VoIPController.h tools/Buffers.h \ controller/PacketReassembler.h VoIPServerConfig.h \ audio/AudioIO.h audio/AudioInput.h audio/AudioOutput.h \ audio/Resampler.h os/posix/NetworkSocketPosix.h \ - video/VideoSource.h video/Videocontroller/PacketSender.h \ - video/VideoFEC.h video/VideoRenderer.h \ - video/ScreamCongestionController.h tools/json11.hpp \ - tools/utils.h $(am__append_2) $(am__append_5) $(am__append_7) \ - $(am__append_17) + video/VideoSource.h video/VideoPacketSender.h video/VideoFEC.h \ + video/VideoRenderer.h video/ScreamCongestionController.h \ + tools/json11.hpp tools/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) diff --git a/libtgvoip.UWP.vcxproj b/libtgvoip.UWP.vcxproj index 4cd004f..7542f5b 100644 --- a/libtgvoip.UWP.vcxproj +++ b/libtgvoip.UWP.vcxproj @@ -262,7 +262,7 @@ - + diff --git a/libtgvoip.UWP.vcxproj.filters b/libtgvoip.UWP.vcxproj.filters index 517fc4b..c94acb4 100644 --- a/libtgvoip.UWP.vcxproj.filters +++ b/libtgvoip.UWP.vcxproj.filters @@ -1929,7 +1929,7 @@ video - + video diff --git a/libtgvoip.gyp b/libtgvoip.gyp index 555d2ef..132995e 100644 --- a/libtgvoip.gyp +++ b/libtgvoip.gyp @@ -75,7 +75,7 @@ '<(tgvoip_src_loc)/video/VideoRenderer.cpp', '<(tgvoip_src_loc)/video/VideoRenderer.h', '<(tgvoip_src_loc)/video/VideoPacketSender.cpp', - '<(tgvoip_src_loc)/video/Videocontroller/PacketSender.h', + '<(tgvoip_src_loc)/video/VideoPacketSender.h', '<(tgvoip_src_loc)/video/VideoFEC.cpp', '<(tgvoip_src_loc)/video/VideoFEC.h', '<(tgvoip_src_loc)/tools/json11.cpp', diff --git a/libtgvoip.xcodeproj/project.pbxproj b/libtgvoip.xcodeproj/project.pbxproj index b9bd5a3..e34dc97 100644 --- a/libtgvoip.xcodeproj/project.pbxproj +++ b/libtgvoip.xcodeproj/project.pbxproj @@ -30,7 +30,7 @@ 692AB91F1E675F7000706ACC /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 692AB91C1E675F7000706ACC /* AudioToolbox.framework */; }; 692AB9201E675F7000706ACC /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 692AB91D1E675F7000706ACC /* AudioUnit.framework */; }; 692AB9211E675F7000706ACC /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 692AB91E1E675F7000706ACC /* CoreAudio.framework */; }; - 69719A7B224A627F00FE9B2A /* Videocontroller/PacketSender.h in Headers */ = {isa = PBXBuildFile; fileRef = 69719A77224A627E00FE9B2A /* Videocontroller/PacketSender.h */; }; + 69719A7B224A627F00FE9B2A /* VideoPacketSender.h in Headers */ = {isa = PBXBuildFile; fileRef = 69719A77224A627E00FE9B2A /* VideoPacketSender.h */; }; 69719A7C224A627F00FE9B2A /* VideoFEC.h in Headers */ = {isa = PBXBuildFile; fileRef = 69719A78224A627E00FE9B2A /* VideoFEC.h */; }; 69719A7D224A627F00FE9B2A /* VideoFEC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69719A79224A627F00FE9B2A /* VideoFEC.cpp */; }; 69719A7E224A627F00FE9B2A /* VideoPacketSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69719A7A224A627F00FE9B2A /* VideoPacketSender.cpp */; }; @@ -426,7 +426,7 @@ 692AB91C1E675F7000706ACC /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 692AB91D1E675F7000706ACC /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; }; 692AB91E1E675F7000706ACC /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; - 69719A77224A627E00FE9B2A /* Videocontroller/PacketSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Videocontroller/PacketSender.h; sourceTree = ""; }; + 69719A77224A627E00FE9B2A /* VideoPacketSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoPacketSender.h; sourceTree = ""; }; 69719A78224A627E00FE9B2A /* VideoFEC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoFEC.h; sourceTree = ""; }; 69719A79224A627F00FE9B2A /* VideoFEC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VideoFEC.cpp; sourceTree = ""; }; 69719A7A224A627F00FE9B2A /* VideoPacketSender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VideoPacketSender.cpp; sourceTree = ""; }; @@ -2340,7 +2340,7 @@ 69719A79224A627F00FE9B2A /* VideoFEC.cpp */, 69719A78224A627E00FE9B2A /* VideoFEC.h */, 69719A7A224A627F00FE9B2A /* VideoPacketSender.cpp */, - 69719A77224A627E00FE9B2A /* Videocontroller/PacketSender.h */, + 69719A77224A627E00FE9B2A /* VideoPacketSender.h */, 69B607D322318BBD00ED7D94 /* ScreamCongestionController.cpp */, 69B607D222318BBD00ED7D94 /* ScreamCongestionController.h */, 69DD8CFD218CD400001E8140 /* VideoRenderer.h */, @@ -2376,7 +2376,7 @@ buildActionMask = 2147483647; files = ( 69F791552221F16C00FE53C4 /* VideoToolboxEncoderSource.h in Headers */, - 69719A7B224A627F00FE9B2A /* Videocontroller/PacketSender.h in Headers */, + 69719A7B224A627F00FE9B2A /* VideoPacketSender.h in Headers */, 69F7914C2220A41000FE53C4 /* TGVVideoSource.h in Headers */, 692AB9051E6759DD00706ACC /* VoIPServerConfig.h in Headers */, 692AB9031E6759DD00706ACC /* VoIPController.h in Headers */, diff --git a/libtgvoip_osx.xcodeproj/project.pbxproj b/libtgvoip_osx.xcodeproj/project.pbxproj index 954db27..bf5903e 100644 --- a/libtgvoip_osx.xcodeproj/project.pbxproj +++ b/libtgvoip_osx.xcodeproj/project.pbxproj @@ -310,7 +310,7 @@ 6970AF4E225FFEBE00F02034 /* VideoFEC.h in Headers */ = {isa = PBXBuildFile; fileRef = 6970AF4A225FFEBE00F02034 /* VideoFEC.h */; }; 6970AF4F225FFEBE00F02034 /* VideoPacketSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6970AF4B225FFEBE00F02034 /* VideoPacketSender.cpp */; }; 6970AF50225FFEBE00F02034 /* VideoFEC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6970AF4C225FFEBE00F02034 /* VideoFEC.cpp */; }; - 6970AF51225FFEBE00F02034 /* Videocontroller/PacketSender.h in Headers */ = {isa = PBXBuildFile; fileRef = 6970AF4D225FFEBE00F02034 /* Videocontroller/PacketSender.h */; }; + 6970AF51225FFEBE00F02034 /* VideoPacketSender.h in Headers */ = {isa = PBXBuildFile; fileRef = 6970AF4D225FFEBE00F02034 /* VideoPacketSender.h */; }; 6971220F20C8107F00971C2C /* controller/PacketReassembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6971220D20C8107E00971C2C /* controller/PacketReassembler.cpp */; }; 6976FD0320F6A7060019939E /* tools/MessageThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6976FD0120F6A7050019939E /* tools/MessageThread.cpp */; }; 697B6FC72136DBA4004C8E54 /* libtgvoipTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 697B6FC62136DBA4004C8E54 /* libtgvoipTests.mm */; }; @@ -1046,7 +1046,7 @@ 6970AF4A225FFEBE00F02034 /* VideoFEC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoFEC.h; sourceTree = ""; }; 6970AF4B225FFEBE00F02034 /* VideoPacketSender.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VideoPacketSender.cpp; sourceTree = ""; }; 6970AF4C225FFEBE00F02034 /* VideoFEC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VideoFEC.cpp; sourceTree = ""; }; - 6970AF4D225FFEBE00F02034 /* Videocontroller/PacketSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Videocontroller/PacketSender.h; sourceTree = ""; }; + 6970AF4D225FFEBE00F02034 /* VideoPacketSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoPacketSender.h; sourceTree = ""; }; 6971220D20C8107E00971C2C /* controller/PacketReassembler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controller/PacketReassembler.cpp; sourceTree = SOURCE_ROOT; }; 6971220E20C8107F00971C2C /* controller/PacketReassembler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = controller/PacketReassembler.h; sourceTree = SOURCE_ROOT; }; 6976FD0120F6A7050019939E /* tools/MessageThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tools/MessageThread.cpp; sourceTree = SOURCE_ROOT; }; @@ -2372,7 +2372,7 @@ 6970AF4C225FFEBE00F02034 /* VideoFEC.cpp */, 6970AF4A225FFEBE00F02034 /* VideoFEC.h */, 6970AF4B225FFEBE00F02034 /* VideoPacketSender.cpp */, - 6970AF4D225FFEBE00F02034 /* Videocontroller/PacketSender.h */, + 6970AF4D225FFEBE00F02034 /* VideoPacketSender.h */, 69DF15612237DEBB00C1F8ED /* ScreamCongestionController.cpp */, 69DF15602237DEBB00C1F8ED /* ScreamCongestionController.h */, ); @@ -2432,7 +2432,7 @@ buildActionMask = 2147483647; files = ( 69DF15622237DEBB00C1F8ED /* ScreamCongestionController.h in Headers */, - 6970AF51225FFEBE00F02034 /* Videocontroller/PacketSender.h in Headers */, + 6970AF51225FFEBE00F02034 /* VideoPacketSender.h in Headers */, 692AB9051E6759DD00706ACC /* VoIPServerConfig.h in Headers */, 69DF15722237DEDC00C1F8ED /* TGVVideoSource.h in Headers */, 69DF157E2237DFE700C1F8ED /* SampleBufferDisplayLayerRenderer.h in Headers */,