Sped up + universalized ffmpeg stuff

Author: flip phillips

CHANGELOG.md

@@ -17,8 +17,14 @@
 
 ## [Unreleased changes]
 
+## [0.1.14] - 2018-04-24
+
 ### Added
 - `UnitizedGaussianPDF`
+- lens distortion model
+
+### Changed
+- `RunProcess` instead of `Run` in the ffmpeg stuff
 
 ## [0.1.13] - 2018-04-14
 

Development/Image.nb

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9394b5a9f63e8db4e74cdb57c8a94035a2d259fcf43bf076f038bce701eb2364
-size 58280147
+oid sha256:033ee2daef52eeed5f601d4f10f500950991ddd072568caeb88a479cd7be7644
+size 62417822

FPTools/Image.wl

@@ -1,8 +1,16 @@
 (* ::Package:: *)
 
+(* ::Subsection:: *)
+(*ImageID sugar*)
+
+
 ImageIdentifyFP[image_Image,n_:5]:=ImageIdentify[image, All, n, "Probability"]
 
 
+(* ::Subsection:: *)
+(*face blurer*)
+
+
 Options[BlurFaces] = {Method->Automatic,"FilterRadius"->Automatic};
 
 (* Options are "Box" (default), "Disk", "Outline", "Eyes", "FaceParts" for now *)
@@ -35,44 +43,66 @@ BlurFaces[i_Image,OptionsPattern[]]:=Module[{how,fboxs,polys,ff},
 		HighlightImage[i, {{"Blur",OptionValue["FilterRadius"]}, polys}]]]
 
 
-AddAlphaChannel[i_Image] := SetAlphaChannel[i,Image[ConstantArray[1, Reverse@ImageDimensions[i]]]]
+(* ::Subsection:: *)
+(*Alpha Channel*)
 
 
+AddAlphaChannel[i_Image] := SetAlphaChannel[i,Image[ConstantArray[1, Reverse@ImageDimensions[i]]]]
 
 
 (* ::Subsection:: *)
 (*ffmpeg things*)
 
 
