continous fps textview updating, metadata experiments

mortenjust · Oct 10, 2015 · b97806c · b97806c
1 parent 2774657
commit b97806c
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 10 deletions.
diff --git a/droptogif/AppDelegate.swift b/droptogif/AppDelegate.swift
@@ -78,17 +78,21 @@ class AppDelegate: NSObject, NSApplicationDelegate, FolderWatcherDelegate {
         // https://ffmpeg.org/ffmpeg-filters.html#Video-Filters
         // of interest, scale (done), fade (esp. alpha? fade=in:0:25:alpha=1,), 9.86 palettegen, paletteuse, 9.124 trim, vignette, zoompan
 
-        var filterString = "-vf "
+        var filters = [String]()
+        var filterString = ""
 
         // scale
         if let p = Preferences().getScalePercentagePref(){ // 55
             let r = p/100 // 0.55
             let scaleFilter = "scale=iw*\(r):-1"
-            filterString = "\(filterString) \(scaleFilter)"
+            filters.append(scaleFilter)
         }
-
-
-        return filterString;
+
+        for filter in filters {
+            filterString = "\(filter)" // todo: prepare this for multiple filters
+        }
+
+        return "-vf \(filterString)";
     }
 
     func convertFiles(filenames: [String]){

diff --git a/droptogif/Base.lproj/Main.storyboard b/droptogif/Base.lproj/Main.storyboard
@@ -792,7 +792,7 @@
                             </slider>
                             <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Jsy-RR-Q5e">
                                 <rect key="frame" x="270" y="155" width="48" height="22"/>
-                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" title="24" drawsBackground="YES" id="pNj-JU-YIE">
+                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" title="24" drawsBackground="YES" id="pNj-JU-YIE">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>

diff --git a/droptogif/DragReceiverView.swift b/droptogif/DragReceiverView.swift
@@ -9,7 +9,7 @@
 import Cocoa
 
 protocol CircleDropDelegate{
-    func circleDropDragEntered()
+    func circleDropDragEntered(filePath:String)
     func circleDropDragPerformed(filePath:String)
     func circleDropDragExited()
     func circleDropUpdated(mouseAt:NSPoint)
@@ -20,7 +20,8 @@ class DragReceiverView: NSImageView {
 
     override func draggingEntered(sender: NSDraggingInfo) -> NSDragOperation {
         Swift.print("HELLO \(getPathFromBoard(sender.draggingPasteboard()))")
-        delegate?.circleDropDragEntered()
+        let path = getPathFromBoard(sender.draggingPasteboard())
+        delegate?.circleDropDragEntered(path)
         return NSDragOperation.Copy
     }
 

diff --git a/droptogif/ViewController.swift b/droptogif/ViewController.swift
@@ -7,6 +7,7 @@
 //
 
 import Cocoa
+import AVFoundation
 import SpriteKit
 
 class ViewController: NSViewController, NSOpenSavePanelDelegate, NSTextViewDelegate, CircleDropDelegate {
@@ -72,7 +73,6 @@ class ViewController: NSViewController, NSOpenSavePanelDelegate, NSTextViewDeleg
 
 
     func animateDropInvitationIn(){
-
         waitForDrop.wantsLayer = true
         let fadeAnim = CABasicAnimation(keyPath: "opacity")
         fadeAnim.duration = 0.3
@@ -147,13 +147,23 @@ class ViewController: NSViewController, NSOpenSavePanelDelegate, NSTextViewDeleg
         scene.hideDragInvite()
     }
 
-    func circleDropDragEntered() {
+    func circleDropDragEntered(filePath: String) {
         //
         print("drag entered vc")
         animateDropInvitationOut()
+        getMetadata(filePath)
         scene.showDragInvite()
     }
 
+    func getMetadata(filePath:String){
+        let asset = AVURLAsset(URL: NSURL(fileURLWithPath: filePath))
+        print("##dumping meta:")
+        for t in asset.tracksWithMediaType(AVMediaTypeVideo) {
+            print(t.metadata)
+        }
+    }
+
+
     func circleDropDragPerformed(filePath: String) {
         // PASSITON
         print("drag performed vc, filepath:\(filePath)")

diff --git a/droptogif/gifify b/droptogif/gifify
@@ -115,8 +115,12 @@ echo "Calling ffmpeg for filename: $filename to temp: $temp with filter: $filter
 $ffmpeg -loglevel panic -i "$filename" $filter -r $fps -f image2pipe -vcodec ppm - >> $temp
 
 echo "Calling Convert"
+#cat $temp | $convert xc:none -draw "circle 100,100 100,1" -fill +dither -layers Optimize -delay $delay - "${output}.gif"
+# cat $temp | $convert  +dither -draw "circle 100,100 100,1" -layers Optimize -delay $delay - "${output}.gif"
+# cat $temp | $convert  +dither -layers Optimize -delay $delay - "${output}.gif"
 cat $temp | $convert +dither -layers Optimize -delay $delay - "${output}.gif"
 
+
 if [ $noupload -ne 1 ]; then
 # open -a CloudApp "${output}.gif"