Skip to content
This repository was archived by the owner on Mar 26, 2023. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
8 changes: 4 additions & 4 deletions VideoCore.podspec
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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*',
Expand All @@ -32,10 +32,10 @@ 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" }
s.xcconfig = { "HEADER_SEARCH_PATHS" => "${PODS_ROOT}/boost ${PODS_ROOT}/glm/**" }

s.ios.deployment_target = '5.0'

Expand Down
2 changes: 1 addition & 1 deletion api/iOS/VCPreviewView.mm
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ of this software and associated documentation files (the "Software"), to deal
*/
#import "VCPreviewView.h"

#include <videocore/sources/iOS/GLESUtil.h>
#include <VideoCore/sources/iOS/GLESUtil.h>

#import <OpenGLES/EAGL.h>
#import <OpenGLES/EAGLDrawable.h>
Expand Down
36 changes: 18 additions & 18 deletions api/iOS/VCSimpleSession.mm
Original file line number Diff line number Diff line change
Expand Up @@ -23,33 +23,33 @@ of this software and associated documentation files (the "Software"), to deal

*/

#import <videocore/api/iOS/VCSimpleSession.h>
#import <videocore/api/iOS/VCPreviewView.h>
#import <VideoCore/api/iOS/VCSimpleSession.h>
#import <VideoCore/api/iOS/VCPreviewView.h>

#include <videocore/rtmp/RTMPSession.h>
#include <videocore/transforms/RTMP/AACPacketizer.h>
#include <videocore/transforms/RTMP/H264Packetizer.h>
#include <videocore/transforms/Split.h>
#include <videocore/transforms/AspectTransform.h>
#include <videocore/transforms/PositionTransform.h>
#include <VideoCore/rtmp/RTMPSession.h>
#include <VideoCore/transforms/RTMP/AACPacketizer.h>
#include <VideoCore/transforms/RTMP/H264Packetizer.h>
#include <VideoCore/transforms/Split.h>
#include <VideoCore/transforms/AspectTransform.h>
#include <VideoCore/transforms/PositionTransform.h>

#ifdef __APPLE__
# include <videocore/mixers/Apple/AudioMixer.h>
# include <videocore/transforms/Apple/MP4Multiplexer.h>
# include <videocore/transforms/Apple/H264Encode.h>
# include <videocore/sources/Apple/PixelBufferSource.h>
# include <VideoCore/mixers/Apple/AudioMixer.h>
# include <VideoCore/transforms/Apple/MP4Multiplexer.h>
# include <VideoCore/transforms/Apple/H264Encode.h>
# include <VideoCore/sources/Apple/PixelBufferSource.h>
# ifdef TARGET_OS_IPHONE
# include <videocore/sources/iOS/CameraSource.h>
# include <videocore/sources/iOS/MicSource.h>
# include <videocore/mixers/iOS/GLESVideoMixer.h>
# include <videocore/transforms/iOS/AACEncode.h>
# include <videocore/transforms/iOS/H264Encode.h>
# include <VideoCore/sources/iOS/CameraSource.h>
# include <VideoCore/sources/iOS/MicSource.h>
# include <VideoCore/mixers/iOS/GLESVideoMixer.h>
# include <VideoCore/transforms/iOS/AACEncode.h>
# include <VideoCore/transforms/iOS/H264Encode.h>

# else /* OS X */

# endif
#else
# include <videocore/mixers/GenericAudioMixer.h>
# include <VideoCore/mixers/GenericAudioMixer.h>
#endif

#define SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(v) ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedAscending)
Expand Down
6 changes: 3 additions & 3 deletions filters/Basic/BasicVideoFilterBGRA.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

#include <videocore/filters/Basic/BasicVideoFilterBGRA.h>
#include <VideoCore/filters/Basic/BasicVideoFilterBGRA.h>

#include <TargetConditionals.h>

Expand All @@ -8,8 +8,8 @@

#include <OpenGLES/ES2/gl.h>
#include <OpenGLES/ES3/gl.h>
#include <videocore/sources/iOS/GLESUtil.h>
#include <videocore/filters/FilterFactory.h>
#include <VideoCore/sources/iOS/GLESUtil.h>
#include <VideoCore/filters/FilterFactory.h>

