carrierwave-video 0.2.1 → 0.2.2

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.rvmrc

data/README.rdoc

@@ -59,7 +59,37 @@ They will be called with the parameters sent to process.
 Logging:
     logger: :method  #returns object that behaves like Logger
 
-= Upcoming
+= OGG/OGV & Theora
+
+If you want to transcode to OGV format, I recommend using ffmpeg2theora. It works better.
+Support for this is built into this gem, but it is not as mature as the transcoding
+support built into the streamio-ffmpeg gem. You will need to install the ffmpeg2theora binary.
+http://v2v.cc/~j/ffmpeg2theora/
+
+ffmpeg2theora does not have watermark support, so if you want a watermark, I recommend
+building the theora file off previous version. I have not built in resolution or any other options
+as I am just creating mine from a previous version (in the correct size/with watermark).
+If you need support for this it shouldn't be too hard to add. (Use streamio-ffmpeg for inspiration)
+
+Example:
+
+    class VideoUploader < CarrierWave::Uploader::Base
+      include CarrierWave::VideoConverter
+
+      version :mp4 do
+        process :encode_video => [:mp4, {...}]
+      end
+
+      version :ogv, :from_version => :mp4 do
+        process :encode_ogv => [{ logger: logger_method, callbacks: {...}  }]
+      end
+    end
+
+You do not need to pass in the format to the encode_ogv method (as it is always ogv).
+The only options that do work are logger and callbacks. Others will be ignored.
+
+
+= Upcoming and notes
 
-* screengrabs
 * ffmpeg gives a confusing error if watermark file does not exist, raise in ruby
