Skip to content

Commit

Permalink
Cleanup and chroma
Browse files Browse the repository at this point in the history
  • Loading branch information
@HalfdanJ
HalfdanJ committed Oct 9, 2012
1 parent f82ae1b commit d252e20
Show file tree
Hide file tree
Showing 6 changed files with 471 additions and 368 deletions.
6 changes: 6 additions & 0 deletions ViljensTriumf.xcodeproj/project.pbxproj
View file
Expand Up @@ -28,6 +28,7 @@
DD4CC1EC161DEA13000E459D /* deinterlace.frag in Sources */ = {isa = PBXBuildFile; fileRef = DD4CC1E6161DEA13000E459D /* deinterlace.frag */; }; DD4CC1EC161DEA13000E459D /* deinterlace.frag in Sources */ = {isa = PBXBuildFile; fileRef = DD4CC1E6161DEA13000E459D /* deinterlace.frag */; };
DD4CC1ED161DEA13000E459D /* deinterlace.vert in Sources */ = {isa = PBXBuildFile; fileRef = DD4CC1E7161DEA13000E459D /* deinterlace.vert */; }; DD4CC1ED161DEA13000E459D /* deinterlace.vert in Sources */ = {isa = PBXBuildFile; fileRef = DD4CC1E7161DEA13000E459D /* deinterlace.vert */; };
DD4CC1EF161DF194000E459D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD4CC1EE161DF194000E459D /* QuartzCore.framework */; }; DD4CC1EF161DF194000E459D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD4CC1EE161DF194000E459D /* QuartzCore.framework */; };
DDB9D53C1624611000FFE6A4 /* ChromaFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = DDB9D53B1624611000FFE6A4 /* ChromaFilter.m */; };
DDD38D511623464D00C24ABA /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDD38D501623464D00C24ABA /* QTKit.framework */; }; DDD38D511623464D00C24ABA /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDD38D501623464D00C24ABA /* QTKit.framework */; };
DDD38D5416234D9500C24ABA /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDD38D5316234D9500C24ABA /* Quartz.framework */; }; DDD38D5416234D9500C24ABA /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDD38D5316234D9500C24ABA /* Quartz.framework */; };
DDD38D5B16234E9400C24ABA /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDD38D5A16234E9400C24ABA /* QuickTime.framework */; }; DDD38D5B16234E9400C24ABA /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDD38D5A16234E9400C24ABA /* QuickTime.framework */; };
Expand Down Expand Up @@ -81,6 +82,8 @@
DD4CC1E6161DEA13000E459D /* deinterlace.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = deinterlace.frag; path = shaders/deinterlace.frag; sourceTree = "<group>"; }; DD4CC1E6161DEA13000E459D /* deinterlace.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = deinterlace.frag; path = shaders/deinterlace.frag; sourceTree = "<group>"; };
DD4CC1E7161DEA13000E459D /* deinterlace.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = deinterlace.vert; path = shaders/deinterlace.vert; sourceTree = "<group>"; }; DD4CC1E7161DEA13000E459D /* deinterlace.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; name = deinterlace.vert; path = shaders/deinterlace.vert; sourceTree = "<group>"; };
DD4CC1EE161DF194000E459D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; DD4CC1EE161DF194000E459D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
DDB9D53A1624611000FFE6A4 /* ChromaFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChromaFilter.h; sourceTree = "<group>"; };
DDB9D53B1624611000FFE6A4 /* ChromaFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChromaFilter.m; sourceTree = "<group>"; };
DDD38D501623464D00C24ABA /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = System/Library/Frameworks/QTKit.framework; sourceTree = SDKROOT; }; DDD38D501623464D00C24ABA /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = System/Library/Frameworks/QTKit.framework; sourceTree = SDKROOT; };
DDD38D5316234D9500C24ABA /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; }; DDD38D5316234D9500C24ABA /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; };
DDD38D5A16234E9400C24ABA /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = System/Library/Frameworks/QuickTime.framework; sourceTree = SDKROOT; }; DDD38D5A16234E9400C24ABA /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = System/Library/Frameworks/QuickTime.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -257,6 +260,8 @@
DDDCF660161EBC1700E8E368 /* deinterlaceFilter.cikernel */, DDDCF660161EBC1700E8E368 /* deinterlaceFilter.cikernel */,
DDDCF65D161EBC0700E8E368 /* DeinterlaceFilter.h */, DDDCF65D161EBC0700E8E368 /* DeinterlaceFilter.h */,
DDDCF65E161EBC0700E8E368 /* DeinterlaceFilter.m */, DDDCF65E161EBC0700E8E368 /* DeinterlaceFilter.m */,
DDB9D53A1624611000FFE6A4 /* ChromaFilter.h */,
DDB9D53B1624611000FFE6A4 /* ChromaFilter.m */,
); );
path = filters; path = filters;
sourceTree = "<group>"; sourceTree = "<group>";
Expand Down Expand Up @@ -341,6 +346,7 @@
DD4CC1EC161DEA13000E459D /* deinterlace.frag in Sources */, DD4CC1EC161DEA13000E459D /* deinterlace.frag in Sources */,
DD4CC1ED161DEA13000E459D /* deinterlace.vert in Sources */, DD4CC1ED161DEA13000E459D /* deinterlace.vert in Sources */,
DDDCF65F161EBC0700E8E368 /* DeinterlaceFilter.m in Sources */, DDDCF65F161EBC0700E8E368 /* DeinterlaceFilter.m in Sources */,
DDB9D53C1624611000FFE6A4 /* ChromaFilter.m in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
Expand Down
27 changes: 8 additions & 19 deletions ViljensTriumf/Plugins/BlackMagic.h
View file
Expand Up @@ -3,57 +3,46 @@
#import "BlackMagicController.h" #import "BlackMagicController.h"


#import "DeinterlaceFilter.h" #import "DeinterlaceFilter.h"
#import "ChromaFilter.h"

#import <QTKit/QTKit.h> #import <QTKit/QTKit.h>


#define MOVIE_LENGTH 7200


class DeckLinkController; class DeckLinkController;
@interface BlackMagic : ofPlugin { @interface BlackMagic : ofPlugin {
BlackMagicController * blackMagicController; BlackMagicController * blackMagicController;


// ofVideoGrabber * grabber[3];

int outSelector; int outSelector;



ofImage currentFrames[3]; ofImage currentFrames[3];
CIImage * currentCIImage[3]; CIImage * currentCIImage[3];
ofImage movieRecording[MOVIE_LENGTH];

int playbackIndex;
int millisAtLastFramePlayback;


bool recordMovie; bool recordMovie;
int millisAtLastFrameRecord; int millisAtLastFrameRecord;
int recordIndex;

ofSerial serial; ofSerial serial;


/* ofxShader * bwShader; /* ofxShader * bwShader;
ofxShader * deinterlace;
*/ */



CIContext * ciContextMain; //Context for main output CIContext * ciContextMain; //Context for main output
CIContext * ciContextControl; //Context for control gl view CIContext * ciContextControl; //Context for main output
CIContext * ciContext; //Dynamic switched context (main/control) CIContext * ciContext; //Dynamic switched context (main/control)

CIImage * renderImage;
bool renderImageUpdated;


CIFilter * blurFilter; CIFilter * blurFilter;
DeinterlaceFilter * deinterlaceFilter; DeinterlaceFilter * deinterlaceFilter;
CIFilter * colorControlsFilter; CIFilter * colorControlsFilter;
CIFilter * gammaAdjustFilter; CIFilter * gammaAdjustFilter;
CIFilter * toneCurveFilter; CIFilter * toneCurveFilter;
ChromaFilter * chromaFilter;


QTMovie *mMovie; QTMovie *mMovie;
QTVisualContextRef movieTextureContext; QTVisualContextRef movieTextureContext;
CVOpenGLTextureRef movieCurrentFrame; CVOpenGLTextureRef movieCurrentFrame;


NSImage * recordImage; NSImage * recordImage;


// CIImage * movie[1000];

} }


@end @end

0 comments on commit d252e20

Please sign in to comment.