carrierwave-video 0.2.2 → 0.2.3

data/README.rdoc

@@ -37,6 +37,9 @@ Pass in options to process:
 Resolution passed to ffmpeg:
     resolution: "640x360"
 
+If you want to keep the same resolution:
+  resolution: :same
+
 Watermark:
     watermark: {
       path: File.join(Rails.root, "directory", "file.png"),
@@ -59,6 +62,9 @@ They will be called with the parameters sent to process.
 Logging:
     logger: :method  #returns object that behaves like Logger
 
+Custom:
+  streamio-ffmpeg accepts custom params. You may pass these in but keep in mind the watermarking params will be appended if there were any.
+
 = OGG/OGV & Theora
 
 If you want to transcode to OGV format, I recommend using ffmpeg2theora. It works better.

data/carrierwave-video.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'streamio-ffmpeg'
   s.add_runtime_dependency 'carrierwave'
   s.requirements << 'ruby, version 1.9 or greater'
-  s.requirements << 'ffmpeg, version 0.10 or greater with libx256, libfaac, libtheora, libvorbid, libvpx enabled'
+  s.requirements << 'ffmpeg, version 0.11.1 or greater with libx256, libfaac, libtheora, libvorbid, libvpx enabled'
 end

data/lib/carrierwave-video/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Video
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

data/lib/carrierwave/video.rb

@@ -49,6 +49,11 @@ module CarrierWave
 
       with_trancoding_callbacks do
         file = ::FFMPEG::Movie.new(current_path)
+
+        if opts[:resolution] == :same
+          @options.format_options[:resolution] = file.resolution
+        end
+
         file.transcode(tmp_path, @options.format_options, @options.encoder_options)
         File.rename tmp_path, current_path
       end

data/lib/carrierwave/video/ffmpeg_options.rb

@@ -2,12 +2,13 @@ module CarrierWave
   module Video
     class FfmpegOptions
       attr_reader :watermark_path, :watermark_position, :watermark_pixels,
-        :format, :resolution, :callbacks
+        :format, :resolution, :custom, :callbacks
 
       def initialize(format, options)
         @format = format.to_s
         @watermark = options[:watermark].present?
         @resolution = options[:resolution] || "640x360"
+        @custom = options[:custom]
         @callbacks = options[:callbacks] || {}
         @logger = options[:logger]
         @unparsed = options
@@ -32,29 +33,34 @@ module CarrierWave
       end
 
       def format_options
-        format_options = case format
-        when "mp4"
-          {
-            video_codec: 'libx264',
-            audio_codec: 'libfaac',
-            custom: "-qscale 0 -vpre slow -vpre baseline -g 30 #{watermark_params}"
-          }
-        when "webm"
-          {
-            video_codec: 'libvpx',
-            audio_codec: 'libvorbis',
-            custom: "-b 1500k -ab 160000 -f webm -g 30 #{watermark_params}"
-          }
-        when "ogv"
-          {
-            video_codec: 'libtheora',
-            audio_codec: 'libvorbis',
-            custom: "-b 1500k -ab 160000 -g 30 #{watermark_params}"
-          }
-        else
-          {}
+        @format_options ||= begin
+          result = case format
+          when "mp4"
+            {
+              video_codec: 'libx264',
+              audio_codec: 'libfaac',
+              custom: "-qscale 0 -vpre slow -vpre baseline -g 30 #{watermark_params}"
+            }
+          when "webm"
+            {
+              video_codec: 'libvpx',
+              audio_codec: 'libvorbis',
+              custom: "-b 1500k -ab 160000 -f webm -g 30 #{watermark_params}"
+            }
+          when "ogv"
+            {
+              video_codec: 'libtheora',
+              audio_codec: 'libvorbis',
+              custom: "-b 1500k -ab 160000 -g 30 #{watermark_params}"
+            }
+          else
+            {}
+          end
+
+          { resolution: resolution }.merge(result).tap do |h|
+            h[:custom] = "#{custom} #{watermark_params}".strip if custom.present?
+          end
         end
-        { resolution: resolution }.merge(format_options)
       end
 
       def watermark?

data/spec/lib/carrierwave_video_spec.rb

@@ -48,9 +48,10 @@ describe CarrierWave::Video do
       FFMPEG::Movie.should_receive(:new).and_return(movie)
     end
 
-    context "no options set" do
+    context "with no options set" do
       before {  File.should_receive(:rename) }
-      it "is calls transcode with correct format options" do
+
+      it "calls transcode with correct format options" do
         movie.should_receive(:transcode) do |path, opts, codec_opts|
           codec_opts.should == {preserve_aspect_ratio: :width}
 
@@ -63,9 +64,17 @@ describe CarrierWave::Video do
 
         converter.encode_video(format)
       end
+
+      it "provides a default for the resolution" do
+        movie.should_receive(:transcode) do |path, opts, codec_opts|
+          opts[:resolution].should == '640x360'
+        end
+
+        converter.encode_video(format)
+      end
     end
 
-    context "callbacks set" do
+    context "with callbacks set" do
       before { movie.should_receive(:transcode) }
       let(:opts) do
         { callbacks: {
@@ -108,7 +117,7 @@ describe CarrierWave::Video do
       end
     end
 
-    context "logger set" do
+    context "with logger set" do
       let(:logger) { mock }
       before do
         converter.model.stub(:logger).and_return(logger)
@@ -141,7 +150,7 @@ describe CarrierWave::Video do
       end
     end
 
-    context "watermark set" do
+    context "with watermark set" do
       before { File.should_receive(:rename) }
 
       it "appends watermark params to custom params for ffmpeg" do
@@ -178,6 +187,45 @@ describe CarrierWave::Video do
         })
       end
     end
+
+    context "with resolution set to :same" do
+      before do
+        File.should_receive(:rename)
+        movie.stub(:resolution).and_return('1280x720')
+      end
+
+      it "sets the output resolution to match that of the input" do
+        movie.should_receive(:transcode) do |path, opts, codec_opts|
+          opts[:resolution].should == '1280x720'
+        end
+
+        converter.encode_video(format, resolution: :same)
+      end
+    end
+
+    context "with custom passed in" do
+      before do
+        File.should_receive(:rename)
+      end
+
+      it "takes the provided custom param" do
+        movie.should_receive(:transcode) do |path, opts, codec_opts|
+          opts[:custom].should == '-preset slow' # a la changes in ffmpeg 0.11.1
+        end
+
+        converter.encode_video(format, custom: '-preset slow')
+      end
+
+      it "maintains the watermark params" do
+        movie.should_receive(:transcode) do |path, opts, codec_opts|
+          opts[:custom].should == "-preset slow -vf \"movie=path/to/file.png [logo]; [in][logo] overlay= [out]\""
+        end
+
+        converter.encode_video(format, custom: '-preset slow', watermark: {
+          path: 'path/to/file.png'
+        })
+      end
+    end
   end
 
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - rheaton
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-25 00:00:00 -04:00
+date: 2012-07-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: 
 - ruby, version 1.9 or greater
-- ffmpeg, version 0.10 or greater with libx256, libfaac, libtheora, libvorbid, libvpx enabled
+- ffmpeg, version 0.11.1 or greater with libx256, libfaac, libtheora, libvorbid, libvpx enabled
 rubyforge_project: carrierwave-video
 rubygems_version: 1.3.7
 signing_key: