6.0.3

CHANGELOG

@@ -1,3 +1,8 @@
+== 6.0.2 2024-06-19
+
+Fixes:
+* Fixed a possible race condition that would cause the transcoder to time out even if the transcoder was still running
+
 == 6.0.2 2024-06-18
 
 Fixes:

lib/ffmpeg/timeout.rb

@@ -11,16 +11,21 @@ def self.start(duration, message = nil)
     end
 
     def pause
-      @paused = true
+      @mutex.synchronize { @paused = true }
+      nil
     end
 
     def resume
-      @paused = false
-      tick
+      @mutex.synchronize do
+        @last_tick = Time.now
+        @paused = false
+        nil
+      end
     end
 
     def tick
-      @last_tick = Time.now
+      @mutex.synchronize { @last_tick = Time.now }
+      nil
     end
 
     def cancel
@@ -33,6 +38,7 @@ def cancel
     private
 
     def initialize(duration, message = nil)
+      @mutex = Mutex.new
       @duration = duration
       @message = message
 
@@ -43,7 +49,7 @@ def initialize(duration, message = nil)
     end
 
     def loop
-      sleep 0.1 while @paused || Time.now - @last_tick <= @duration
+      sleep 0.1 while @mutex.synchronize { @paused || Time.now - @last_tick <= @duration }
 
       @current_thread.raise(::Timeout::Error, @message || self.class.name)
     end

lib/ffmpeg/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FFMPEG
-  VERSION = '6.0.2'
+  VERSION = '6.0.3'
 end