vidibus-mp4_encoder 0.1.1 → 0.2.0

data/Rakefile

@@ -7,12 +7,6 @@ require 'rspec/core/rake_task'
 
 Bundler::GemHelper.install_tasks
 
-RSpec::Core::RakeTask.new(:rcov) do |t|
-  t.pattern = 'spec/**/*_spec.rb'
-  t.rcov = true
-  t.rcov_opts = ['--exclude', '^spec,/gems/']
-end
-
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = 'Vidibus::Mp4Encoder'
@@ -20,5 +14,3 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
   rdoc.options << '--charset=utf-8'
 end
-
-task :default => :rcov

data/lib/vidibus/mp4_encoder.rb

@@ -2,15 +2,15 @@ module Vidibus
   class Mp4Encoder < Vidibus::Encoder::Base
     class ProfileError < Vidibus::Encoder::ProfileError; end
 
-    VERSION = '0.1.1'
-
-    DEFAULT_AUDIO_CODEC = 'aac'
-    DEFAULT_VIDEO_CODEC = 'h264'
-    DEFAULT_VIDEO_PROFILE = 'main'
-    DEFAULT_VIDEO_CODEC_LEVEL = '3.1'
-    DEFAULT_PRESETS = {
-      :baseline => 'coder=0 bf=0 flags2=-wpred-dct8x8',
-      :main => 'coder=1 flags=+loop cmp=+chroma partitions=+parti8x8+parti4x4+partp8x8+partb8x8 me_method=hex subq=7  i_qfactor=0.71 directpred=1 flags2=+wpred+fastpskip-dct8x8'
+    VERSION = '0.1.2'
+
+    AUDIO_CODEC = 'aac'
+    VIDEO_CODEC = 'h264'
+    VIDEO_PROFILE = 'main'
+    VIDEO_CODEC_LEVEL = '3.2'
+    VIDEO_FILTER = {
+      :baseline => 'yadif=0:-1:1,hqdn3d=1.5:1.5:6:6',
+      :main => 'yadif=0:-1:1'
     }
 
     # Common profile settings.
@@ -97,12 +97,14 @@ module Vidibus
 
     private
 
+    flag(:offset) { |value| "-ss #{value}" }
+    flag(:duration) { |value| "-t #{value}" }
     flag(:audio_bit_rate) { |value| "-ab #{value}" }
     flag(:audio_channels) { |value| "-ac #{value}" }
     flag(:audio_sample_rate) { |value| "-ar #{value}" }
     flag(:aspect_ratio) { |value| "-aspect #{value}" }
-    flag(:video_profile) { |value| "-vprofile #{value}" }
-    flag(:video_codec_level) { |value| "-vlevel #{value}" }
+    flag(:video_profile) { |value| "-profile:v #{value}" }
+    flag(:video_codec_level) { |value| "-level:v #{value}" }
 
     flag(:video_bit_rate) do |value|
       output = "-vb #{value}"
@@ -114,9 +116,11 @@ module Vidibus
 
     # Set dimensions and aspect ratio to remove anamorphosis.
     flag(:dimensions) do
-      modulus = profile.dimensions_modulus || 8
-      value = profile.dimensions(modulus)
-      "-s #{value} -aspect #{profile.aspect_ratio(modulus)}"
+      unless copy_video?
+        modulus = profile.dimensions_modulus || 8
+        value = profile.dimensions(modulus)
+        "-s #{value} -aspect #{profile.aspect_ratio(modulus)}"
+      end
     end
 
     # Try to find a matching frame rate, if several ones are given. If no
@@ -131,42 +135,55 @@ module Vidibus
       "-r #{value} -g #{gop} -keyint_min #{gop}"
     end
 
-    # Convert the preset args
-    flag(:preset) do |value|
-      '-' + value.gsub(/\s+/, ' -').gsub(/\=/, ' ')
-    end
-
     flag(:audio_codec) do |value|
-      if value == 'aac'
-        'libfaac'
+      case value
+      when 'copy' then 'copy'
+      when 'aac', 'libfaac' then 'libfaac'
+      when 'mp3', 'libmp3lame' then 'libmp3lame'
+      when 'libfdk_aac' then 'libfdk_aac'
       else
-        raise 'aac is the only audio codec supported right now'
+        raise 'unsupported audio codec'
       end
     end
 
     flag(:video_codec) do |value|
-      if value == 'h264'
-        'libx264'
+      case value
+      when 'copy' then 'copy'
+      when 'h264', 'libx264' then 'libx264'
       else
-        raise 'h264 is the only video codec supported right now'
+        raise 'Unsupported video codec'
       end
     end
 
+    flag(:video_filter) do |value|
+      %(-filter:v "#{value}")
+    end
+
+    def copy_video?
+      profile.settings[:video_codec] == 'copy'
+    end
+
+    def copy_audio?
+      profile.settings[:audio_codec] == 'copy'
+    end
+
     # Set default options for current profile:
     #
     #   audio_codec: 'aac'
     #   video_codec: 'h264'
     #   video_profile: 'main'
-    #   video_codec_level: '3.1'
+    #   video_codec_level: '3.2'
     #   preset: [the :main present]
     def preprocess
-      profile.settings[:audio_codec] ||= DEFAULT_AUDIO_CODEC
-      profile.settings[:video_codec] ||= DEFAULT_VIDEO_CODEC
-      profile.settings[:video_profile] ||= DEFAULT_VIDEO_PROFILE
-      profile.settings[:video_codec_level] ||= begin
-        profile.video_profile.to_s == 'baseline' ? '3.0': DEFAULT_VIDEO_CODEC_LEVEL
+      profile.settings[:audio_codec] ||= AUDIO_CODEC
+      profile.settings[:video_codec] ||= VIDEO_CODEC
+      unless copy_video?
+        profile.settings[:video_profile] ||= VIDEO_PROFILE
+        profile.settings[:video_codec_level] ||= begin
+          profile.video_profile.to_s == 'baseline' ? '3.0': VIDEO_CODEC_LEVEL
+        end
+        profile.settings[:video_filter] ||= VIDEO_FILTER[profile.video_profile.to_sym]
       end
-      profile.settings[:preset] ||= DEFAULT_PRESETS[profile.video_profile.to_sym]
       super
     end
 
@@ -181,9 +198,12 @@ module Vidibus
 
     # The encoding recipe.
     def recipe
-      audio = %(-acodec %{audio_codec} %{audio_sample_rate} %{audio_bit_rate} %{audio_channels} -async 2)
-      video = %(-vcodec %{video_codec} %{dimensions} %{video_bit_rate} %{frame_rate} %{video_profile} %{video_codec_level} -deinterlace %{preset})
-      "ffmpeg -i %{input} #{audio} #{video} -y -threads 0 %{output}"
+      audio = %(-acodec %{audio_codec} %{audio_sample_rate} %{audio_bit_rate} %{audio_channels})
+      unless copy_audio?
+        audio << ' -async 2'
+      end
+      video = %(-vcodec %{video_codec} %{dimensions} %{video_filter} %{video_bit_rate} %{frame_rate} %{video_profile} %{video_codec_level})
+      "ffmpeg -i %{input} %{offset} %{duration} #{audio} #{video} -y -threads 0 %{output}"
     end
   end
 end

metadata

@@ -1,172 +1,148 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vidibus-mp4_encoder
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
-- "Andr\xC3\xA9 Pankratz"
+authors:
+- André Pankratz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-21 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: vidibus-encoder
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: MP4 (H.264) Encoder
 email: andre@vidibus.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/vidibus/mp4_encoder.rb
 - lib/vidibus-mp4_encoder.rb
 - LICENSE
 - README.md
 - Rakefile
-has_rdoc: true
 homepage: https://github.com/vidibus/vidibus-mp4_encoder
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -4467260920181881587
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: vidibus-mp4_encoder
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: MP4 (H.264) Encoder
 test_files: []
-