ffmpeg_core 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 026e0c17db47148e554c7b08f77a3e21a7b78b6f7d65915d3bf5159d057aae08
-  data.tar.gz: d0e49b402f4dff9aa73944f3a6e1543260d970c1114b4faccf9d3c51bb3da670
+  metadata.gz: a3a1322c33ef390363223c0f3a307f269e84ed3484d2491e2d7340111d33d7a6
+  data.tar.gz: d98fcf0cf9881e837783cda58d1d43784c87310db8e22468e5b0623c9a8d6716
 SHA512:
-  metadata.gz: 1d6eee4ad41d752b13ce1aab69be77ca24a5368b60db93b468feb12c2340d7f26dec285d09924503237a176b6bed299d4d9b1801e375fb6c5953f5c030e8f957
-  data.tar.gz: 987108002867b7d622aeb57b2606e59edae50a4762e76bb7287f52f97de836b740d2a65258df1e7f6baf8f1596e288d3bdad1b666e3b1b01974046212cfea3bf
+  metadata.gz: 5e50f4fb86e61b7d7e858ed90a047f37fa92d7ec9c9216cf8238b7aaf7f48b7c78aa237c36a8c154e864976e8b65c0ac78a93697c1047342df113037fed6f035
+  data.tar.gz: 621b5d98bd486b260a4c208c091f18113484d29df66cb005f8e005204dedd324fc5d737e22d662bbf2dbda788f8cdba002a5a313ba18abcc28d926c948c2cf11

data/CHANGELOG.md

@@ -5,6 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.1] - 2026-04-09
+
+### Fixed
+
+- Binary detection on Windows: `where` fallback now correctly resolves ffmpeg/ffprobe when not on PATH
+
+### Changed
+
+- Simplified binary detection: removed redundant Ruby PATH scan, extracted lookup steps into focused private methods
+- Expanded `Configuration` spec: ENV override, `BinaryNotFoundError`, known-path fallback, `reset_configuration!`
+
+## [0.4.0] - 2026-01-26
+
+### Added
+
+- **Complex Filters & Mapping:** Added `filter_graph` (for `-filter_complex`) and `maps` (for `-map`) options to `transcode`.
+- **Hardware Acceleration:** Added `:hwaccel` option to `transcode` (supports `:nvenc`, `:vaapi`, `:qsv`) with automatic encoder detection.
+
 ## [0.3.0] - 2026-01-16
 
 ### Added

data/README.md

@@ -11,6 +11,7 @@ Modern Ruby wrapper for FFmpeg with clean API and proper error handling.
 - Zero runtime dependencies
 - **Real-time progress reporting**
 - **Support for video/audio filters and quality presets**
+- **Hardware Acceleration (NVENC, VAAPI, QSV)**
 - **Remote input support (HTTP/HTTPS/RTMP/RTSP)**
 - Proper error handling with detailed context
 - Thread-safe configuration