+* error handling/checking (extract from streamio-ffmpeg gem's transcoder) for encode_ogv

data/lib/carrierwave-video/version.rb

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

data/lib/carrierwave/video.rb

@@ -1,14 +1,42 @@
 require 'streamio-ffmpeg'
 require 'carrierwave'
 require 'carrierwave/video/ffmpeg_options'
+require 'carrierwave/video/ffmpeg_theora'
 
 module CarrierWave
   module Video
     extend ActiveSupport::Concern
+    def self.ffmpeg2theora_binary=(bin)
+      @ffmpeg2theora = bin
+    end
+
+    def self.ffmpeg2theora_binary
+      @ffmpeg2theora.nil? ? 'ffmpeg2theora' : @ffmpeg2theora
+    end
+
     module ClassMethods
       def encode_video(target_format, options={})
         process encode_video: [target_format, options]
       end
+
+      def encode_ogv(opts={})
+        process encode_ogv: [opts]
+      end
+
+    end
+
+    def encode_ogv(opts)
+      # move upload to local cache
+      cache_stored_file! if !cached?
+
+      tmp_path  = File.join( File.dirname(current_path), "tmpfile.ogv" )
+      @options = CarrierWave::Video::FfmpegOptions.new('ogv', opts)
+
+      with_trancoding_callbacks do
+        transcoder = CarrierWave::Video::FfmpegTheora.new(current_path, tmp_path)
+        transcoder.run(@options.logger(model))
+        File.rename tmp_path, current_path
+      end
     end
 
     def encode_video(format, opts={})

data/lib/carrierwave/video/ffmpeg_options.rb

@@ -37,7 +37,7 @@ module CarrierWave
           {
             video_codec: 'libx264',
             audio_codec: 'libfaac',
-            custom: "-b 1500k -vpre slow -vpre baseline -g 30 #{watermark_params}"
+            custom: "-qscale 0 -vpre slow -vpre baseline -g 30 #{watermark_params}"
           }
         when "webm"
           {

data/lib/carrierwave/video/ffmpeg_theora.rb

@@ -0,0 +1,41 @@
+module CarrierWave
+  module Video
+    class FfmpegTheora
+      attr_reader :input_path, :output_path
+      def initialize(input_file_path, output_file_path)
+        @input_path = input_file_path
+        @output_path = output_file_path
+      end
+
+      def run(logger=nil)
+        cmd = "#{CarrierWave::Video.ffmpeg2theora_binary} #{input_path} -o #{output_path}"
+        logger.info("Running....#{cmd}") if logger
+        outputs = []
+        exit_code = nil
+
+        Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
+          stderr.each("r") do |line|
+            outputs << line
+          end
+          exit_code = wait_thr.value
+        end
+
+        handle_exit_code(exit_code, outputs, logger)
+      end
+
+      private
+      def handle_exit_code(exit_code, outputs, logger)
+        return unless logger
+        if exit_code == 0
+          logger.info("Success!")
+        else
+          outputs.each do |output|
+            logger.error(output)
+          end
+          logger.error("Failure!")
+        end
+        exit_code
+      end
+    end
+  end
+end

data/spec/lib/carrierwave_video_spec.rb

@@ -26,6 +26,18 @@ describe CarrierWave::Video do
     end
   end
 
+  describe ".encode_ogv" do
+    it "processes the model" do
+      TestVideoUploader.should_receive(:process).with(encode_ogv: [:opts])
+      TestVideoUploader.encode_ogv(:opts)
+    end
+
+    it "does not require options" do
+      TestVideoUploader.should_receive(:process).with(encode_ogv: [{}])
+      TestVideoUploader.encode_ogv
+    end
+  end
+
   describe "#encode_video" do
     let(:format) { 'webm' }
     let(:movie) { mock }
@@ -167,4 +179,44 @@ describe CarrierWave::Video do
       end
     end
   end
+
+
+  describe "#encode_ogv" do
+    let(:movie) { mock }
+    let(:output_path) { 'video/path/tmpfile.ogv' }
+    let(:movie_path) { 'video/path/input.mov' }
+    let(:logger) { mock(:logger) }
+
+
+    before do
+      converter.model.stub(:logger).and_return(logger)
+      File.should_receive(:rename)
+      converter.stub(:current_path).and_return('video/path/input.mov')
+    end
+
+    context "no options set" do
+      it "calls transcode with correct format options" do
+        transcoder = mock(:transcoder)
+        CarrierWave::Video::FfmpegTheora.should_receive(:new).with(movie_path, output_path).and_return(transcoder)
+        transcoder.should_receive(:run)
+
+        converter.encode_ogv({})
+      end
+    end
+
+    context "with logger set" do
+      before do
+        converter.model.stub(:logger).and_return(logger)
+      end
+
+      it "calls transcode with correct format options and passes logger to transcoder" do
+        transcoder = mock(:transcoder)
+        CarrierWave::Video::FfmpegTheora.should_receive(:new).with(movie_path, output_path).and_return(transcoder)
+        transcoder.should_receive(:run).with(logger)
+
+        converter.encode_ogv({logger: :logger})
+      end
+    end
+  end
+
 end

data/spec/lib/ffmpeg_theora_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe CarrierWave::Video::FfmpegTheora do
+  describe "run" do
+    let(:input_file_path) { '/tmp/file.mov' }
+    let(:output_file_path) { '/tmp/file.ogv' }
+    let(:binary) { 'bunnery' }
+
+    let(:transcoder) { CarrierWave::Video::FfmpegTheora.new(input_file_path, output_file_path) }
+
+    before do
+     CarrierWave::Video.ffmpeg2theora_binary = binary
+    end
+
+    it "should run the ffmpeg2theora binary" do
+      command = "#{binary} #{input_file_path} -o #{output_file_path}"
+      Open3.should_receive(:popen3).with(command)
+
+      transcoder.run
+    end
+
+    context "given a logger" do
+      let(:logger) { mock(:logger) }
+
+      it "should run and log results" do
+        command = "#{binary} #{input_file_path} -o #{output_file_path}"
+        Open3.should_receive(:popen3).with(command)
+        logger.should_receive(:info).with("Running....#{command}")
+        logger.should_receive(:error).with("Failure!")
+
+        transcoder.run(logger)
+      end
+    end
+  end
+end

metadata

@@ -1,67 +1,84 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: carrierwave-video
-version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 2
+  version: 0.2.2
 platform: ruby
-authors:
+authors: 
 - rheaton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-06-25 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70099877315660 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70099877315660
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70099877314880 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70099877314880
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: streamio-ffmpeg
-  requirement: &70099877313960 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70099877313960
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: carrierwave
-  requirement: &70099877312940 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70099877312940
+  version_requirements: *id004
 description: Transcodes to html5-friendly videos.
-email:
+email: 
 - rachelmheaton@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -71,35 +88,44 @@ files:
 - lib/carrierwave-video/version.rb
 - lib/carrierwave/video.rb
 - lib/carrierwave/video/ffmpeg_options.rb
+- lib/carrierwave/video/ffmpeg_theora.rb
 - spec/lib/carrierwave_video_spec.rb
+- spec/lib/ffmpeg_theora_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+has_rdoc: true
+homepage: ""
 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-requirements:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      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.10 or greater with libx256, libfaac, libtheora, libvorbid, libvpx enabled
 rubyforge_project: carrierwave-video
-rubygems_version: 1.8.17
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Carrierwave extension that uses ffmpeg to transcode videos.
-test_files:
+test_files: 
 - spec/lib/carrierwave_video_spec.rb
+- spec/lib/ffmpeg_theora_spec.rb
 - spec/spec_helper.rb