-$FFMpegPath = "/usr/local/bin/ffmpeg";
+ImportMP4Frame::noex = "Can't find ffmpeg executable.";
+
+
+$FFMpegPath=None;
+
+
+FindFFMPEG[] := Module[{deflocs},
+	Unprotect[$FFMpegPath];
+	$FFMpegPath = Which[
+		$FFMpegPath=!=None,$FFMpegPath,
+		FileExistsQ["/usr/local/bin/ffmpeg"],"/usr/local/bin/ffmpeg",
+		FileExistsQ["/usr/bin/ffmpeg"],"/usr/bin/ffmpeg",
+		True, Message[ImportMP4Frame::noex];None
+	]
+]
+
 
 (* from https://stackoverflow.com/questions/10957412/fastest-way-to-extract-frames-using-ffmpeg *)
 
-ImportMP4Frame[f_, sec_] := Module[{command,fx,fn},
+
+ImportMP4Frame[f_, sec_] := Module[{command,fx,fn,run},
+	If[$FFMpegPath===None,If[FindFFMPEG[]==None,Return[{}]]];
+	
 	fx = FileNameJoin[{$TemporaryDirectory,"ImportFrames"}];
-	Quiet[DeleteDirectory[fx, DeleteContents -> True]];
-	CreateDirectory[fx];
+	(*Quiet[DeleteDirectory[fx, DeleteContents -> True]];*)
+	Quiet[CreateDirectory[fx]];
 
 	fn = FileNameJoin[{fx,"aframe"<>ToString[sec]<>".bmp"}];
 
-	command =
-		StringRiffle[{$FFMpegPath,"-y","-accurate_seek","-ss",ToString[sec],"-i",StringReplace[f," "->"\\ "],"-frames:v 1", fn}," "];
-
-	If[Run[command] == 0, Import[fn], None]]
+	command={$FFMpegPath,"-y","-accurate_seek","-ss",ToString[sec],"-i",f,"-frames:v","1", fn};
+	run=RunProcess[command,ProcessEnvironment-><||>];
+	If[run["ExitCode"]==0, Import[fn], If[$FPToolsDebug,run,None]]
+]
 
 
 ImportMP4Frames[f_, startTime_, duration_, rate_:1] :=
 	Table[ImportMP4Frame[f,t],{t,startTime,startTime+duration,rate}]
-	
-ImportWebFrame[url_] := Module[{command,fx},
-  fx = FileNameJoin[{$TemporaryDirectory,"aframe.png"}];
-  
-  command = 
-   $FFMpegPath<>" -y -i " <> url <> " -vframes 1  " <> fx;
 
-  If[Run[command] == 0, Import[fx], None]
+
+ImportWebFrame[url_] := Module[{command,fx,run},
+	If[$FFMpegPath===None,If[FindFFMPEG[]==None,Return[{}]]];
+	fx = FileNameJoin[{$TemporaryDirectory,"aframe.png"}];
+	
+	command={$FFMpegPath,"-y","-i",url,"-vframes","1",fx};
+	run=RunProcess[command,ProcessEnvironment-><||>];
+	If[run["ExitCode"] == 0, Import[fx], If[$FPToolsDebug,run,None]]
 ]
 
+
 (* 
 outdir = FileNameJoin[{$TemporaryDirectory, "cappyPorts2"}];
 Quiet[DeleteDirectory[outdir, DeleteContents -> True]];
@@ -90,4 +120,35 @@ cmd = "/usr/local/bin/ffmpeg -i " <> url <>
 
 (* 
 time for i in {0..39} ; do ffmpeg -accurate_seek -ss `echo $i*60.0 | bc` -i input.mp4   -frames:v 1 period_down_$i.bmp ; done
-*)
+*)
+
+
+
+
+(* ::Subsection:: *)
+(*Lens model*)
+
+
+(* ::Input::Initialization:: *)
+LensDistortPoint[{x0_,y0_},{p1_,p2_},kVec_:{}]:=Module[{itx,k,r2,idist,dx,dy},
+	k=PadRight[kVec,6,0];
+
+	r2=x0^2+y0^2;
+	idist=(1.0+((k[[6]] r2+k[[5]])r2+k[[4]])r2)/(1.0+((k[[3]] r2+k[[2]])r2+k[[1]])r2);
+
+	dx=2.0 p1 x0 y0+p2 (r2+2.0x0^2);
+	dy=p1(r2+2.0y0^2)+2.0p2 x0 y0;
+	{(x0-dx),(y0-dy)}idist
+]
+
+
+LensDistortionCorrection[i_,{tx_,ty_},\[Theta]_,{p1_,p2_},kVec_,opt:OptionsPattern[ImageTransformation]]:=Module[{id,ar,t,tt,ut,rt},
+	id=ImageDimensions[i];
+	ar=1/Divide@@id;
+
+	t=RescalingTransform[{{0,1},{0,ar}},{{-1,1},{-ar,ar}}];
+	tt=TranslationTransform[{tx,ty}]@*t;
+	ut=RescalingTransform[{{-1,1},{-ar,ar}},{{0,1},{0,ar}}];
+	rt=ut@*RotationTransform[\[Theta]];
+	
+	ImageTransformation[i,rt[LensDistortPoint[tt[#],{p1,p2},kVec]]&,PlotRange->{{0.1,0.9},{0.1,0.5}},opt]]

FPTools/PacletInfo.m

@@ -6,7 +6,7 @@
   Copyright -> "©2018- Flip Phillips & Misc Contributors",
   License -> "MIT",
   Version -> "0.1.14",
-  BuildNumber -> "110",
+  BuildNumber -> "124",
   MathematicaVersion -> "11.2+",
   URL -> "https://github.com/flipphillips/FPTools",
   Thumbnail -> "Documentation/icon.png",
@@ -27,7 +27,7 @@
     "FPTools`RectangleToDisk",
 
     "FPTools`ImageIdentifyFP","FPTools`BlurFaces","FPTools`AddAlphaChannel",
-
+    "FPTools`LensDistortPoint", "FPTools`LensDistortionCorrection",
     "FPTools`$MachineAddressesExternal",
 
     "FPTools`ApplyIf",

FPTools/Usage.wl

@@ -41,6 +41,10 @@ ImportMP4Frame::usage = "ImportMP4Frame[file,frame] extracts frame `frame` from
 ImportMP4Frames::usage = "ImportMP4Frames[file,start,dur] extracts frames from start of dur from MP4 file `file`.";
 ImportWebFrame::usage = "ImportWebFrame[url] grabs a frame from the stream at url.";
 
+LensDistortPoint::usage = "LensDistortPoint[{x,y},{p1,p2},{k1,...}] projects point x,y using the distortion specified in the p and k vectors.";
+
+LensDistortionCorrection::usage = "LensDistortionCorrection[image,{tx,ty},theta,{p1,p1},{k1,k2,k3...}] performs a lens distortion correction along with a generalized translation (t) and rotation (theta). p1 and p2 specify 1st order astygmatism and k1-6 the different orders of distortion beyond that. Note you only need to supply k's up to the desired order of correction.";
+
 
 (* ::Section:: *)
 (*Internet*)

README.md

@@ -2,9 +2,10 @@
 
 ![](icon.png)
 
-v 0.1.13
+v 0.1.14
 
- A set Mathematica tools I frequently use for debugging, introspection &c.
+A set Mathematica tools I frequently use for debugging, introspection &c.
+**Note that there is a bunch of seemingly unrelated stuff in recent versions. This is because I am using this to easily distribute some tools for my classes this semester. At some point I'll refactor all this out, but for now it remains!**
 
 For the time being, a small amount of documentation can be had by looking in the Mathematica Help Browser under "Add-ons and Packages".
 

version.json

@@ -3,6 +3,6 @@
   "major_version": 0,
   "minor_version": 1,
   "revision_number": 14,
-  "build_number": 111,
-  "date": "Mon Apr 16 21:53:19 EDT 2018"
+  "build_number": 125,
+  "date": "Tue Apr 24 11:31:10 EDT 2018"
 }