Rename pitch -> rate

Author: WyattBlue

CHANGELOG.md

@@ -1,9 +1,11 @@
-# 29.2.0
+# 29.3.0
 
 ## Major
 
 ## Features
- - Restore `--audio-normalize` feature.
+ - Implement actions: `--when-silent`, `--when-normal`.
+ - Example: `--when-silent speed:2`, `--when-normal rate:1.25`
 
 ## Fixes
- - Correct the default codec for WAV files.
+ - Fix SMPTE timecode parsing for semi-colons.
+ - Fix high speeds causing crash

src/exports/json.nim

@@ -10,7 +10,7 @@ func effectToString(act: Action): string =
   of actNil: "nil"
   of actCut: "cut"
   of actSpeed: "speed:" & $act.val
-  of actPitch: "pitch:" & $act.val
+  of actRate: "rate:" & $act.val
   of actVolume: "volume:" & $act.val
 
 func `%`(self: v1): JsonNode =
@@ -100,7 +100,7 @@ proc exportJsonTl*(tlV3: v3, `export`: string, output: string) =
         let effect = tlV3.effects[clip2.effect]
         if effect.kind == actCut:
           speed = 99999.0
-        elif effect.kind == actSpeed or effect.kind == actPitch:
+        elif effect.kind == actSpeed or effect.kind == actRate:
           speed = effect.val.float64
 
         chunks.add (clip2.start, clip2.`end`, speed)

src/imports/json.nim

@@ -20,7 +20,7 @@ proc parseEffect(val: string): Action =
     case effectType
     of "speed": return Action(kind: actSpeed, val: effectVal)
     of "volume": return Action(kind: actVolume, val: effectVal)
-    of "pitch": return Action(kind: actPitch, val: effectVal)
+    of "rate": return Action(kind: actRate, val: effectVal)
     else: error &"unknown action: {effectType}"
 
   error &"unknown action: {val}"

src/log.nim

@@ -46,13 +46,13 @@ type
       t*: float32 # -99.0 to 0.0, default -8.0
 
   ActionKind* = enum
-    actNil, actCut, actSpeed, actPitch, actVolume
+    actNil, actCut, actSpeed, actRate, actVolume
 
   Action* = object
     case kind*: ActionKind
     of actNil, actCut:
       discard
-    of actSpeed, actPitch, actVolume:
+    of actSpeed, actRate, actVolume:
       val*: float32
 
 func `==`*(a, b: Action): bool =
@@ -61,7 +61,7 @@ func `==`*(a, b: Action): bool =
   case a.kind
   of actNil, actCut:
     return true
-  of actSpeed, actPitch, actVolume:
+  of actSpeed, actRate, actVolume:
     return a.val == b.val
 
 type mainArgs* = object

src/main.nim

@@ -44,7 +44,7 @@ Options:
                                     speed (val: float)
                                       ; Change the speed while preserving pitch.
                                       ;   val: between (0-99999)
-                                    pitch (val: float)
+                                    rate (val: float)
                                       ; Change the speed by varying pitch.
                                       ;   val: between [0.2-100]
     -ex, --export EXPORT:ATTRS?   Choose the export mode.
@@ -276,9 +276,9 @@ proc parseAction(val: string): Action =
   if val.startsWith("speed:"):
     let val = parseFloat(val[6 ..< val.len])
     return Action(kind: actSpeed, val: val)
-  if val.startsWith("pitch:"):
-    let val = parseFloat(val[6 ..< val.len])
-    return Action(kind: actPitch, val: val)
+  if val.startsWith("rate:"):
+    let val = parseFloat(val[5 ..< val.len])
+    return Action(kind: actRate, val: val)
   if val.startsWith("volume:"):
     let val = parseFloat(val[7 ..< val.len])
     return Action(kind: actVolume, val: val)

src/preview.nim

@@ -66,7 +66,7 @@ func allCuts(tl: v3, inLen: int): seq[int] =
 
   for clip in tl.a[0].clips:
     let effect = tl.effects[clip.effects]
-    let speed = (if effect.kind == actSpeed or effect.kind == actPitch: effect.val else: 1.0)
+    let speed = (if effect.kind in [actSpeed, actRate]: effect.val else: 1.0)
     let oldOffset = clip.offset.float64 * speed
     clipSpans.add((round(oldOffset), round(oldOffset + clip.dur.float64)))
 

src/render/audio.nim

@@ -299,7 +299,7 @@ proc createFilterGraph(effect: Action, sr: int, layout: string): (ptr AVFilterGr
       remainingSpeed = remainingSpeed / maxAtempo
     if remainingSpeed > 1.0 or remainingSpeed < 1.0:
       filters.add &"atempo={remainingSpeed}"
-  of actPitch:
+  of actRate:
     let clampedSpeed = max(0.2, min(100.0, effect.val))
     filters.add &"asetrate={sr}*{clampedSpeed}"
     filters.add &"aresample={sr}"
@@ -350,7 +350,7 @@ proc processAudioClip(ef: seq[Action], clip: Clip, data: seq[int16], sourceSr: c
   var processedData = data
 
   let effect = ef[clip.effects]
-  let needsFiltering = effect.kind in [actSpeed, actPitch, actVolume]
+  let needsFiltering = effect.kind in [actSpeed, actRate, actVolume]
 
   if needsFiltering:
     # Data is interleaved: [L, R, L, R, ...] so always stereo
@@ -604,7 +604,7 @@ proc makeAudioFrames(fmt: AVSampleFormat, tl: v3, frameSize: int, layerIndices:
         let key = (clip.src[], clip.stream)
 
         let effect = tl.effects[clip.effects]
-        let speed = (if effect.kind in [actSpeed, actPitch]: effect.val else: 1.0)
+        let speed = (if effect.kind in [actSpeed, actRate]: effect.val else: 1.0)
 
         if key in samples:
           let getter = samples[key]

src/render/video.nim

@@ -292,7 +292,7 @@ proc makeNewVideoFrames*(output: var OutputContainer, tl: v3, args: mainArgs):
             let sourceFramePos = int(round(float(timelinePos) * srcTb.float / tl.tb.float))
 
             let effect = tl.effects[obj.effects]
-            let speed = (if effect.kind in [actSpeed, actPitch]: effect.val else: 1.0)
+            let speed = (if effect.kind in [actSpeed, actRate]: effect.val else: 1.0)
 
             let i = int(round(float(sourceFramePos) * speed))
             objList.add VideoFrame(index: i, src: obj.src)

src/timeline.nim

@@ -115,7 +115,7 @@ proc initLinearTimeline*(src: ptr string, tb: AvRational, bg: RGBColor, mi: Medi
   for chunk in pseudoChunks:
     # Make normal chunks
     let speed = (
-      if chunk[3].kind in [actSpeed, actPitch]: chunk[3].val
+      if chunk[3].kind in [actSpeed, actRate]: chunk[3].val
       elif chunk[3].kind == actCut: 99999.0
       else: 1.0
     )
@@ -261,7 +261,7 @@ proc toNonLinear2*(src: ptr string, tb: AVRational, bg: RGBColor, mi: MediaInfo,
       continue
 
     var speed = 1.0
-    if effect.kind == actSpeed or effect.kind == actPitch:
+    if effect.kind == actSpeed or effect.kind == actRate:
       speed = effect.val
 
     dur = int64(round(float64(clip2.`end` - clip2.start) / speed))