@@ -85,11 +86,36 @@ movie.transcode("output.mp4", {
   video_filter: "scale=1280:-1,transpose=1", # Resize and rotate
   audio_filter: "volume=0.5",                # Reduce volume
   preset: "slow",      # ffmpeg preset (ultrafast, fast, medium, slow, etc.)
-  crf: 23,             # Constant Rate Factor (0-51)
-  custom: %w[-map 0:v -map 0:a] # Custom FFmpeg flags
+  crf: 23              # Constant Rate Factor (0-51)
 })
 ```
 
+### Complex Filter Graphs & Stream Mapping
+
+Use structured APIs for `-filter_complex` and `-map` to build complex pipelines without raw string hacks.
+
+```ruby
+movie.transcode("out.mp4", {
+  filter_graph: [
+    "[0:v]crop=320:240:0:0[c]",
+    "[c]scale=640:480[outv]"
+  ],
+  maps: ["[outv]", "0:a"]
+})
+```
+
+### Hardware Acceleration
+
+Opt-in to hardware-accelerated encoding with automatic encoder detection and graceful fallback.
+
+```ruby
+# Automatically switches to h264_nvenc if available, falls back to libx264 otherwise
+movie.transcode("out.mp4", hwaccel: :nvenc)
+
+# Supports :nvenc, :vaapi, and :qsv
+movie.transcode("out.mp4", hwaccel: :vaapi)
+```
+
 ### Using Filters
 
 FFmpegCore supports raw FFmpeg filter strings for both video (`video_filter` or `-vf`) and audio (`audio_filter` or `-af`).

data/lefthook.yml

@@ -0,0 +1,8 @@
+pre-commit:
+  parallel: true
+  jobs:
+    - name: rubocop
+      glob: "*.rb"
+      run: bundle exec rubocop --force-exclusion {staged_files}
+    - name: rspec
+      run: bundle exec rspec

data/lib/ffmpeg_core/configuration.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require "fileutils"
+require "forwardable"
+require "open3"
+
 module FFmpegCore
   # Configuration for FFmpegCore library
   class Configuration
@@ -11,26 +15,79 @@ module FFmpegCore
       @timeout = 30 # seconds
     end
 
+    def encoders
+      @encoders ||= detect_encoders
+    end
+
     private
 
-    def detect_binary(name)
-      # Check common locations
-      paths = ENV["PATH"].split(File::PATH_SEPARATOR)
-      paths.each do |path|
-        binary = File.join(path, name)
-        return binary if File.executable?(binary)
-      end
+    def detect_encoders
+      return Set.new unless @ffmpeg_binary
 
-      # Homebrew locations (macOS)
-      homebrew_paths = [
-        "/opt/homebrew/bin/#{name}", # Apple Silicon
-        "/usr/local/bin/#{name}" # Intel
-      ]
-      homebrew_paths.each do |path|
-        return path if File.executable?(path)
+      stdout, _stderr, status = Open3.capture3(@ffmpeg_binary, "-encoders")
+      return Set.new unless status.success?
+
+      encoders = Set.new
+      stdout.each_line do |line|
+        # Match lines like: " V..... libx264 ..."
+        if line =~ /^\s*[VAS][\w.]+\s+(\w+)/
+          encoders.add($1)
+        end
       end
+      encoders
+    rescue
+      Set.new
+    end
+
+    def detect_binary(name)
+      binary_from_env(name) ||
+        binary_from_system_lookup(name) ||
+        binary_from_known_paths(name) ||
+        raise(BinaryNotFoundError, <<~MSG)
+          #{name} not found.
+          Install FFmpeg and ensure it's in PATH.
+          macOS: brew install ffmpeg
+          Linux: apt install ffmpeg / yum install ffmpeg
+          Windows: choco install ffmpeg or scoop install ffmpeg
+        MSG
+    end
+
+    # Checks FFMPEGCORE_<NAME> env variable for an explicit binary override.
+    def binary_from_env(name)
+      path = ENV["FFMPEGCORE_#{name.upcase}"]
+      path if path && File.executable?(path)
+    end
 
-      raise BinaryNotFoundError, "#{name} binary not found. Please install FFmpeg: brew install ffmpeg"
+    # Uses the OS-native `which` (Unix) or `where` (Windows) command.
+    def binary_from_system_lookup(name)
+      cmd = Gem.win_platform? ? "where #{name}" : "which #{name}"
+      stdout, status = Open3.capture2(cmd)
+      return unless status.success?
+
+      path = stdout.lines.first&.strip
+      path if path && File.executable?(path)
+    end
+
+    # Falls back to a list of well-known installation paths.
+    def binary_from_known_paths(name)
+      known_paths(name).find { |p| File.executable?(p) }
+    end
+
+    def known_paths(name)
+      if Gem.win_platform?
+        [
+          "C:/ffmpeg/bin/#{name}.exe",
+          "C:/ProgramData/chocolatey/bin/#{name}.exe",
+          "#{ENV["USERPROFILE"]}/scoop/apps/ffmpeg/current/bin/#{name}.exe"
+        ]
+      else
+        [
+          "/opt/homebrew/bin/#{name}",  # macOS ARM
+          "/usr/local/bin/#{name}",     # macOS Intel / Linux
+          "/usr/bin/#{name}",
+          "/snap/bin/#{name}"
+        ]
+      end
     end
   end
 

data/lib/ffmpeg_core/movie.rb

@@ -26,6 +26,9 @@ module FFmpegCore
     # @option options [String, Integer] :audio_bitrate Audio bitrate (e.g., "128k" or 128)
     # @option options [String] :resolution Resolution (e.g., "1280x720")
     # @option options [Integer, Float] :frame_rate Frame rate (e.g., 30)
+    # @option options [Array<String>, String] :filter_graph Complex filter graph (e.g., ["[0:v]crop=..."])
+    # @option options [Array<String>, String] :maps Stream maps (e.g., ["[outv]", "0:a"])
+    # @option options [Symbol] :hwaccel Hardware acceleration (:nvenc, :vaapi, :qsv)
     # @option options [Array<String>] :custom Custom FFmpeg flags
     # @yield [Float] Progress ratio (0.0 to 1.0)
     # @return [String] Path to transcoded file

data/lib/ffmpeg_core/probe.rb

@@ -122,7 +122,7 @@ module FFmpegCore
     end
 
     def validate_file!
-      return if path =~ %r{^(https?|rtmp|rtsp)://}
+      return if %r{^(https?|rtmp|rtsp)://}.match?(path)
 
       raise InvalidInputError, "File does not exist: #{path}" unless File.exist?(path)
       raise InvalidInputError, "File is not readable: #{path}" unless File.readable?(path)

data/lib/ffmpeg_core/transcoder.rb

@@ -25,7 +25,7 @@ module FFmpegCore
     private
 
     def validate_input!
-      return if input_path =~ %r{^(https?|rtmp|rtsp)://}
+      return if %r{^(https?|rtmp|rtsp)://}.match?(input_path)
 
       raise InvalidInputError, "Input file does not exist: #{input_path}" unless File.exist?(input_path)
     end
@@ -38,6 +38,9 @@ module FFmpegCore
     def build_command
       cmd = [FFmpegCore.configuration.ffmpeg_binary]
 
+      # Apply HW Accel if requested
+      cmd += resolve_hwaccel_codec
+
       # Input file
       cmd += ["-i", input_path]
 
@@ -62,12 +65,12 @@ module FFmpegCore
       # Video filters
       video_filters = []
       video_filters << options[:video_filter] if options[:video_filter]
-      
+
       if options[:crop]
         crop = options[:crop]
         video_filters << "crop=#{crop[:width]}:#{crop[:height]}:#{crop[:x]}:#{crop[:y]}"
       end
-      
+
       cmd += ["-vf", video_filters.join(",")] unless video_filters.empty?
 
       # Audio filter
@@ -79,6 +82,21 @@ module FFmpegCore
       # Constant Rate Factor (CRF)
       cmd += ["-crf", options[:crf].to_s] if options[:crf]
 
+      # Filter Complex / Filter Graph
+      filter_graph = options[:filter_graph] || options[:filter_complex]
+      if filter_graph
+        graph_string = filter_graph.is_a?(Array) ? filter_graph.join(";") : filter_graph
+        cmd += ["-filter_complex", graph_string]
+      end
+
+      # Maps
+      maps = options[:maps] || options[:map]
+      if maps
+        Array(maps).each do |map|
+          cmd += ["-map", map]
+        end
+      end
+
       # Custom options (array of strings)
       cmd += options[:custom] if options[:custom]
 
@@ -147,5 +165,50 @@ module FFmpegCore
         end
       end
     end
+
+    def resolve_hwaccel_codec
+      return [] unless options[:hwaccel]
+
+      current_codec = options[:video_codec] || "libx264"
+      family = detect_codec_family(current_codec)
+      return [] unless family
+
+      hw_type = options[:hwaccel].to_sym
+      target_encoder = HW_ENCODERS.dig(family, hw_type)
+
+      if target_encoder && FFmpegCore.configuration.encoders.include?(target_encoder)
+        options[:video_codec] = target_encoder
+        return HW_FLAGS[hw_type] || []
+      end
+      []
+    end
+
+    def detect_codec_family(codec)
+      case codec.to_s
+      when /x264|h264|avc/i
+        :h264
+      when /x265|hevc/i
+        :hevc
+      end
+    end
+
+    HW_FLAGS = {
+      vaapi: ["-hwaccel", "vaapi", "-hwaccel_output_format", "vaapi"],
+      qsv: ["-hwaccel", "qsv"],
+      nvenc: ["-hwaccel", "cuda", "-hwaccel_output_format", "cuda"]
+    }.freeze
+
+    HW_ENCODERS = {
+      h264: {
+        nvenc: "h264_nvenc",
+        vaapi: "h264_vaapi",
+        qsv: "h264_qsv"
+      },
+      hevc: {
+        nvenc: "hevc_nvenc",
+        vaapi: "hevc_vaapi",
+        qsv: "hevc_qsv"
+      }
+    }.freeze
   end
 end

data/lib/ffmpeg_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FFmpegCore
-  VERSION = "0.3.0"
-end
+  VERSION = "0.4.1"
+end

metadata

@@ -1,14 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: ffmpeg_core
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Alexey Poimtsev
 bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A clean, well-tested FFmpeg wrapper with modern Ruby conventions, proper
   error handling, and zero dependencies.
 email:
@@ -21,6 +35,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lefthook.yml
 - lib/ffmpeg_core.rb
 - lib/ffmpeg_core/configuration.rb
 - lib/ffmpeg_core/errors.rb
@@ -52,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Modern Ruby wrapper for FFmpeg
 test_files: []