From 52ee092c3755758db7102a7bede9a0fbf8720766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Iv=C3=A1n?= Date: Wed, 26 Oct 2016 12:08:36 -0300 Subject: [PATCH 01/14] Updated README.md to instruct using 0.3.0 instead of 0.2.0 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 787f6999..1d50849c 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ VideoCore is a project inteded to be an audio and video manipulation and streami Create a `Podfile` with the contents ``` ruby platform :ios, '6.0' -pod 'VideoCore', '~> 0.2.0' +pod 'VideoCore', '~> 0.3.0' ``` Next, run `pod install` and open the `xcworkspace` file that is created. From b8340905ff4cdece5bebc5fa786f8010250b5af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Iv=C3=A1n?= Date: Mon, 12 Jun 2017 12:03:44 -0400 Subject: [PATCH 02/14] Replaced 'videocore' for 'VideoCore' in #include/#import from transforms. --- transforms/AspectTransform.cpp | 6 +++--- transforms/AspectTransform.h | 2 +- transforms/IEncoder.hpp | 2 +- transforms/IMetaData.hpp | 2 +- transforms/IOutput.hpp | 2 +- transforms/IOutputSession.hpp | 2 +- transforms/ITransform.hpp | 2 +- transforms/PositionTransform.cpp | 4 ++-- transforms/PositionTransform.h | 2 +- transforms/Split.cpp | 2 +- transforms/Split.h | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/transforms/AspectTransform.cpp b/transforms/AspectTransform.cpp index 04ffbf9a..bf188da4 100644 --- a/transforms/AspectTransform.cpp +++ b/transforms/AspectTransform.cpp @@ -23,9 +23,9 @@ */ -#include -#include -#include +#include +#include +#include #include diff --git a/transforms/AspectTransform.h b/transforms/AspectTransform.h index e9dbbe94..67a9ad4c 100644 --- a/transforms/AspectTransform.h +++ b/transforms/AspectTransform.h @@ -26,7 +26,7 @@ #define __videocore__AspectTransform__ #include -#include +#include #include namespace videocore { diff --git a/transforms/IEncoder.hpp b/transforms/IEncoder.hpp index 5bb67072..93be0f8a 100644 --- a/transforms/IEncoder.hpp +++ b/transforms/IEncoder.hpp @@ -26,7 +26,7 @@ #ifndef __videocore_IEncoder_h #define __videocore_IEncoder_h -#include +#include namespace videocore { diff --git a/transforms/IMetaData.hpp b/transforms/IMetaData.hpp index cd3cb17a..027b586c 100644 --- a/transforms/IMetaData.hpp +++ b/transforms/IMetaData.hpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include namespace videocore diff --git a/transforms/IOutput.hpp b/transforms/IOutput.hpp index 0dc5ed95..aa145bc2 100644 --- a/transforms/IOutput.hpp +++ b/transforms/IOutput.hpp @@ -26,7 +26,7 @@ #define videocore_IOutput_hpp #include #include -#include +#include namespace videocore { diff --git a/transforms/IOutputSession.hpp b/transforms/IOutputSession.hpp index 0af5a1ad..78d9da0f 100644 --- a/transforms/IOutputSession.hpp +++ b/transforms/IOutputSession.hpp @@ -26,7 +26,7 @@ #ifndef videocore_IOutputSession_hpp #define videocore_IOutputSession_hpp -#include +#include namespace videocore { diff --git a/transforms/ITransform.hpp b/transforms/ITransform.hpp index 782bd35e..7d25b48c 100644 --- a/transforms/ITransform.hpp +++ b/transforms/ITransform.hpp @@ -26,7 +26,7 @@ #ifndef videocore_ITransform_hpp #define videocore_ITransform_hpp -#include +#include #include namespace videocore { diff --git a/transforms/PositionTransform.cpp b/transforms/PositionTransform.cpp index f14d3c42..ad3fb202 100644 --- a/transforms/PositionTransform.cpp +++ b/transforms/PositionTransform.cpp @@ -24,9 +24,9 @@ */ -#include +#include #include -#include +#include namespace videocore { PositionTransform::PositionTransform(int x, diff --git a/transforms/PositionTransform.h b/transforms/PositionTransform.h index aee03270..3c2f78cf 100644 --- a/transforms/PositionTransform.h +++ b/transforms/PositionTransform.h @@ -27,7 +27,7 @@ #define __videocore__PositionTransform__ #include -#include +#include #include namespace videocore { diff --git a/transforms/Split.cpp b/transforms/Split.cpp index 7174e2d6..935e3b33 100644 --- a/transforms/Split.cpp +++ b/transforms/Split.cpp @@ -27,7 +27,7 @@ * * */ -#include +#include namespace videocore { Split::Split() {} diff --git a/transforms/Split.h b/transforms/Split.h index fe82d198..885fd291 100644 --- a/transforms/Split.h +++ b/transforms/Split.h @@ -32,7 +32,7 @@ #define __videocore__Split__ #include -#include +#include #include namespace videocore { From 6318b108c5b4fc41a373fa05e75eda2ea54af50f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Iv=C3=A1n?= Date: Mon, 12 Jun 2017 12:05:17 -0400 Subject: [PATCH 03/14] Updated CocoaPods specs. --- VideoCore.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VideoCore.podspec b/VideoCore.podspec index 2f47d3c7..fe5296b8 100644 --- a/VideoCore.podspec +++ b/VideoCore.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "VideoCore" - s.version = "0.3.2" + s.version = "0.3.3" s.summary = "An audio and video manipulation and streaming pipeline with support for RTMP." s.description = <<-DESC This is a work-in-progress library with the From 8f8a1a518ce1f70d21112eeb8da60c91f062e1c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Iv=C3=A1n?= Date: Mon, 12 Jun 2017 12:25:15 -0400 Subject: [PATCH 04/14] Replaced 'videocore' for 'VideoCore' in all #include/#import statements. --- api/iOS/VCPreviewView.mm | 2 +- api/iOS/VCSimpleSession.mm | 36 +++++++++---------- filters/Basic/BasicVideoFilterBGRA.cpp | 6 ++-- filters/Basic/BasicVideoFilterBGRA.h | 2 +- .../Basic/BasicVideoFilterBGRAinYUVAout.cpp | 6 ++-- filters/Basic/BasicVideoFilterBGRAinYUVAout.h | 2 +- filters/Basic/FisheyeVideoFilter.cpp | 6 ++-- filters/Basic/FisheyeVideoFilter.h | 2 +- filters/Basic/GlowVideoFilter.cpp | 6 ++-- filters/Basic/GlowVideoFilter.h | 2 +- filters/Basic/GrayscaleVideoFilter.cpp | 6 ++-- filters/Basic/GrayscaleVideoFilter.h | 2 +- filters/Basic/InvertColorsVideoFilter.cpp | 6 ++-- filters/Basic/InvertColorsVideoFilter.h | 2 +- filters/Basic/SepiaVideoFilter.cpp | 6 ++-- filters/Basic/SepiaVideoFilter.h | 2 +- filters/FilterFactory.cpp | 14 ++++---- filters/FilterFactory.h | 2 +- filters/IVideoFilter.hpp | 2 +- mixers/Apple/AudioMixer.cpp | 2 +- mixers/Apple/AudioMixer.h | 2 +- mixers/GenericAudioMixer.cpp | 2 +- mixers/GenericAudioMixer.h | 6 ++-- mixers/IAudioMixer.hpp | 6 ++-- mixers/IMixer.hpp | 2 +- mixers/IVideoMixer.hpp | 6 ++-- mixers/iOS/GLESVideoMixer.h | 6 ++-- mixers/iOS/GLESVideoMixer.mm | 6 ++-- rtmp/RTMPSession.cpp | 6 ++-- rtmp/RTMPSession.h | 14 ++++---- sources/Apple/PixelBufferSource.h | 4 +-- sources/Apple/PixelBufferSource.mm | 6 ++-- sources/ISource.hpp | 4 +-- sources/iOS/CameraSource.h | 4 +-- sources/iOS/CameraSource.mm | 6 ++-- sources/iOS/GLESUtil.h | 2 +- sources/iOS/MicSource.h | 4 +-- sources/iOS/MicSource.mm | 2 +- stream/Apple/StreamSession.mm | 2 +- stream/IStreamSession.hpp | 2 +- stream/IThroughputAdaptation.h | 2 +- stream/TCPThroughputAdaptation.cpp | 2 +- stream/TCPThroughputAdaptation.h | 4 +-- system/Logger.cpp | 2 +- system/Logger.hpp | 2 +- system/PreBuffer.cpp | 2 +- system/h264/Golomb.cpp | 2 +- system/pixelBuffer/Apple/PixelBuffer.cpp | 2 +- system/pixelBuffer/Apple/PixelBuffer.h | 2 +- system/pixelBuffer/GenericPixelBuffer.cpp | 2 +- system/pixelBuffer/GenericPixelBuffer.h | 2 +- transforms/Apple/H264Encode.h | 4 +-- transforms/Apple/H264Encode.mm | 4 +-- transforms/Apple/MP4Multiplexer.h | 2 +- transforms/Apple/MP4Multiplexer.mm | 4 +-- transforms/RTMP/AACPacketizer.cpp | 6 ++-- transforms/RTMP/AACPacketizer.h | 2 +- transforms/RTMP/H264Packetizer.cpp | 6 ++-- transforms/RTMP/H264Packetizer.h | 2 +- transforms/iOS/AACEncode.cpp | 2 +- transforms/iOS/AACEncode.h | 4 +-- transforms/iOS/H264Encode.h | 6 ++-- transforms/iOS/H264Encode.mm | 4 +-- 63 files changed, 138 insertions(+), 138 deletions(-) diff --git a/api/iOS/VCPreviewView.mm b/api/iOS/VCPreviewView.mm index 55bcd545..8e461537 100644 --- a/api/iOS/VCPreviewView.mm +++ b/api/iOS/VCPreviewView.mm @@ -24,7 +24,7 @@ of this software and associated documentation files (the "Software"), to deal */ #import "VCPreviewView.h" -#include +#include #import #import diff --git a/api/iOS/VCSimpleSession.mm b/api/iOS/VCSimpleSession.mm index 8339d000..0f5967e4 100644 --- a/api/iOS/VCSimpleSession.mm +++ b/api/iOS/VCSimpleSession.mm @@ -23,33 +23,33 @@ of this software and associated documentation files (the "Software"), to deal */ -#import -#import +#import +#import -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #ifdef __APPLE__ -# include -# include -# include -# include +# include +# include +# include +# include # ifdef TARGET_OS_IPHONE -# include -# include -# include -# include -# include +# include +# include +# include +# include +# include # else /* OS X */ # endif #else -# include +# include #endif #define SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(v) ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedAscending) diff --git a/filters/Basic/BasicVideoFilterBGRA.cpp b/filters/Basic/BasicVideoFilterBGRA.cpp index cb3ace41..9df704cc 100644 --- a/filters/Basic/BasicVideoFilterBGRA.cpp +++ b/filters/Basic/BasicVideoFilterBGRA.cpp @@ -1,5 +1,5 @@ -#include +#include #include @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include #endif diff --git a/filters/Basic/BasicVideoFilterBGRA.h b/filters/Basic/BasicVideoFilterBGRA.h index 75661156..9d02195a 100644 --- a/filters/Basic/BasicVideoFilterBGRA.h +++ b/filters/Basic/BasicVideoFilterBGRA.h @@ -24,7 +24,7 @@ */ #ifndef videocore_BasicVideoFilterBGRA_h #define videocore_BasicVideoFilterBGRA_h -#include +#include namespace videocore { namespace filters { diff --git a/filters/Basic/BasicVideoFilterBGRAinYUVAout.cpp b/filters/Basic/BasicVideoFilterBGRAinYUVAout.cpp index 8b4b4e0c..3c82958c 100644 --- a/filters/Basic/BasicVideoFilterBGRAinYUVAout.cpp +++ b/filters/Basic/BasicVideoFilterBGRAinYUVAout.cpp @@ -1,12 +1,12 @@ -#include +#include #ifdef __APPLE__ #include # ifdef TARGET_OS_IPHONE # include # include -# include -# include +# include +# include # endif #endif diff --git a/filters/Basic/BasicVideoFilterBGRAinYUVAout.h b/filters/Basic/BasicVideoFilterBGRAinYUVAout.h index c085cd06..e6d5e7b6 100644 --- a/filters/Basic/BasicVideoFilterBGRAinYUVAout.h +++ b/filters/Basic/BasicVideoFilterBGRAinYUVAout.h @@ -2,7 +2,7 @@ #ifndef __mobcrush__BasicVideoFilterBGRAinYUVAout__ #define __mobcrush__BasicVideoFilterBGRAinYUVAout__ -#include +#include namespace videocore { namespace filters { diff --git a/filters/Basic/FisheyeVideoFilter.cpp b/filters/Basic/FisheyeVideoFilter.cpp index ef99f368..a7fe68db 100644 --- a/filters/Basic/FisheyeVideoFilter.cpp +++ b/filters/Basic/FisheyeVideoFilter.cpp @@ -1,5 +1,5 @@ -#include +#include #include @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include #endif diff --git a/filters/Basic/FisheyeVideoFilter.h b/filters/Basic/FisheyeVideoFilter.h index eee996f6..7904280e 100644 --- a/filters/Basic/FisheyeVideoFilter.h +++ b/filters/Basic/FisheyeVideoFilter.h @@ -24,7 +24,7 @@ */ #ifndef videocore_FisheyeVideoFilter_h #define videocore_FisheyeVideoFilter_h -#include +#include namespace videocore { namespace filters { diff --git a/filters/Basic/GlowVideoFilter.cpp b/filters/Basic/GlowVideoFilter.cpp index b21b76aa..8f94259e 100644 --- a/filters/Basic/GlowVideoFilter.cpp +++ b/filters/Basic/GlowVideoFilter.cpp @@ -1,5 +1,5 @@ -#include +#include #include @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include #endif diff --git a/filters/Basic/GlowVideoFilter.h b/filters/Basic/GlowVideoFilter.h index f5fee1d3..99dd2c63 100644 --- a/filters/Basic/GlowVideoFilter.h +++ b/filters/Basic/GlowVideoFilter.h @@ -24,7 +24,7 @@ */ #ifndef videocore_GlowVideoFilter_h #define videocore_GlowVideoFilter_h -#include +#include namespace videocore { namespace filters { diff --git a/filters/Basic/GrayscaleVideoFilter.cpp b/filters/Basic/GrayscaleVideoFilter.cpp index a3b855e9..390fafeb 100644 --- a/filters/Basic/GrayscaleVideoFilter.cpp +++ b/filters/Basic/GrayscaleVideoFilter.cpp @@ -1,5 +1,5 @@ -#include +#include #include @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include #endif diff --git a/filters/Basic/GrayscaleVideoFilter.h b/filters/Basic/GrayscaleVideoFilter.h index 3b0656ab..c5865f82 100644 --- a/filters/Basic/GrayscaleVideoFilter.h +++ b/filters/Basic/GrayscaleVideoFilter.h @@ -24,7 +24,7 @@ */ #ifndef videocore_GrayscaleVideoFilter_h #define videocore_GrayscaleVideoFilter_h -#include +#include namespace videocore { namespace filters { diff --git a/filters/Basic/InvertColorsVideoFilter.cpp b/filters/Basic/InvertColorsVideoFilter.cpp index 8e47d17f..29dd1725 100644 --- a/filters/Basic/InvertColorsVideoFilter.cpp +++ b/filters/Basic/InvertColorsVideoFilter.cpp @@ -1,5 +1,5 @@ -#include +#include #include @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include #endif diff --git a/filters/Basic/InvertColorsVideoFilter.h b/filters/Basic/InvertColorsVideoFilter.h index 239eeecd..ec29af72 100644 --- a/filters/Basic/InvertColorsVideoFilter.h +++ b/filters/Basic/InvertColorsVideoFilter.h @@ -24,7 +24,7 @@ */ #ifndef videocore_InvertColorsVideoFilter_h #define videocore_InvertColorsVideoFilter_h -#include +#include namespace videocore { namespace filters { diff --git a/filters/Basic/SepiaVideoFilter.cpp b/filters/Basic/SepiaVideoFilter.cpp index 59cd2ba5..2e5b2897 100644 --- a/filters/Basic/SepiaVideoFilter.cpp +++ b/filters/Basic/SepiaVideoFilter.cpp @@ -1,5 +1,5 @@ -#include +#include #include @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include #endif diff --git a/filters/Basic/SepiaVideoFilter.h b/filters/Basic/SepiaVideoFilter.h index b8890093..274fb754 100644 --- a/filters/Basic/SepiaVideoFilter.h +++ b/filters/Basic/SepiaVideoFilter.h @@ -24,7 +24,7 @@ */ #ifndef videocore_SepiaVideoFilter_h #define videocore_SepiaVideoFilter_h -#include +#include namespace videocore { namespace filters { diff --git a/filters/FilterFactory.cpp b/filters/FilterFactory.cpp index 13b8722d..297e15a4 100644 --- a/filters/FilterFactory.cpp +++ b/filters/FilterFactory.cpp @@ -1,10 +1,10 @@ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace videocore { std::map* FilterFactory::s_registration = nullptr ; diff --git a/filters/FilterFactory.h b/filters/FilterFactory.h index de1b6813..1ea56e14 100644 --- a/filters/FilterFactory.h +++ b/filters/FilterFactory.h @@ -2,7 +2,7 @@ #ifndef __videocore__FilterFactory__ #define __videocore__FilterFactory__ -#include +#include #include #include #include diff --git a/filters/IVideoFilter.hpp b/filters/IVideoFilter.hpp index 2e804676..a9990622 100644 --- a/filters/IVideoFilter.hpp +++ b/filters/IVideoFilter.hpp @@ -31,7 +31,7 @@ #ifndef videocore_IVideoFilter_hpp #define videocore_IVideoFilter_hpp -#include +#include #include #define KERNEL(_language, _target, _kernelstr) if(_language == _target){ do { return # _kernelstr ; } while(0); } diff --git a/mixers/Apple/AudioMixer.cpp b/mixers/Apple/AudioMixer.cpp index e17aa17f..918bb77b 100644 --- a/mixers/Apple/AudioMixer.cpp +++ b/mixers/Apple/AudioMixer.cpp @@ -23,7 +23,7 @@ */ -#include +#include static const UInt32 s_samplingRateConverterComplexity = kAudioConverterSampleRateConverterComplexity_Normal; static const UInt32 s_samplingRateConverterQuality = kAudioConverterQuality_Medium; diff --git a/mixers/Apple/AudioMixer.h b/mixers/Apple/AudioMixer.h index 27f61639..5d5618c5 100644 --- a/mixers/Apple/AudioMixer.h +++ b/mixers/Apple/AudioMixer.h @@ -27,7 +27,7 @@ #define __videocore__AudioMixer__ #include -#include +#include #include #include diff --git a/mixers/GenericAudioMixer.cpp b/mixers/GenericAudioMixer.cpp index b7b6a446..57e9e033 100644 --- a/mixers/GenericAudioMixer.cpp +++ b/mixers/GenericAudioMixer.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. */ -#include +#include #include #include #include diff --git a/mixers/GenericAudioMixer.h b/mixers/GenericAudioMixer.h index 634b8e32..57b54265 100644 --- a/mixers/GenericAudioMixer.h +++ b/mixers/GenericAudioMixer.h @@ -27,9 +27,9 @@ #define __videocore__GenericAudioMixer__ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/mixers/IAudioMixer.hpp b/mixers/IAudioMixer.hpp index 6627ebe8..a9097a1e 100644 --- a/mixers/IAudioMixer.hpp +++ b/mixers/IAudioMixer.hpp @@ -25,9 +25,9 @@ #ifndef videocore_IAudioMixer_hpp #define videocore_IAudioMixer_hpp -#include -#include -#include +#include +#include +#include namespace videocore { diff --git a/mixers/IMixer.hpp b/mixers/IMixer.hpp index 09fd4732..72f1d5a7 100644 --- a/mixers/IMixer.hpp +++ b/mixers/IMixer.hpp @@ -25,7 +25,7 @@ #ifndef videocore_IMixer_hpp #define videocore_IMixer_hpp -#include +#include namespace videocore { diff --git a/mixers/IVideoMixer.hpp b/mixers/IVideoMixer.hpp index cc4add3c..37bdb6ed 100644 --- a/mixers/IVideoMixer.hpp +++ b/mixers/IVideoMixer.hpp @@ -25,9 +25,9 @@ #ifndef videocore_IVideoMixer_hpp #define videocore_IVideoMixer_hpp -#include -#include -#include +#include +#include +#include #include diff --git a/mixers/iOS/GLESVideoMixer.h b/mixers/iOS/GLESVideoMixer.h index a3f3505e..c9d0977c 100644 --- a/mixers/iOS/GLESVideoMixer.h +++ b/mixers/iOS/GLESVideoMixer.h @@ -28,9 +28,9 @@ #define __videocore__GLESVideoMixer__ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/mixers/iOS/GLESVideoMixer.mm b/mixers/iOS/GLESVideoMixer.mm index d8c6d641..78a97a11 100644 --- a/mixers/iOS/GLESVideoMixer.mm +++ b/mixers/iOS/GLESVideoMixer.mm @@ -24,9 +24,9 @@ of this software and associated documentation files (the "Software"), to deal */ -#include -#include -#include +#include +#include +#include #import #import diff --git a/rtmp/RTMPSession.cpp b/rtmp/RTMPSession.cpp index 56090687..1ba1db71 100644 --- a/rtmp/RTMPSession.cpp +++ b/rtmp/RTMPSession.cpp @@ -22,16 +22,16 @@ THE SOFTWARE. */ -#include +#include #ifdef __APPLE__ -#include +#include #endif #ifndef DLOG_LEVEL_DEF #define DLOG_LEVEL_DEF DLOG_LEVEL_VERBOSE #endif -#include +#include #include #include diff --git a/rtmp/RTMPSession.h b/rtmp/RTMPSession.h index 0a685cc2..e3702df8 100644 --- a/rtmp/RTMPSession.h +++ b/rtmp/RTMPSession.h @@ -26,8 +26,8 @@ #define __videocore__RTMSession__ #include -#include -#include +#include +#include #include @@ -37,13 +37,13 @@ #include #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace videocore { diff --git a/sources/Apple/PixelBufferSource.h b/sources/Apple/PixelBufferSource.h index 8b23b1c0..afc726d2 100644 --- a/sources/Apple/PixelBufferSource.h +++ b/sources/Apple/PixelBufferSource.h @@ -23,8 +23,8 @@ #define __videocore__PixelBufferSource__ #include -#include -#include +#include +#include #ifdef __APPLE__ # include diff --git a/sources/Apple/PixelBufferSource.mm b/sources/Apple/PixelBufferSource.mm index 68b49e2e..7dcc7866 100644 --- a/sources/Apple/PixelBufferSource.mm +++ b/sources/Apple/PixelBufferSource.mm @@ -19,11 +19,11 @@ USA */ -#include -#include +#include +#include #include #include -#include +#include #include diff --git a/sources/ISource.hpp b/sources/ISource.hpp index 51e19f8d..f0a20c5b 100644 --- a/sources/ISource.hpp +++ b/sources/ISource.hpp @@ -26,8 +26,8 @@ #ifndef videocore_ISource_hpp #define videocore_ISource_hpp -#include -#include +#include +#include namespace videocore { diff --git a/sources/iOS/CameraSource.h b/sources/iOS/CameraSource.h index bc2adacf..1387f8b1 100644 --- a/sources/iOS/CameraSource.h +++ b/sources/iOS/CameraSource.h @@ -26,8 +26,8 @@ #define __videocore__CameraSource__ #include -#include -#include +#include +#include #include #include diff --git a/sources/iOS/CameraSource.mm b/sources/iOS/CameraSource.mm index ad2d6050..3034d57b 100644 --- a/sources/iOS/CameraSource.mm +++ b/sources/iOS/CameraSource.mm @@ -23,9 +23,9 @@ of this software and associated documentation files (the "Software"), to deal */ -#include -#include -#include +#include +#include +#include #import #import diff --git a/sources/iOS/GLESUtil.h b/sources/iOS/GLESUtil.h index fb755351..7cc7d4ff 100644 --- a/sources/iOS/GLESUtil.h +++ b/sources/iOS/GLESUtil.h @@ -78,7 +78,7 @@ break;\ #define GL_FRAMEBUFFER_STATUS(line) #endif -#include +#include static float s_vbo [] = { diff --git a/sources/iOS/MicSource.h b/sources/iOS/MicSource.h index 3854cfa7..5c94ca9a 100644 --- a/sources/iOS/MicSource.h +++ b/sources/iOS/MicSource.h @@ -28,8 +28,8 @@ #include #import #import -#include -#include +#include +#include #import diff --git a/sources/iOS/MicSource.mm b/sources/iOS/MicSource.mm index d4b4dea3..c99b7b17 100644 --- a/sources/iOS/MicSource.mm +++ b/sources/iOS/MicSource.mm @@ -24,7 +24,7 @@ of this software and associated documentation files (the "Software"), to deal */ #include "MicSource.h" #include -#include +#include #import #import diff --git a/stream/Apple/StreamSession.mm b/stream/Apple/StreamSession.mm index c1e32a75..8aaa2e2d 100644 --- a/stream/Apple/StreamSession.mm +++ b/stream/Apple/StreamSession.mm @@ -25,7 +25,7 @@ of this software and associated documentation files (the "Software"), to deal #import #import #include -#include +#include #include #include diff --git a/stream/IStreamSession.hpp b/stream/IStreamSession.hpp index e47eb118..50e57b82 100644 --- a/stream/IStreamSession.hpp +++ b/stream/IStreamSession.hpp @@ -28,7 +28,7 @@ #include #include -#include +#include namespace videocore { diff --git a/stream/IThroughputAdaptation.h b/stream/IThroughputAdaptation.h index dda5dae3..d975cdf3 100644 --- a/stream/IThroughputAdaptation.h +++ b/stream/IThroughputAdaptation.h @@ -26,7 +26,7 @@ #define __videocore__IThroughputAdaptation__ #include -#include +#include namespace videocore { diff --git a/stream/TCPThroughputAdaptation.cpp b/stream/TCPThroughputAdaptation.cpp index dd887c3e..bc92ab11 100644 --- a/stream/TCPThroughputAdaptation.cpp +++ b/stream/TCPThroughputAdaptation.cpp @@ -23,7 +23,7 @@ */ -#include +#include #include #include diff --git a/stream/TCPThroughputAdaptation.h b/stream/TCPThroughputAdaptation.h index 525ad0c4..77ee9f27 100644 --- a/stream/TCPThroughputAdaptation.h +++ b/stream/TCPThroughputAdaptation.h @@ -25,8 +25,8 @@ #ifndef __videocore__TCPThroughputAdaptation__ #define __videocore__TCPThroughputAdaptation__ -#include -#include +#include +#include #include #include #include diff --git a/system/Logger.cpp b/system/Logger.cpp index 2fe6d479..5dc1ce35 100644 --- a/system/Logger.cpp +++ b/system/Logger.cpp @@ -6,7 +6,7 @@ // // -#include +#include #include diff --git a/system/Logger.hpp b/system/Logger.hpp index 937f1843..43879646 100644 --- a/system/Logger.hpp +++ b/system/Logger.hpp @@ -9,7 +9,7 @@ #ifndef Loggeer_hpp #define Loggeer_hpp -#include +#include #include namespace videocore { diff --git a/system/PreBuffer.cpp b/system/PreBuffer.cpp index 594c6331..98c6cdac 100644 --- a/system/PreBuffer.cpp +++ b/system/PreBuffer.cpp @@ -8,7 +8,7 @@ #include "PreBuffer.hpp" -#include +#include #include diff --git a/system/h264/Golomb.cpp b/system/h264/Golomb.cpp index 91ec2aeb..80d90cf4 100644 --- a/system/h264/Golomb.cpp +++ b/system/h264/Golomb.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. */ -#include +#include namespace videocore { namespace h264 { diff --git a/system/pixelBuffer/Apple/PixelBuffer.cpp b/system/pixelBuffer/Apple/PixelBuffer.cpp index 0e83746e..5300e628 100644 --- a/system/pixelBuffer/Apple/PixelBuffer.cpp +++ b/system/pixelBuffer/Apple/PixelBuffer.cpp @@ -24,7 +24,7 @@ */ -#include +#include namespace videocore { namespace Apple { diff --git a/system/pixelBuffer/Apple/PixelBuffer.h b/system/pixelBuffer/Apple/PixelBuffer.h index 673f430b..ce4b1569 100644 --- a/system/pixelBuffer/Apple/PixelBuffer.h +++ b/system/pixelBuffer/Apple/PixelBuffer.h @@ -26,7 +26,7 @@ #define videocore_PixelBuffer_hpp #include -#include +#include #include namespace videocore { namespace Apple { diff --git a/system/pixelBuffer/GenericPixelBuffer.cpp b/system/pixelBuffer/GenericPixelBuffer.cpp index 78a2d273..2c1db16f 100644 --- a/system/pixelBuffer/GenericPixelBuffer.cpp +++ b/system/pixelBuffer/GenericPixelBuffer.cpp @@ -1,4 +1,4 @@ -#include +#include namespace videocore { diff --git a/system/pixelBuffer/GenericPixelBuffer.h b/system/pixelBuffer/GenericPixelBuffer.h index 448a5b22..f662ae99 100644 --- a/system/pixelBuffer/GenericPixelBuffer.h +++ b/system/pixelBuffer/GenericPixelBuffer.h @@ -25,7 +25,7 @@ #ifndef videocore_GenericPixelBuffer_h #define videocore_GenericPixelBuffer_h -#include +#include #include #include diff --git a/transforms/Apple/H264Encode.h b/transforms/Apple/H264Encode.h index 2aef3ee4..b95f8f7e 100644 --- a/transforms/Apple/H264Encode.h +++ b/transforms/Apple/H264Encode.h @@ -19,8 +19,8 @@ USA */ -#include -#include +#include +#include #include #include diff --git a/transforms/Apple/H264Encode.mm b/transforms/Apple/H264Encode.mm index 2c677f80..18402693 100644 --- a/transforms/Apple/H264Encode.mm +++ b/transforms/Apple/H264Encode.mm @@ -34,8 +34,8 @@ #endif #include -#include -#include +#include +#include #if VERSION_OK==1 #include diff --git a/transforms/Apple/MP4Multiplexer.h b/transforms/Apple/MP4Multiplexer.h index 4f79d055..67750bfe 100644 --- a/transforms/Apple/MP4Multiplexer.h +++ b/transforms/Apple/MP4Multiplexer.h @@ -28,7 +28,7 @@ #include #include -#include +#include namespace videocore { namespace Apple { diff --git a/transforms/Apple/MP4Multiplexer.mm b/transforms/Apple/MP4Multiplexer.mm index 1a4ed7e3..5a9378cc 100644 --- a/transforms/Apple/MP4Multiplexer.mm +++ b/transforms/Apple/MP4Multiplexer.mm @@ -24,8 +24,8 @@ of this software and associated documentation files (the "Software"), to deal */ #import -#include -#include +#include +#include namespace videocore { namespace Apple { diff --git a/transforms/RTMP/AACPacketizer.cpp b/transforms/RTMP/AACPacketizer.cpp index 7760ed1a..558f666a 100644 --- a/transforms/RTMP/AACPacketizer.cpp +++ b/transforms/RTMP/AACPacketizer.cpp @@ -22,10 +22,10 @@ THE SOFTWARE. */ -#include +#include #include -#include -#include +#include +#include namespace videocore { namespace rtmp { diff --git a/transforms/RTMP/AACPacketizer.h b/transforms/RTMP/AACPacketizer.h index 5ca2eaeb..76b559b1 100644 --- a/transforms/RTMP/AACPacketizer.h +++ b/transforms/RTMP/AACPacketizer.h @@ -27,7 +27,7 @@ #define __videocore__AACPacketizer__ #include -#include +#include #include namespace videocore { namespace rtmp { diff --git a/transforms/RTMP/H264Packetizer.cpp b/transforms/RTMP/H264Packetizer.cpp index d232a4d4..abab9285 100644 --- a/transforms/RTMP/H264Packetizer.cpp +++ b/transforms/RTMP/H264Packetizer.cpp @@ -22,9 +22,9 @@ THE SOFTWARE. */ -#include -#include -#include +#include +#include +#include namespace videocore { namespace rtmp { diff --git a/transforms/RTMP/H264Packetizer.h b/transforms/RTMP/H264Packetizer.h index 1358a5d0..09c382e6 100644 --- a/transforms/RTMP/H264Packetizer.h +++ b/transforms/RTMP/H264Packetizer.h @@ -26,7 +26,7 @@ #ifndef videocore_H264Packetizer_h #define videocore_H264Packetizer_h -#include +#include #include diff --git a/transforms/iOS/AACEncode.cpp b/transforms/iOS/AACEncode.cpp index 8fe05093..8e248f61 100644 --- a/transforms/iOS/AACEncode.cpp +++ b/transforms/iOS/AACEncode.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. */ -#include +#include #include namespace videocore { namespace iOS { diff --git a/transforms/iOS/AACEncode.h b/transforms/iOS/AACEncode.h index f19fcd67..a2855d57 100644 --- a/transforms/iOS/AACEncode.h +++ b/transforms/iOS/AACEncode.h @@ -34,9 +34,9 @@ #define __videocore__AACEncode__ #include -#include +#include #include -#include +#include namespace videocore { namespace iOS { diff --git a/transforms/iOS/H264Encode.h b/transforms/iOS/H264Encode.h index afcd4649..adffe45f 100644 --- a/transforms/iOS/H264Encode.h +++ b/transforms/iOS/H264Encode.h @@ -33,9 +33,9 @@ #define __videocore__H264Encode__ #include -#include -#include -#include +#include +#include +#include #include namespace videocore { namespace iOS { diff --git a/transforms/iOS/H264Encode.mm b/transforms/iOS/H264Encode.mm index d8c5fc1c..2d44464b 100644 --- a/transforms/iOS/H264Encode.mm +++ b/transforms/iOS/H264Encode.mm @@ -22,8 +22,8 @@ of this software and associated documentation files (the "Software"), to deal THE SOFTWARE. */ -#include -#include +#include +#include #import #import From 0575a17489f9e5eb36f7df512644810c63add695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Iv=C3=A1n?= Date: Mon, 12 Jun 2017 12:36:43 -0400 Subject: [PATCH 05/14] Set glm header search paths recursive. --- VideoCore.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VideoCore.podspec b/VideoCore.podspec index fe5296b8..d660aada 100644 --- a/VideoCore.podspec +++ b/VideoCore.podspec @@ -14,7 +14,7 @@ Pod::Spec.new do |s| s.requires_arc = false - s.header_dir = 'videocore' + s.header_dir = 'VideoCore' s.header_mappings_dir = '.' s.source_files = [ 'mixers/**/*.h*', 'mixers/**/*.cpp', 'mixers/**/*.m*', @@ -35,7 +35,7 @@ Pod::Spec.new do |s| s.dependency 'glm', '~> 0.9.4.6' s.dependency 'UriParser-cpp', '~> 0.1.3' - s.xcconfig = { "HEADER_SEARCH_PATHS" => "${PODS_ROOT}/boost" } + s.xcconfig = { "HEADER_SEARCH_PATHS" => "${PODS_ROOT}/boost/**" } s.ios.deployment_target = '5.0' From f69b651b07ce0e71eef33b6503e99e9f26db3ce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Iv=C3=A1n?= Date: Mon, 12 Jun 2017 12:44:12 -0400 Subject: [PATCH 06/14] glm dependency depends on major subversion rather than a specific one. --- VideoCore.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VideoCore.podspec b/VideoCore.podspec index d660aada..a3e92ae1 100644 --- a/VideoCore.podspec +++ b/VideoCore.podspec @@ -32,7 +32,7 @@ Pod::Spec.new do |s| s.libraries = 'c++' s.dependency 'boost', '~> 1.51.0' - s.dependency 'glm', '~> 0.9.4.6' + s.dependency 'glm', '~> 0.9' s.dependency 'UriParser-cpp', '~> 0.1.3' s.xcconfig = { "HEADER_SEARCH_PATHS" => "${PODS_ROOT}/boost/**" } From 065aa18f3eac59dba80dd9d1fdc0e2d6e199f366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Iv=C3=A1n?= Date: Mon, 12 Jun 2017 12:49:57 -0400 Subject: [PATCH 07/14] Updates. --- VideoCore.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VideoCore.podspec b/VideoCore.podspec index a3e92ae1..b5bb231a 100644 --- a/VideoCore.podspec +++ b/VideoCore.podspec @@ -35,7 +35,7 @@ Pod::Spec.new do |s| s.dependency 'glm', '~> 0.9' s.dependency 'UriParser-cpp', '~> 0.1.3' - s.xcconfig = { "HEADER_SEARCH_PATHS" => "${PODS_ROOT}/boost/**" } + s.xcconfig = { "HEADER_SEARCH_PATHS" => "${PODS_ROOT}/boost" } s.ios.deployment_target = '5.0' From e6e25f4aad3eae4bd9dc4dcc7306b7b5d0542cc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Iv=C3=A1n?= Date: Mon, 12 Jun 2017 13:54:44 -0400 Subject: [PATCH 08/14] Changes for glm --- VideoCore.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VideoCore.podspec b/VideoCore.podspec index b5bb231a..72e0a9d7 100644 --- a/VideoCore.podspec +++ b/VideoCore.podspec @@ -35,7 +35,7 @@ Pod::Spec.new do |s| s.dependency 'glm', '~> 0.9' s.dependency 'UriParser-cpp', '~> 0.1.3' - s.xcconfig = { "HEADER_SEARCH_PATHS" => "${PODS_ROOT}/boost" } + s.xcconfig = { "HEADER_SEARCH_PATHS" => "${PODS_ROOT}/boost" "${PODS_ROOT}/glm/**" } s.ios.deployment_target = '5.0' From 17febf4836f43501226d3771944f8078afe07ad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Iv=C3=A1n?= Date: Mon, 12 Jun 2017 14:39:06 -0400 Subject: [PATCH 09/14] More tries... --- VideoCore.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VideoCore.podspec b/VideoCore.podspec index 72e0a9d7..5a2f6041 100644 --- a/VideoCore.podspec +++ b/VideoCore.podspec @@ -35,7 +35,7 @@ Pod::Spec.new do |s| s.dependency 'glm', '~> 0.9' s.dependency 'UriParser-cpp', '~> 0.1.3' - s.xcconfig = { "HEADER_SEARCH_PATHS" => "${PODS_ROOT}/boost" "${PODS_ROOT}/glm/**" } + s.xcconfig = { "HEADER_SEARCH_PATHS" => ["${PODS_ROOT}/boost", "${PODS_ROOT}/glm/**"] } s.ios.deployment_target = '5.0' From ec96cc48ebc2f8159f38c742e6aa3c91582ccdab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Iv=C3=A1n?= Date: Mon, 12 Jun 2017 14:48:16 -0400 Subject: [PATCH 10/14] ... --- VideoCore.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VideoCore.podspec b/VideoCore.podspec index 5a2f6041..3e78b65c 100644 --- a/VideoCore.podspec +++ b/VideoCore.podspec @@ -35,7 +35,7 @@ Pod::Spec.new do |s| s.dependency 'glm', '~> 0.9' s.dependency 'UriParser-cpp', '~> 0.1.3' - s.xcconfig = { "HEADER_SEARCH_PATHS" => ["${PODS_ROOT}/boost", "${PODS_ROOT}/glm/**"] } + s.xcconfig = { "HEADER_SEARCH_PATHS" => "${PODS_ROOT}/boost ${PODS_ROOT}/glm/**" } s.ios.deployment_target = '5.0' From c713e0ed4f400993c538358773e0a67e4171d919 Mon Sep 17 00:00:00 2001 From: smartgpu <32314735+smartgpu@users.noreply.github.com> Date: Tue, 26 Sep 2017 16:36:17 -0700 Subject: [PATCH 11/14] boost update --- VideoCore.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VideoCore.podspec b/VideoCore.podspec index 3e78b65c..1c9b2715 100644 --- a/VideoCore.podspec +++ b/VideoCore.podspec @@ -31,7 +31,7 @@ Pod::Spec.new do |s| s.libraries = 'c++' - s.dependency 'boost', '~> 1.51.0' + s.dependency 'boost', '~> 1.59.0' s.dependency 'glm', '~> 0.9' s.dependency 'UriParser-cpp', '~> 0.1.3' From 049e69820432681dd7b57360ccf39f563ea149e9 Mon Sep 17 00:00:00 2001 From: smartgpu <32314735+smartgpu@users.noreply.github.com> Date: Wed, 27 Sep 2017 10:11:52 -0700 Subject: [PATCH 12/14] Update VideoCore.podspec --- VideoCore.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VideoCore.podspec b/VideoCore.podspec index 1c9b2715..d6fd94d3 100644 --- a/VideoCore.podspec +++ b/VideoCore.podspec @@ -31,7 +31,7 @@ Pod::Spec.new do |s| s.libraries = 'c++' - s.dependency 'boost', '~> 1.59.0' + s.dependency 'boost', '~> 1.65.0' s.dependency 'glm', '~> 0.9' s.dependency 'UriParser-cpp', '~> 0.1.3' From aa4d0f00aa765e73f356bd0a3f346c131a6cfecd Mon Sep 17 00:00:00 2001 From: smartgpu <32314735+smartgpu@users.noreply.github.com> Date: Wed, 27 Sep 2017 10:15:50 -0700 Subject: [PATCH 13/14] Update VideoCore.podspec --- VideoCore.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VideoCore.podspec b/VideoCore.podspec index d6fd94d3..1c9b2715 100644 --- a/VideoCore.podspec +++ b/VideoCore.podspec @@ -31,7 +31,7 @@ Pod::Spec.new do |s| s.libraries = 'c++' - s.dependency 'boost', '~> 1.65.0' + s.dependency 'boost', '~> 1.59.0' s.dependency 'glm', '~> 0.9' s.dependency 'UriParser-cpp', '~> 0.1.3' From 02d46096d83b0b98316cc66d46499ae0cf8f5c73 Mon Sep 17 00:00:00 2001 From: smartgpu <32314735+smartgpu@users.noreply.github.com> Date: Wed, 27 Sep 2017 14:33:19 -0700 Subject: [PATCH 14/14] Update VideoCore.podspec --- VideoCore.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VideoCore.podspec b/VideoCore.podspec index 1c9b2715..3e78b65c 100644 --- a/VideoCore.podspec +++ b/VideoCore.podspec @@ -31,7 +31,7 @@ Pod::Spec.new do |s| s.libraries = 'c++' - s.dependency 'boost', '~> 1.59.0' + s.dependency 'boost', '~> 1.51.0' s.dependency 'glm', '~> 0.9' s.dependency 'UriParser-cpp', '~> 0.1.3'