Skip to content

Commit

Permalink
new filters
Browse files Browse the repository at this point in the history
  • Loading branch information
@lostjared
lostjared committed Oct 18, 2019
1 parent 69420b7 commit 0ad6afc
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 6 deletions.
Binary file modified ...xcodeproj/project.xcworkspace/xcuserdata/jared.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
7 changes: 4 additions & 3 deletions Acid.Cam.v2.OSX/ac-filter1.cpp
View file

Large diffs are not rendered by default.

46 changes: 46 additions & 0 deletions Acid.Cam.v2.OSX/ac-filter33.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,3 +214,49 @@ void ac::VideoAlphaImageScale(cv::Mat &frame) {
AlphaMovementMaxMin(alpha1, dir1, 0.01, 1.0, 0.1);
AlphaMovementMaxMin(alpha2, dir2, 0.05, 1.0, 0.1);
}


void ac::VideoAlphaBlendImage25(cv::Mat &frame) {
if(blend_set == false || v_cap.isOpened() == false)
return;
cv::Mat reimage, nframe;
ac_resize(blend_image, reimage, frame.size());
if(VideoFrame(nframe)) {
cv::Mat reframe;
ac_resize(nframe, reframe, frame.size());
cv::Mat copy1 = frame.clone();
AlphaBlendDouble(copy1, reframe, nframe, 0.25, 0.75);
AlphaBlendDouble(nframe, reimage, frame, 0.25, 0.75);
}
AddInvert(frame);
}

void ac::VideoAlphaBlendImage50(cv::Mat &frame) {
if(blend_set == false || v_cap.isOpened() == false)
return;
cv::Mat reimage, nframe;
ac_resize(blend_image, reimage, frame.size());
if(VideoFrame(nframe)) {
cv::Mat reframe;
ac_resize(nframe, reframe, frame.size());
cv::Mat copy1 = frame.clone();
AlphaBlendDouble(copy1, reframe, nframe, 0.50, 0.50);
AlphaBlendDouble(nframe, reimage, frame, 0.50, 0.50);
}
AddInvert(frame);
}

void ac::VideoAlphaBlendImage75(cv::Mat &frame) {
if(blend_set == false || v_cap.isOpened() == false)
return;
cv::Mat reimage, nframe;
ac_resize(blend_image, reimage, frame.size());
if(VideoFrame(nframe)) {
cv::Mat reframe;
ac_resize(nframe, reframe, frame.size());
cv::Mat copy1 = frame.clone();
AlphaBlendDouble(copy1, reframe, nframe, 0.75, 0.25);
AlphaBlendDouble(nframe, reimage, frame, 0.75, 0.25);
}
AddInvert(frame);
}
6 changes: 3 additions & 3 deletions Acid.Cam.v2.OSX/ac-filtercat.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@ namespace ac {
}
}

const char *szCustom[] = {"Quality480", "Quality720", "Quality1080","LoFi_320x240", "LoFi_320x240_Interlaced", "Grayscale","Negate","DarkNegate","DarkenFilter","FlipY_Axis", "FlipX_Axis", "FlipBoth", "Reverse","ReverseFrameBlend", "ColorLower75","ColorOrderSwap","ColorOrderSwapMap","No Filter", "Blend with Source","BlendWithSource25", "BlendWithSource50", "BlendWithSource75", "BlendWithSource100","BlendWithImage","BlendWithImage25","BlendWithImage50","BlendWithImage75","AlphaBlendImageWithOrigSource","VideoExactFrame","VideoAlphaFade","VideoAlphaBlend25","VideoAlphaBlend50","VideoAlphaBlend75","VideoAlphaBlendSubFilter","VideoAlphaImage","VideoAlphaImageFrame","VideoAlphaImageScale", "BlendFor360","XorWithSource","AlphaBlendWithSource","GammaDarken5","BlendWithColor","GammaDarken10","RestoreBlack","ReduceBy50","AlphaBlendWithSourceScale","Source25_Image75","StrobeRedChannel", "StrobeGreenChannel","StrobeBlueChannel", "LightStrobe","Plugin", "Custom",0};
const char *szCustom[] = {"Quality480", "Quality720", "Quality1080","LoFi_320x240", "LoFi_320x240_Interlaced", "Grayscale","Negate","DarkNegate","DarkenFilter","FlipY_Axis", "FlipX_Axis", "FlipBoth", "Reverse","ReverseFrameBlend", "ColorLower75","ColorOrderSwap","ColorOrderSwapMap","No Filter", "Blend with Source","BlendWithSource25", "BlendWithSource50", "BlendWithSource75", "BlendWithSource100","BlendWithImage","BlendWithImage25","BlendWithImage50","BlendWithImage75","AlphaBlendImageWithOrigSource","VideoExactFrame","VideoAlphaFade","VideoAlphaBlend25","VideoAlphaBlend50","VideoAlphaBlend75","VideoAlphaBlendSubFilter","VideoAlphaImage","VideoAlphaImageFrame","VideoAlphaImageScale","VideoAlphaBlendImage25","VideoAlphaBlendImage50","VideoAlphaBlendImage75","BlendFor360","XorWithSource","AlphaBlendWithSource","GammaDarken5","BlendWithColor","GammaDarken10","RestoreBlack","ReduceBy50","AlphaBlendWithSourceScale","Source25_Image75","StrobeRedChannel", "StrobeGreenChannel","StrobeBlueChannel", "LightStrobe","Plugin", "Custom",0};

const char *szCustom_Spec[] = {"Quality480", "Quality720", "Quality1080","LoFi_320x240", "LoFi_320x240_Interlaced", "Grayscale","Negate","DarkNegate", "DarkenFilter","FlipY_Axis", "FlipX_Axis", "FlipBoth","Reverse","ReverseFrameBlend", "ColorLower75","ColorOrderSwap","ColorOrderSwapMap","No Filter", "Blend with Source","BlendWithSource25","BlendWithSource50","BlendWithSource75","BlendWithSource100","BlendWithImage","BlendWithImage25","BlendWithImage50","BlendWithImage75","AlphaBlendImageWithOrigSource","VideoExactFrame","VideoAlphaFade","VideoAlphaBlend25","VideoAlphaBlend50","VideoAlphaBlend75","VideoAlphaBlendSubFilter","VideoAlphaImage","VideoAlphaImageFrame","VideoAlphaImageScale","BlendFor360", "XorWithSource", "AlphaBlendWithSource", "GammaDarken5","BlendWithColor", "GammaDarken10","RestoreBlack","ReduceBy50","AlphaBlendWithSourceScale","Source25_Image75","StrobeRedChannel","StrobeGreenChannel","StrobeBlueChannel","LightStrobe","Plugin",0};
const char *szCustom_Spec[] = {"Quality480", "Quality720", "Quality1080","LoFi_320x240", "LoFi_320x240_Interlaced", "Grayscale","Negate","DarkNegate", "DarkenFilter","FlipY_Axis", "FlipX_Axis", "FlipBoth","Reverse","ReverseFrameBlend", "ColorLower75","ColorOrderSwap","ColorOrderSwapMap","No Filter", "Blend with Source","BlendWithSource25","BlendWithSource50","BlendWithSource75","BlendWithSource100","BlendWithImage","BlendWithImage25","BlendWithImage50","BlendWithImage75","AlphaBlendImageWithOrigSource","VideoExactFrame","VideoAlphaFade","VideoAlphaBlend25","VideoAlphaBlend50","VideoAlphaBlend75","VideoAlphaBlendSubFilter","VideoAlphaImage","VideoAlphaImageFrame","VideoAlphaImageScale","VideoAlphaBlendImage25", "VideoAlphaBlendImage50", "VideoAlphaBlendImage75","BlendFor360", "XorWithSource","AlphaBlendWithSource","GammaDarken5","BlendWithColor","GammaDarken10","RestoreBlack","ReduceBy50","AlphaBlendWithSourceScale","Source25_Image75","StrobeRedChannel","StrobeGreenChannel","StrobeBlueChannel","LightStrobe","Plugin",0};

std::vector<std::string> svCustom_Spec {"Quality480", "Quality720", "Quality1080","LoFi_320x240", "LoFi_320x240_Interlaced", "Grayscale","Negate","DarkNegate", "DarkenFilter","FlipY_Axis", "FlipX_Axis", "FlipBoth","Reverse","ReverseFrameBlend","ColorOrderSwap","ColorOrderSwapMap","No Filter","ColorLower75","Blend with Source","BlendWithSource25","BlendWithSource50","BlendWithSource75","BlendWithSource100","BlendWithImage","BlendWithImage25","BlendWithImage50","BlendWithImage75","AlphaBlendImageWithOrigSource","VideoExactFrame","VideoAlphaFade","VideoAlphaBlend25","VideoAlphaBlend50","VideoAlphaBlend75","VideoAlphaBlendSubFilter","VideoAlphaImage","VideoAlphaImageFrame","VideoAlphaImageScale", "BlendFor360","XorWithSource","AlphaBlendWithSource","DarkNegate","GammaDarken5","BlendWithColor", "GammaDarken10","RestoreBlack", "ReduceBy50", "AlphaBlendWithSourceScale", "Source25_Image75","StrobeRedChannel", "StrobeGreenChannel","StrobeBlueChannel", "LightStrobe"};
std::vector<std::string> svCustom_Spec {"Quality480", "Quality720", "Quality1080","LoFi_320x240", "LoFi_320x240_Interlaced", "Grayscale","Negate","DarkNegate", "DarkenFilter","FlipY_Axis", "FlipX_Axis", "FlipBoth","Reverse","ReverseFrameBlend","ColorOrderSwap","ColorOrderSwapMap","No Filter","ColorLower75","Blend with Source","BlendWithSource25","BlendWithSource50","BlendWithSource75","BlendWithSource100","BlendWithImage","BlendWithImage25","BlendWithImage50","BlendWithImage75","AlphaBlendImageWithOrigSource","VideoExactFrame","VideoAlphaFade","VideoAlphaBlend25","VideoAlphaBlend50","VideoAlphaBlend75","VideoAlphaBlendSubFilter","VideoAlphaImage","VideoAlphaImageFrame","VideoAlphaImageScale","VideoAlphaBlendImage25","VideoAlphaBlendImage50","VideoAlphaBlendImage75","BlendFor360","XorWithSource","AlphaBlendWithSource","DarkNegate","GammaDarken5","BlendWithColor", "GammaDarken10","RestoreBlack", "ReduceBy50", "AlphaBlendWithSourceScale", "Source25_Image75","StrobeRedChannel", "StrobeGreenChannel","StrobeBlueChannel", "LightStrobe"};

std::vector<std::string> vzBlend { "Self AlphaBlend", "Self Scale", "Blend #3", "Negative Paradox", "ThoughtMode", "RandTriBlend", "Filter3","Rainbow Blend","Rand Blend","Pixel Scale","Pulse", "Combine Pixels", "Blend_Angle", "XorMultiBlend", "UpDown","LeftRight", "BlendedScanLines","XorSine", "FrameBlend", "FrameBlendRGB", "PrevFrameBlend", "HorizontalBlend", "VerticalBlend", "OppositeBlend", "DiagonalLines", "HorizontalLines", "BlendSwitch", "IncreaseBlendHorizontal", "BlendIncrease", "ColorRange", "VectorIncrease", "BlendThree", "HorizontalStripes", "Dual_SelfAlphaRainbow", "Dual_SelfAlphaBlur", "SurroundPixelXor", "WeakBlend", "AverageVertical", "RandomAlphaBlend", "RandomTwoFilterAlphaBlend", "AlphaBlendPosition", "BlendRowAlpha", "BlendRow", "BlendRowByVar", "BlendRowByDirection", "BlendAlphaXor", "SelfXorScale", "SelfAlphaRGB", "XorSelfAlphaImage", "AlphaBlendRandom", "ChannelSortAlphaBlend", "RandomXor", "RandomXorFlash", "SoftXor", "SelfXorBlend", "SelfXorDoubleFlash", "SelfOrDoubleFlash", "BlendRowCurvedSqrt", "CycleShiftRandomAlphaBlend", "TanAlphaGrid", "BlendInAndOut", "BlendScaleInAndOut", "AcidGlitch", "LiquidFilter", "MatrixXorAnd", "XorAlpha", "SelfXorAverage", "RandomXorBlend", "RGBVerticalXor", "RGBVerticalXorScale", "RGBHorizontalXor", "RGBHorizontalXorScale", "FadeInAndOut", "InitBlend", "LagBlend", "SubFilter", "AddFilter", "AlphaBlendSubFilter", "SmoothSubFilterAlphaBlend", "IntertwineSubFilter", "RandBlend", "EveryOther", "EveryOtherSubFilter", "SmoothSubFilter", "EnergizeSubFilter", "SmoothSubFilter16", "EnergizeSubFilter16", "EnergizeSubFilter32", "SmoothSubFilter32", "HalfAddSubFilter", "HalfXorSubFilter", "StaticXorBlend", "XorScale", "ChannelMedianSubFilter", "Bitwise_XOR_Blend", "Bitwise_OR_Blend", "Bitwise_AND_Blend", "PixelReverseXor", "SilverBlend", "PixelXorBlend", "SelfAlphaScale", "SelfScaleAlpha", "RainbowXorBlend", "FadeBlend", "SelfAlphaScaleBlend", "FadeBars", "ShadeRGB", "InterRGB_SubFilter", "InterSmoothSubFilter", "InterRGB_Bars_XY", "InterRGB_Bars_X", "InterRGB_Bars_Y", "StoredFramesAlphaBlend_SubFilter", "BlendSubFilter", "BlendAlphaSubFilter", "ReverseFrameBlend", "ReverseFrameBlendSwitch", "Blend_AlphaSubFilter","RandomBlendFilter","DoubleRandomBlendFilter", "FlipBlendW", "FlipBlendH", "FlipBlendWH", "FlipBlendAll", "FrameMedianBlendSubFilter", "SelfScaleXorIncrease", "Blend_RedGreenBlue", "Blend_RedReenBlue_Dark", "DarkModBlend", "IncDifference", "IncDifferenceAlpha", "MirrorMedianBlend", "SubFilterMedianBlend", "DarkenBlend", "DarkCollectionSubFilter", "DarkSmooth_Filter", "DarkSelfAlpha", "FlipMedian", "FlipMedianSubFilter", "Bars", "BlendBurred", "BlendCombinedValues", "BlendCombinedValueSubFilter", "BlendSubFilterAlpha", "PurpleRain", "CopyXorAlpha", "AveragePixelsXor", "AveragePixelAlpha", "NegativeByRow", "AveragePixelCollection", "IncorrectLine", "XorShift", "RGBSep1x", "RandomIncrease", "BGRBlend", "RGBBlend", "IncreaseDecreaseGamma", "GammaIncDecIncrease", "SelfScaleSortBlend", "FlipAlphaBlend", "RandomFlipFilter", "FlipMatrixCollection", "SelfScaleByFrame", "SmoothCollectionAlphaBlend", "ShuffleAlphaWithRGB", "ShuffleAlphaMedianBlend", "AverageLinesBlend", "AverageVerticalLinesBlend", "PixelValuesPlusOne", "AverageHorizontalFilter", "AverageVerticalFilter", "SmoothRainbowMedian", "MatrixCollectionBlend", "MatrixCollectionXor", "MatrixCollectionXor32", "MatrixCollectionRandomColorMap", "MatrixCollectionDarkXor", "MatrixCollectionRGB", "SmoothMedianBlend", "ColorTransition", "ColorTransitionRandom", "CosSinMedianBlend", "CosSinMultiplyCollectionXor", "RandomSmoothAlphaMedian", "ColorExpand", "ColorXorScale", "MatrixCollectionXorBlendAlphaBlend", "Bitwise_XOR_BlendFrame", "SimpleMatrixBlend", "SurroundingPixels", "SurroundingPixelsAlpha", "MatrixCollectionSurroundingPixels", "ColorFlashIncrease", "ScaleFilter", "NegativeDarkenXor", "ChangeXorEachSecond", "MorphXor", "XorFrameShuffle", "ChannelSortMedianBlend", "SplitFrameBlend", "SplitFrameCollection", "SplitFrameMirror", "IncreaseRGB", "XorDifferenceFilter", "MatrixCollectionVariable", "SmoothFrame64", "SmoothFrame32", "MedianBlendIncreaseFilter", "MedianBlendNegate", "BlendWithOldFrame", "BlendWith16thFrame", "MatrixCollectionRandom", "MatrixCollectionRandomSmooth", "MatrixCollectionRandomDouble", "MatrixCollectionAddImage", "MedianBlendSquare", "SmoothIntertwineMedianBlend", "ShadowAlphaTrails16", "ShadowAlphaTrailsReset", "ShadowAlphaTrails", "FadeFromColorToColor", "BlendImageLayer", "AlphaBlendRandom_Filter","resizeImageAndFrameBlend", "ColorsFilter", "ColorFadeFilter", "ColorChannelMoveUpAndDown", "AlphaBlendFlippedFilter", "ColorVariableBlend", "ColorXorBlend", "ColorAddBlend", "SelfAlphaBlendMultiThread", "BytePixelSort", "BlendChannelXor","ColorShiftXor", "XorMultiply", "ColorShadowBlend", "ColorRGB_IncDec", "ColorCollection", "ColorCollectionRandom", "ColorCollectionStrobeShift", "ColorCollectionRandom_Filter", "ColorCollectionShift", "CollectionEnergy", "ColorCollectionInterlace", "ColorCollectionStrobeShake", "ColorCollectionSubtle","ColorCollection64", "ColorCollectionSubtleStrobe", "CollectionRandom","CollectionRandomSubFilter", "CollectionAlphaXor","ColorCollection64X", "ColorCollectionSwitch", "ColorCollectionRGB_Index", "ColorCollectionReverseStrobe", "ColorCollectionXorPixel", "ColorCollectionXorOffsetFlash", "ColorCollectionMatrixGhost", "ColorPositionAverageXor","ColorPositionXor", "ColorCollectionPixelXor", "ColorGhost", "ColorCollectionTwitchSubFilter", "Buzzed", "BuzzedDark", "AlphaBlendImageDownUp", "BlendWithImageAndSource", "PixelSourceFrameBlend256", "SplitMatrixCollection", "RectangleGlitch", "ColorCollectionMovementIndex", "Shake", "Disoriented", "ColorCollectionPositionStrobe", "ColorCollectionStrobeBlend", "AlphaBlendStoredFrames", "ShiftColorLeft", "CycleInAndOutRepeat", "ColorCollectionShuffle", "BlendImageXtoY", "BlendForwardAndBack16", "BlendForwardAndBack32", "BlendForwardAndBack64","BlendForwardAndBack8_RandomStrobe", "AlphaBlendWithThreeCollections", "AlphaBlendArrayRandom","AlphaBlendArrayTrailsFilters", "AlphaBlendMirrorChannelSort","ColorCollectionAlphaBlendArray", "ColorMatrixCollectionPixelation", "ColorChannelIteration", "ColorFreezeBlend", "ColorImageFillMatrix", "ColorImageFillSubFilter", "ColorIncrementReset", "ColorPixelArray2D", "ManualShell", "ColorIncrementRandomReset", "ColorMoveDown", "PixelatePixelValues", "PixelPsychosis", "PixelCloud", "PiixelXorBlendFrame", "PixelCollectionRandom", "ColorPulseIncrease", "ColorPulseRandom", "ColorPulseAlpha", "LightBlend", "LightBlendXor", "SingleFrameGlitch", "ColorFadeSlow", "FadeBetweenSubFilter", "FadeBetweenFrame", "NegateNoBlurMedian", "PulseIncreaseVariableSpeed", "PulseIncreaseFast", "FibonacciXor", "ColorFibonacci", "SelfScaleRefined", "SelfScaleRefinedRGB", "MultiRandFilter", "MultiFilter", "ColorMatrixTrailsSubFilter", "StrangeGlitch64", "CollectionMatrixOutline", "CollectionMatrixRandomMedianBlend", "CollectionMatrxOutlineAlphaMedianBlend", "MatrixCollectionAuraTrails", "PixelIntensityFillSubFilter", "BlendWithSourceMedianBlendMultiThreadEight", "BlendWithImageMedianMutliThreadEight", "DarkColorMovement", "DarkColorFibonacci", "SelfAlphaScale_Down", "PsychoticVision", "DarkPsychoticVision", "ImageColorCycleMorph", "RainbowXorStrobeBlend", "IncreaseRainbowXorBlend", "MatrixCollectionRandomFrames", "MatrixCollectionFrames", "MatrixCollectionFramesLeft", "MatrixCollectionFramesMirrorLeft", "MatrixCollectionFramesTop", "FrameSqueeze", "MatrixCollectionBlendLeftToRight","MatrixCollectionAdd", "MatrixCollection_Xor", "MatrixCollectionNegateAdd", "MatrixCollectionAlphaRow", "DigitalHaze", "BlendWithColor", "DigitalHazeBlend"};

Expand Down
3 changes: 3 additions & 0 deletions Acid.Cam.v2.OSX/ac.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1758,6 +1758,9 @@ namespace ac {
void VideoAlphaImage(cv::Mat &frame);
void VideoAlphaImageFrame(cv::Mat &frame);
void VideoAlphaImageScale(cv::Mat &frame);
void VideoAlphaBlendImage25(cv::Mat &frame);
void VideoAlphaBlendImage50(cv::Mat &frame);
void VideoAlphaBlendImage75(cv::Mat &frame);
// #NoFilter
void NoFilter(cv::Mat &frame);
// Alpha blend with original image
Expand Down

0 comments on commit 0ad6afc

Please sign in to comment.