#endif

Expand Down
2 changes: 1 addition & 1 deletion filters/Basic/BasicVideoFilterBGRA.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*/
#ifndef videocore_BasicVideoFilterBGRA_h
#define videocore_BasicVideoFilterBGRA_h
#include <videocore/filters/IVideoFilter.hpp>
#include <VideoCore/filters/IVideoFilter.hpp>

namespace videocore {
namespace filters {
Expand Down
6 changes: 3 additions & 3 deletions filters/Basic/BasicVideoFilterBGRAinYUVAout.cpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#include <videocore/filters/Basic/BasicVideoFilterBGRAinYUVAout.h>
#include <VideoCore/filters/Basic/BasicVideoFilterBGRAinYUVAout.h>

#ifdef __APPLE__
#include <TargetConditionals.h>
# ifdef TARGET_OS_IPHONE
# include <OpenGLES/ES2/gl.h>
# include <OpenGLES/ES3/gl.h>
# include <videocore/sources/iOS/GLESUtil.h>
# include <videocore/filters/FilterFactory.h>
# include <VideoCore/sources/iOS/GLESUtil.h>
# include <VideoCore/filters/FilterFactory.h>
# endif
#endif

Expand Down
2 changes: 1 addition & 1 deletion filters/Basic/BasicVideoFilterBGRAinYUVAout.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#ifndef __mobcrush__BasicVideoFilterBGRAinYUVAout__
#define __mobcrush__BasicVideoFilterBGRAinYUVAout__

#include <videocore/filters/IVideoFilter.hpp>
#include <VideoCore/filters/IVideoFilter.hpp>

namespace videocore {
namespace filters {
Expand Down
6 changes: 3 additions & 3 deletions filters/Basic/FisheyeVideoFilter.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

#include <videocore/filters/Basic/FisheyeVideoFilter.h>
#include <VideoCore/filters/Basic/FisheyeVideoFilter.h>

#include <TargetConditionals.h>

Expand All @@ -8,8 +8,8 @@

#include <OpenGLES/ES2/gl.h>
#include <OpenGLES/ES3/gl.h>
#include <videocore/sources/iOS/GLESUtil.h>
#include <videocore/filters/FilterFactory.h>
#include <VideoCore/sources/iOS/GLESUtil.h>
#include <VideoCore/filters/FilterFactory.h>

#endif

Expand Down
2 changes: 1 addition & 1 deletion filters/Basic/FisheyeVideoFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*/
#ifndef videocore_FisheyeVideoFilter_h
#define videocore_FisheyeVideoFilter_h
#include <videocore/filters/IVideoFilter.hpp>
#include <VideoCore/filters/IVideoFilter.hpp>

namespace videocore {
namespace filters {
Expand Down
6 changes: 3 additions & 3 deletions filters/Basic/GlowVideoFilter.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

#include <videocore/filters/Basic/GlowVideoFilter.h>
#include <VideoCore/filters/Basic/GlowVideoFilter.h>

#include <TargetConditionals.h>

Expand All @@ -8,8 +8,8 @@

#include <OpenGLES/ES2/gl.h>
#include <OpenGLES/ES3/gl.h>
#include <videocore/sources/iOS/GLESUtil.h>
#include <videocore/filters/FilterFactory.h>
#include <VideoCore/sources/iOS/GLESUtil.h>
#include <VideoCore/filters/FilterFactory.h>

#endif

Expand Down
2 changes: 1 addition & 1 deletion filters/Basic/GlowVideoFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*/
#ifndef videocore_GlowVideoFilter_h
#define videocore_GlowVideoFilter_h
#include <videocore/filters/IVideoFilter.hpp>
#include <VideoCore/filters/IVideoFilter.hpp>

namespace videocore {
namespace filters {
Expand Down
6 changes: 3 additions & 3 deletions filters/Basic/GrayscaleVideoFilter.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

#include <videocore/filters/Basic/GrayscaleVideoFilter.h>
#include <VideoCore/filters/Basic/GrayscaleVideoFilter.h>

#include <TargetConditionals.h>

Expand All @@ -8,8 +8,8 @@

#include <OpenGLES/ES2/gl.h>
#include <OpenGLES/ES3/gl.h>
#include <videocore/sources/iOS/GLESUtil.h>
#include <videocore/filters/FilterFactory.h>
#include <VideoCore/sources/iOS/GLESUtil.h>
#include <VideoCore/filters/FilterFactory.h>

#endif

Expand Down
2 changes: 1 addition & 1 deletion filters/Basic/GrayscaleVideoFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*/
#ifndef videocore_GrayscaleVideoFilter_h
#define videocore_GrayscaleVideoFilter_h
#include <videocore/filters/IVideoFilter.hpp>
#include <VideoCore/filters/IVideoFilter.hpp>

namespace videocore {
namespace filters {
Expand Down
6 changes: 3 additions & 3 deletions filters/Basic/InvertColorsVideoFilter.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

#include <videocore/filters/Basic/InvertColorsVideoFilter.h>
#include <VideoCore/filters/Basic/InvertColorsVideoFilter.h>

#include <TargetConditionals.h>

Expand All @@ -8,8 +8,8 @@

#include <OpenGLES/ES2/gl.h>
#include <OpenGLES/ES3/gl.h>
#include <videocore/sources/iOS/GLESUtil.h>
#include <videocore/filters/FilterFactory.h>
#include <VideoCore/sources/iOS/GLESUtil.h>
#include <VideoCore/filters/FilterFactory.h>

#endif

Expand Down
2 changes: 1 addition & 1 deletion filters/Basic/InvertColorsVideoFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*/
#ifndef videocore_InvertColorsVideoFilter_h
#define videocore_InvertColorsVideoFilter_h
#include <videocore/filters/IVideoFilter.hpp>
#include <VideoCore/filters/IVideoFilter.hpp>

namespace videocore {
namespace filters {
Expand Down
6 changes: 3 additions & 3 deletions filters/Basic/SepiaVideoFilter.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

#include <videocore/filters/Basic/SepiaVideoFilter.h>
#include <VideoCore/filters/Basic/SepiaVideoFilter.h>

#include <TargetConditionals.h>

Expand All @@ -8,8 +8,8 @@

#include <OpenGLES/ES2/gl.h>
#include <OpenGLES/ES3/gl.h>
#include <videocore/sources/iOS/GLESUtil.h>
#include <videocore/filters/FilterFactory.h>
#include <VideoCore/sources/iOS/GLESUtil.h>
#include <VideoCore/filters/FilterFactory.h>

#endif

Expand Down
2 changes: 1 addition & 1 deletion filters/Basic/SepiaVideoFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*/
#ifndef videocore_SepiaVideoFilter_h
#define videocore_SepiaVideoFilter_h
#include <videocore/filters/IVideoFilter.hpp>
#include <VideoCore/filters/IVideoFilter.hpp>

namespace videocore {
namespace filters {
Expand Down
14 changes: 7 additions & 7 deletions filters/FilterFactory.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include <videocore/filters/FilterFactory.h>
#include <videocore/filters/Basic/BasicVideoFilterBGRA.h>
#include <videocore/filters/Basic/GrayscaleVideoFilter.h>
#include <videocore/filters/Basic/InvertColorsVideoFilter.h>
#include <videocore/filters/Basic/SepiaVideoFilter.h>
#include <videocore/filters/Basic/FisheyeVideoFilter.h>
#include <videocore/filters/Basic/GlowVideoFilter.h>
#include <VideoCore/filters/FilterFactory.h>
#include <VideoCore/filters/Basic/BasicVideoFilterBGRA.h>
#include <VideoCore/filters/Basic/GrayscaleVideoFilter.h>
#include <VideoCore/filters/Basic/InvertColorsVideoFilter.h>
#include <VideoCore/filters/Basic/SepiaVideoFilter.h>
#include <VideoCore/filters/Basic/FisheyeVideoFilter.h>
#include <VideoCore/filters/Basic/GlowVideoFilter.h>

namespace videocore {
std::map<std::string, InstantiateFilter>* FilterFactory::s_registration = nullptr ;
Expand Down
2 changes: 1 addition & 1 deletion filters/FilterFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#ifndef __videocore__FilterFactory__
#define __videocore__FilterFactory__
#include <videocore/filters/IFilter.hpp>
#include <VideoCore/filters/IFilter.hpp>
#include <map>
#include <memory>
#include <functional>
Expand Down
2 changes: 1 addition & 1 deletion filters/IVideoFilter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#ifndef videocore_IVideoFilter_hpp
#define videocore_IVideoFilter_hpp

#include <videocore/filters/IFilter.hpp>
#include <VideoCore/filters/IFilter.hpp>
#include <glm/glm.hpp>

#define KERNEL(_language, _target, _kernelstr) if(_language == _target){ do { return # _kernelstr ; } while(0); }
Expand Down
2 changes: 1 addition & 1 deletion mixers/Apple/AudioMixer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

*/

#include <videocore/mixers/Apple/AudioMixer.h>
#include <VideoCore/mixers/Apple/AudioMixer.h>

static const UInt32 s_samplingRateConverterComplexity = kAudioConverterSampleRateConverterComplexity_Normal;
static const UInt32 s_samplingRateConverterQuality = kAudioConverterQuality_Medium;
Expand Down
2 changes: 1 addition & 1 deletion mixers/Apple/AudioMixer.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#define __videocore__AudioMixer__

#include <iostream>
#include <videocore/mixers/GenericAudioMixer.h>
#include <VideoCore/mixers/GenericAudioMixer.h>
#include <AudioToolbox/AudioToolbox.h>
#include <unordered_map>

Expand Down
2 changes: 1 addition & 1 deletion mixers/GenericAudioMixer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
THE SOFTWARE.

*/
#include <videocore/mixers/GenericAudioMixer.h>
#include <VideoCore/mixers/GenericAudioMixer.h>
#include <sstream>
#include <vector>
#include <stdint.h>
Expand Down
6 changes: 3 additions & 3 deletions mixers/GenericAudioMixer.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
#define __videocore__GenericAudioMixer__

#include <iostream>
#include <videocore/mixers/IAudioMixer.hpp>
#include <videocore/system/Buffer.hpp>
#include <videocore/system/JobQueue.hpp>
#include <VideoCore/mixers/IAudioMixer.hpp>
#include <VideoCore/system/Buffer.hpp>
#include <VideoCore/system/JobQueue.hpp>

#include <map>
#include <thread>
Expand Down
6 changes: 3 additions & 3 deletions mixers/IAudioMixer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
#ifndef videocore_IAudioMixer_hpp
#define videocore_IAudioMixer_hpp

#include <videocore/system/Buffer.hpp>
#include <videocore/mixers/IMixer.hpp>
#include <videocore/transforms/IMetadata.hpp>
#include <VideoCore/system/Buffer.hpp>
#include <VideoCore/mixers/IMixer.hpp>
#include <VideoCore/transforms/IMetadata.hpp>

namespace videocore {

Expand Down
2 changes: 1 addition & 1 deletion mixers/IMixer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#ifndef videocore_IMixer_hpp
#define videocore_IMixer_hpp

#include <videocore/transforms/ITransform.hpp>
#include <VideoCore/transforms/ITransform.hpp>

namespace videocore
{
Expand Down
6 changes: 3 additions & 3 deletions mixers/IVideoMixer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
#ifndef videocore_IVideoMixer_hpp
#define videocore_IVideoMixer_hpp

#include <videocore/mixers/IMixer.hpp>
#include <videocore/filters/IVideoFilter.hpp>
#include <videocore/filters/FilterFactory.h>
#include <VideoCore/mixers/IMixer.hpp>
#include <VideoCore/filters/IVideoFilter.hpp>
#include <VideoCore/filters/FilterFactory.h>

#include <glm/glm.hpp>

Expand Down
Loading