abrizer 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2cc86e1f64991ede59039402b26923049110110
-  data.tar.gz: 03522fe0d4fdf46fd41387356969cf416a84a524
+  metadata.gz: 56c129ae5143fedefa8b41cd5c98ccf2a370bf72
+  data.tar.gz: 6162f79282a5576b77bdc9b74cf6c7ff0c74044b
 SHA512:
-  metadata.gz: 7034f59f985cda22b3fd31f6f4f4cbe2574d7e45b80a00b89aa61ba0cb8c83e92ae8d6e18d21473457f6d41ac596a61c5714b232666dfdfc0add5d0cb8e311e9
-  data.tar.gz: 1486ff06789e71d6d9e29d7a9825318ff1fb564b2b08ba2de3a08f8b52159e5088cb5fafa908a19d814afba69949fda88c405af4698bcbeef5131faec1c91a73
+  metadata.gz: a14b4b77761e7f0cd2de95264f2232856cb3da83c431be859b602567491762baeda3eae4855bfd66094be2f9dd5091cee548accaa08f9f800d504c89415bd439
+  data.tar.gz: 0c36ba67ab3d170df18fe87b748f6de4bf96e930fe97b6beef316bfd50ca0c14bdc10610e92900808faedcc7050dd3fbd92a0891fe46035542e21ad965ac3c12

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 /.byebug_history
 /.vagrant
+/ansible/development-playbook.retry

data/Vagrantfile

@@ -4,7 +4,12 @@
 Vagrant.configure("2") do |config|
   config.vm.box = "boxcutter/centos72"
 
-  config.vm.synced_folder '.', '/vagrant' #, type: 'nfs', mount_options: ['nolock', 'rw', 'vers=3', 'tcp', 'actimeo=2']
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  config.vm.network "private_network", ip: "192.168.33.40"
+  
+  config.vm.synced_folder '.', '/vagrant', type: 'nfs', mount_options: ['nolock']
+
   config.vm.network "forwarded_port", guest: 80, host: 8088,
       auto_correct: true
 

data/ansible/development-playbook.yml

@@ -7,14 +7,17 @@
   gather_facts: yes
   roles:
     - role: basic-setup
-    - role: apache
     - role: franklinkim.environment
       environment_config:
         PATH: /usr/local/bento4/bin:/usr/bin:/usr/local/bin
+    - role: apache
     - role: ffmpeg
       build_dir: /root/ffmpeg_build
       source_dir: /root/ffmpeg_sources
     - role: rvm_io.rvm1-ruby
       rvm1_rubies:
         - 2.3.3
+    - role: rvm-setup
+      users:
+        - vagrant
     - role: bento4

data/ansible/roles/apache/tasks/main.yml

@@ -9,6 +9,11 @@
     line: 'Header set Access-Control-Allow-Origin "*"'
     # regexp: '<Directory "/var/www/html">'
     insertafter: '<Directory "/var/www/html">'
+- name: enable range requests
+  lineinfile:
+    dest: /etc/httpd/conf/httpd.conf
+    line: 'Header set Access-Control-Allow-Headers Range'
+    insertafter: 'Header set Access-Control-Allow-Origin "*"'
 - name: remove firewall
   yum:
     name: firewalld
@@ -21,3 +26,7 @@
     force: yes
 - name: restart httpd
   service: name=httpd state=restarted
+- name: enable httpd
+  service:
+    name: httpd
+    enabled: yes

data/ansible/roles/basic-setup/tasks/main.yml

@@ -38,3 +38,6 @@
     - zlib-devel
     - tree
     - jq
+    - unzip
+    - ImageMagick
+    - jpegoptim

data/ansible/roles/bento4/tasks/main.yml

@@ -12,3 +12,7 @@
   file: path=/usr/local/bento4/ state=directory
 - name: move bento4
   shell: mv ~/Bento4-SDK-1-5-0-613.x86_64-unknown-linux/* /usr/local/bento4/.
+- name: set permissions on /usr/local/bento4/
+  file:
+    path: /usr/local/bento4/
+    mode: "u=rwx,go=rx"

data/ansible/roles/rvm-setup/tasks/main.yml

@@ -0,0 +1,9 @@
+---
+- name: add users to rvm group
+  command: /bin/bash -lc 'rvm group add rvm {{item}}'
+  with_items: "{{users}}"
+- name: auto-dotfiles
+  command: /bin/bash -lc 'rvm get stable --auto-dotfiles'
+- name: rvm fix-permissions system
+  command: /bin/bash -lc 'rvm fix-permissions :rvm'
+# - TODO: name: fix bundler permissions

data/exe/abrizer

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 require 'abrizer'
 require 'abrizer/cli'
-require 'byebug'
+# require 'byebug'
 Abrizer::CLI.start(ARGV)

data/lib/abrizer/adaptation.rb

@@ -2,6 +2,7 @@ module Abrizer
   class Adaptation
 
     include FilepathHelpers
+    include DebugSettings
 
     attr_reader :width, :height, :bitrate
 
@@ -12,10 +13,11 @@ module Abrizer
     end
 
     def ffmpeg_cmd(input, output_directory, pass)
-      cmd = %Q|ffmpeg -y -i #{input} -vf \
-          scale='#{width}:trunc(#{width}/dar/2)*2',setsar=1 \
+      cmd = %Q|ffmpeg -y #{debug_settings} \
+          -i #{input} -vf \
+          yadif,scale='#{width}:trunc(#{width}/dar/2)*2',setsar=1 \
           -an -c:v libx264 -x264opts 'keyint=48:min-keyint=48:no-scenecut' \
-          -b:v #{bitrate}k -preset faster |
+          -b:v #{bitrate}k -preset faster -pix_fmt yuv420p |
       if pass == 2
         cmd += %Q| -maxrate #{constrained_bitrate}k -bufsize #{bitrate}k -pass 2 #{filepath(input, output_directory)} |
       else
@@ -49,5 +51,13 @@ module Abrizer
       "Width: #{@width}, Height: #{@height}, Bitrate: #{@bitrate}"
     end
 
+    def to_json
+      MultiJson.dump(to_hash)
+    end
+
+    def to_hash
+      {width: @width, height: @height, bitrate: @bitrate}
+    end
+
   end
 end

data/lib/abrizer/adaptations_file.rb

@@ -0,0 +1,20 @@
+module Abrizer
+  class AdaptationsFile
+
+    include FilepathHelpers
+
+    def initialize(filepath, output_directory)
+      @filepath = filepath
+      @output_directory = output_directory
+    end
+
+    def adaptations
+      adapt = Abrizer::AdaptationFinder.new(@filepath).adaptations
+      adapt_dump = adapt.map{|a| a.to_hash}
+      File.open(adaptations_filepath, 'w') do |fh|
+        fh.puts MultiJson.dump(adapt_dump)
+      end
+      adapt
+    end
+  end
+end

data/lib/abrizer/all.rb

@@ -4,19 +4,24 @@ module Abrizer
     def initialize(filename, output_dir, base_url)
       @filename = filename
       @output_directory = output_dir
+      FileUtils.mkdir_p @output_directory
       @base_url = base_url
     end
 
     def run
+      Abrizer::FfprobeFile.new(@filename, @output_directory).run
+      Abrizer::AdaptationsFile.new(@filename, @output_directory).adaptations
       Abrizer::Processor.process(@filename, @output_directory)
       Abrizer::ProgressiveMp4.new(@filename, @output_directory).create
-      Abrizer::ProgressiveVp9.new(@filename, @output_directory).create
+      # Abrizer::ProgressiveVp9.new(@filename, @output_directory).create
+      Abrizer::ProgressiveMp3.new(@filename, @output_directory).create
       Abrizer::PackageDashBento.new(@filename, @output_directory).package
       Abrizer::PackageHlsBento.new(@filename, @output_directory).package
       Abrizer::Captions.new(@filename, @output_directory).copy
       Abrizer::Sprites.new(@filename, @output_directory).create
       Abrizer::TemporaryPoster.new(@output_directory).copy
       Abrizer::Canvas.new(@filename, @output_directory, @base_url).create
+      Abrizer::Data.new(@filename, @output_directory, @base_url).create
       Abrizer::Cleaner.new(@filename, @output_directory).clean
     end
 

data/lib/abrizer/canvas.rb

@@ -3,17 +3,22 @@ module Abrizer
   class Canvas
 
     include FilepathHelpers
+    include IdentifierHelpers
+    include InformationHelpers
+      include ReadAdaptations
 
     # TODO: allow control of items/versions listed on canvas
     def initialize(filepath, output_directory, base_url)
-      @filename = filepath
+      @filepath = filepath
       @output_directory = output_directory
       @base_url = base_url
-      finder = AdaptationFinder.new(@filename)
-      @adaptations = finder.adaptations
+      # finder = AdaptationFinder.new(@filename)
+      # @adaptations = finder.adaptations
+      read_adaptations
     end
 
     def create
+      FileUtils.mkdir_p output_directory unless File.exist? output_directory
       File.open(canvas_filepath, 'w') do |fh|
         fh.puts create_json
       end
@@ -143,8 +148,7 @@ module Abrizer
 
     def captions_item(json)
       # TODO: update captions for multiple captions
-      captions_file = File.join output_directory, 'vtt/captions.vtt'
-      if File.exist? captions_file
+      if File.exist? captions_filepath
         json.child! do
           json.id vtt_id
           json.type 'Text'
@@ -178,79 +182,5 @@ module Abrizer
       end
     end
 
-    def media_base_url
-      File.join @base_url, output_directory_basename
-    end
-
-    def canvas_id
-      File.join media_base_url, canvas_partial_filepath
-    end
-
-    def poster_id
-      File.join media_base_url, poster_partial_filepath
-    end
-
-    def mpd_id
-      File.join media_base_url, mpd_partial_filepath
-    end
-
-    def hlsts_id
-      File.join media_base_url, hlsts_partial_filepath
-    end
-
-    def hlsts_aac_id
-      File.join media_base_url, hlsts_aac_partial_filepath
-    end
-
-    def mp4_id
-      File.join media_base_url, mp4_partial_filepath
-    end
-
-    def vp9_id
-      File.join media_base_url, vp9_partial_filepath
-    end
-
-    def vtt_id
-      File.join media_base_url, 'vtt/captions.vtt'
-    end
-
-    def sprites_id
-      File.join media_base_url, sprites_partial_filepath
-    end
-
-    def duration
-      informer = Abrizer::FfprobeInformer.new(mp4_filename)
-      informer.duration.to_f
-    end
-
-    def max_width
-      @adaptations.last.width
-    end
-
-    def min_width
-      @adaptations.first.width
-    end
-
-    def max_height
-      @adaptations.last.height
-    end
-
-    def min_height
-      @adaptations.first.height
-    end
-
-    def mp4_width
-      @adaptations[-2].width
-    end
-
-    def mp4_height
-      @adaptations[-2].height
-    end
-
-    # TODO: DRY up with progressive_mp4.rb
-    def mp4_filename
-      File.join output_directory, "progressive.mp4"
-    end
-
   end
 end

data/lib/abrizer/cli.rb

@@ -1,4 +1,9 @@
 require 'thor'
+
+if ENV['DEBUG_ABRIZER']
+  require 'byebug'
+end
+
 module Abrizer
   class CLI < Thor
 
@@ -9,6 +14,13 @@ module Abrizer
       Abrizer::All.new(filepath, output_dir, base_url).run
     end
 
+    desc 'ffprobe <filepath> <output_directory>', 'Save the output of ffprobe to a file as JSON'
+    def ffprobe(filepath, output_dir)
+      filepath = File.expand_path filepath
+      output_dir = File.expand_path output_dir
+      Abrizer::FfprobeFile.new(filepath, output_dir).run
+    end
+
     desc 'abr <filepath> <output_directory>', 'From file create ABR streams, includes processing MP4 adaptations for packaging'
     def abr(filepath, output_dir=nil)
       filepath = File.expand_path filepath
@@ -39,9 +51,9 @@ module Abrizer
       Abrizer::ProgressiveVp9.new(filepath, output_dir).create
     end
 
-    desc 'adaptations <filepath>', 'Display which adaptations will be created from input file'
-    def adaptations(filepath)
-      adaptations = Abrizer::AdaptationFinder.new(filepath).adaptations
+    desc 'adaptations <filepath> <output_directory>', 'Output which adaptations will be created from input file to a JSON file and output to console'
+    def adaptations(filepath, output_directory=nil)
+      adaptations = Abrizer::AdaptationsFile.new(filepath, output_directory).adaptations
       puts adaptations
     end
 
@@ -69,6 +81,15 @@ module Abrizer
       end
     end
 
+    desc 'mp3 <filepath> <output_directory>', 'Create a progressive MP3 file from the audio of the original media'
+    def mp3(filepath, output_directory)
+      # TODO: repeating expanding filepath and output_directory is probably the
+      # most annoying thing in this library. DRY this up somehow.
+      filepath = File.expand_path filepath
+      output_dir = File.expand_path output_directory
+      Abrizer::ProgressiveMp3.new(filepath, output_dir).create
+    end
+
     desc 'sprites <filepath> <output_directory>', 'Create image sprites and metadata WebVTT file'
     def sprites(filepath, output_dir=nil)
       filepath = File.expand_path filepath
@@ -89,13 +110,19 @@ module Abrizer
       Abrizer::Captions.new(filepath, output_dir).copy
     end
 
-    desc 'canvas <filepath> <output_directory> <base_url>', 'Creates a IIIF Canvas JSON-LD document as an API into the resources'
+    desc 'canvas <filepath_or_identifier> <output_directory> <base_url>', 'Creates a IIIF Canvas JSON-LD document as an API into the resources'
     def canvas(filepath, output_directory, base_url)
       filepath = File.expand_path filepath
       output_directory = File.expand_path output_directory
       Abrizer::Canvas.new(filepath, output_directory, base_url).create
     end
 
+    desc 'data <filepath_or_identifier> <output_directory> <base_url>', 'Creates a JSON file with data about the video resources.'
+    def data(filepath, output_directory, base_url)
+      output_directory = File.expand_path output_directory
+      Abrizer::Data.new(filepath, output_directory, base_url).create
+    end
+
     desc 'clean <filepath> <output_directory>', 'Clean up intermediary files'
     def clean(filepath, output_dir=nil)
       Abrizer::Cleaner.new(filepath, output_dir).clean

data/lib/abrizer/data.rb

@@ -0,0 +1,163 @@
+module Abrizer
+  # Creates a JSON file with information about the videos
+  class Data
+
+    include FilepathHelpers
+    include IdentifierHelpers
+    include InformationHelpers
+    include ReadAdaptations
+
+    def initialize(filepath, output_directory, base_url)
+      @filepath = filepath
+      # This is kind of hacky, but if the @output_directory is set then we can
+      # use that to look up the vp9_filepath
+      @output_directory = output_directory
+      @base_url = base_url
+
+      # This sets @filename in some cases and more importantly sets @adaptations
+      # based on the filepath or identifier that's passed in.
+      read_adaptations
+    end
+
+    def find_adaptations
+      finder = AdaptationFinder.new(@filename)
+      @adaptations = finder.adaptations
+    end
+
+    def create
+      FileUtils.mkdir_p output_directory unless File.exist? output_directory
+      File.open(data_filepath, 'w') do |fh|
+        fh.puts create_json
+      end
+    end
+
+    def create_json
+      Jbuilder.encode do |json|
+        json.id data_id
+        json.max_width max_width
+        json.max_height max_height
+        json.duration duration
+        json.poster do
+          poster(json)
+        end
+        json.video do
+          mpd_source(json)
+          hlsts_source(json)
+          vp9_source(json)
+          mp4_source(json)
+        end
+        json.audio do
+          mp3_source(json)
+          aac_source(json)
+        end
+        json.tracks do
+          captions(json)
+        end
+        json.sprites do
+          sprites(json)
+        end
+      end
+    end
+
+    def poster(json)
+      if File.exist? poster_filepath
+        json.child! do
+          json.id poster_id
+          json.format "image/jpg"
+          json.width max_width
+          json.height max_height
+        end
+      end
+    end
+
+    def mpd_source(json)
+      if File.exist? mpd_filepath
+        json.child! do
+          json.id mpd_id
+          json.format "application/dash+xml"
+          json.width max_width
+          json.height max_height
+        end
+      end
+    end
+
+    def hlsts_source(json)
+      if File.exist? hlsts_filepath
+        json.child! do
+          json.id hlsts_id
+          json.type "Video"
+          # TODO: or "vnd.apple.mpegURL"
+          json.format "application/x-mpegURL"
+          json.width max_width
+          json.height max_height
+        end
+      end
+    end
+
+    def vp9_source(json)
+      if File.exist? vp9_filepath
+        json.child! do
+          json.id vp9_id
+          json.type "Video"
+          #TODO: add webm codecs
+          json.format "video/webm"
+          json.width max_width
+          json.height max_height
+        end
+      end
+    end
+
+    def mp4_source(json)
+      if File.exist? mp4_filepath
+        json.child! do
+          json.id mp4_id
+          json.type "Video"
+          #TODO: add mp4 codecs
+          json.format "video/mp4"
+          json.width mp4_width
+          json.height mp4_height
+        end
+      end
+    end
+
+    def mp3_source(json)
+      if File.exist? mp3_filepath
+        json.child! do
+          json.id mp3_id
+          json.format 'audio/mpeg'
+        end
+      end
+    end
+
+    def aac_source(json)
+      if File.exist? hlsts_aac_filepath
+        json.child! do
+          json.id hlsts_aac_id
+          json.format 'audio/aac'
+        end
+      end
+    end
+
+    def captions(json)
+      if File.exist? captions_filepath
+        json.child! do
+          json.id vtt_id
+          json.format 'text/vtt'
+          json.kind 'captions'
+          json.label 'English captions'
+          json.language 'en'
+        end
+      end
+    end
+
+    def sprites(json)
+      if File.exist? sprites_filepath
+        json.id sprites_id
+        json.format 'text/vtt'
+        json.kind 'metadata'
+        json.label 'image sprite metadata'
+      end
+    end
+
+  end
+end

data/lib/abrizer/debug_settings.rb

@@ -0,0 +1,11 @@
+module Abrizer
+  module DebugSettings
+
+    # This is useful for testing an encoding setting on just part of a video.
+    # This gets applied before the input video is set.
+    def debug_settings
+      ENV['ABRIZER_DEBUG_SETTINGS'] || ''
+      # "-ss 10 -t 10"
+    end
+  end
+end

data/lib/abrizer/ffmpeg_processor.rb

@@ -1,7 +1,9 @@
 module Abrizer
+  # Creates the fMP4 files that are then packaged
   class FfmpegProcessor
 
     include FilepathHelpers
+    include DebugSettings
 
     def initialize(filename, output_dir=nil)
       @filename = filename
@@ -18,7 +20,7 @@ module Abrizer
     end
 
     def make_directory
-      FileUtils.mkdir output_directory unless File.exist? output_directory
+      FileUtils.mkdir_p output_directory unless File.exist? output_directory
     end
 
     def first_pass_adaptation
@@ -50,7 +52,7 @@ module Abrizer
     end
 
     def process_audio
-      `ffmpeg -y -i #{@filename} -c:a libfdk_aac -b:a 128k -vn #{audio_filepath}`
+      `ffmpeg -y #{debug_settings} -i #{@filename} -c:a libfdk_aac -b:a 128k -vn #{audio_filepath}`
       `mp4fragment #{audio_filepath} #{audio_filepath_fragmented}`
       FileUtils.rm audio_filepath
     end

data/lib/abrizer/ffprobe_file.rb

@@ -0,0 +1,17 @@
+module Abrizer
+  class FfprobeFile
+
+    include FilepathHelpers
+
+    def initialize(filename, output_directory)
+      @informer = FfprobeInformer.new(filename)
+      @output_directory = output_directory
+    end
+
+    def run
+      File.open(ffprobe_filepath, 'w') do |fh|
+        fh.puts @informer.json_result
+      end
+    end
+  end
+end

data/lib/abrizer/filepath_helpers.rb

@@ -34,10 +34,22 @@ module Abrizer
       File.basename @filename, extname
     end
 
+    def ffprobe_filepath
+      File.join output_directory, 'ffprobe.json'
+    end
+
+    def adaptations_filepath
+      File.join output_directory, 'adaptations.json'
+    end
+
     def poster_partial_filepath
       'poster.jpg'
     end
 
+    def poster_filepath
+      File.join output_directory, poster_partial_filepath
+    end
+
     def mpd_partial_filepath
       'fmp4/stream.mpd'
     end
@@ -78,6 +90,18 @@ module Abrizer
       File.join output_directory, vp9_partial_filepath
     end
 
+    def mp3_partial_filepath
+      'progressive.mp3'
+    end
+
+    def mp3_filepath
+      File.join output_directory, mp3_partial_filepath
+    end
+
+    def captions_filepath
+      File.join output_directory, 'vtt/captions.vtt'
+    end
+
     def canvas_partial_filepath
       'canvas.json'
     end
@@ -86,6 +110,14 @@ module Abrizer
       File.join output_directory, canvas_partial_filepath
     end
 
+    def data_partial_filepath
+      'data.json'
+    end
+
+    def data_filepath
+      File.join output_directory, data_partial_filepath
+    end
+
     def sprites_partial_filepath
       'sprites/sprites.vtt'
     end

data/lib/abrizer/identifier_helpers.rb

@@ -0,0 +1,53 @@
+module Abrizer
+  module IdentifierHelpers
+
+    def media_base_url
+      File.join @base_url, output_directory_basename
+    end
+
+    def canvas_id
+      File.join media_base_url, canvas_partial_filepath
+    end
+
+    def data_id
+      File.join media_base_url, data_partial_filepath
+    end
+
+    def poster_id
+      File.join media_base_url, poster_partial_filepath
+    end
+
+    def mpd_id
+      File.join media_base_url, mpd_partial_filepath
+    end
+
+    def hlsts_id
+      File.join media_base_url, hlsts_partial_filepath
+    end
+
+    def hlsts_aac_id
+      File.join media_base_url, hlsts_aac_partial_filepath
+    end
+
+    def mp4_id
+      File.join media_base_url, mp4_partial_filepath
+    end
+
+    def vp9_id
+      File.join media_base_url, vp9_partial_filepath
+    end
+
+    def mp3_id
+      File.join media_base_url, mp3_partial_filepath
+    end
+
+    def vtt_id
+      File.join media_base_url, 'vtt/captions.vtt'
+    end
+
+    def sprites_id
+      File.join media_base_url, sprites_partial_filepath
+    end
+
+  end
+end

data/lib/abrizer/information_helpers.rb

@@ -0,0 +1,34 @@
+module Abrizer
+  module InformationHelpers
+
+    def duration
+      informer = Abrizer::FfprobeInformer.new(mp4_filepath)
+      informer.duration.to_f
+    end
+
+    def max_width
+      @adaptations.last.width
+    end
+
+    def min_width
+      @adaptations.first.width
+    end
+
+    def max_height
+      @adaptations.last.height
+    end
+
+    def min_height
+      @adaptations.first.height
+    end
+
+    def mp4_width
+      @adaptations[-2].width
+    end
+
+    def mp4_height
+      @adaptations[-2].height
+    end
+
+  end
+end

data/lib/abrizer/package_dash_shaka.rb

@@ -37,7 +37,7 @@ module Abrizer
     end
 
     def make_directory
-      FileUtils.mkdir dash_directory unless File.exist? dash_directory
+      FileUtils.mkdir_p dash_directory unless File.exist? dash_directory
     end
 
     def dash_directory

data/lib/abrizer/package_hls_shaka.rb

@@ -39,7 +39,7 @@ module Abrizer
     end
 
     def make_directory
-      FileUtils.mkdir hls_directory unless File.exist? hls_directory
+      FileUtils.mkdir_p hls_directory unless File.exist? hls_directory
     end
 
     def hls_directory

data/lib/abrizer/progressive_mp3.rb

@@ -0,0 +1,21 @@
+module Abrizer
+  class ProgressiveMp3
+
+    include FilepathHelpers
+    include DebugSettings
+
+    def initialize(filepath, output_directory)
+      @filepath = filepath
+      @output_directory = output_directory
+    end
+
+    def create
+      `#{ffmpeg_cmd}`
+    end
+
+    def ffmpeg_cmd
+      "ffmpeg -y #{debug_settings} -i #{@filepath} -vn -c:a libmp3lame -b:a 128k #{mp3_filepath}"
+    end
+
+  end
+end

data/lib/abrizer/progressive_mp4.rb

@@ -26,11 +26,9 @@ module Abrizer
     end
 
     def ffmpeg_cmd
-      "ffmpeg -y -i #{input_video_filepath} -i #{audio_filepath_fragmented} -c:v copy -c:a copy #{static_filepath}"
-    end
-
-    def static_filepath
-      File.join output_directory, "progressive.mp4"
+      "ffmpeg -y -i #{input_video_filepath} -i #{audio_filepath_fragmented} -c:v copy -c:a copy #{mp4_filepath} -movflags faststart"
+      # Previously used command:
+      # "ffmpeg -y -i #{@filename} -profile:v high -pix_fmt yuv420p -movflags faststart -b:v #{@adaptation.bitrate}k #{mp4_filepath}"
     end
 
   end

data/lib/abrizer/progressive_vp9.rb

@@ -2,6 +2,7 @@ module Abrizer
   class ProgressiveVp9
 
     include FilepathHelpers
+    include DebugSettings
 
     def initialize(filename, output_dir=nil)
       @filename = filename
@@ -17,7 +18,7 @@ module Abrizer
     end
 
     def make_directory
-      FileUtils.mkdir @output_directory unless File.exist? @output_directory
+      FileUtils.mkdir_p @output_directory unless File.exist? @output_directory
     end
 
     def find_adaptation
@@ -35,23 +36,22 @@ module Abrizer
     end
 
     def ffmpeg_cmd_pass1
-      "ffmpeg -y -i #{@filename} -c:v libvpx-vp9 -b:v #{bitrate}k -c:a libvorbis \
-       -vf scale='#{@adaptation.width}:trunc(#{@adaptation.width}/dar/2)*2',setsar=1 \
-       -speed 4 -tile-columns 6 -frame-parallel 1 \
+      "ffmpeg -y #{debug_settings} -i #{@filename} -c:v libvpx-vp9 -crf 10 -b:v #{bitrate*1.1}k -c:a libvorbis \
+       -vf yadif,scale='#{@adaptation.width}:trunc(#{@adaptation.width}/dar/2)*2',setsar=1 \
+       -speed 4 -tile-columns 6 -frame-parallel 1 -pix_fmt yuv420p \
        -pass 1 -passlogfile ffmpeg2pass-webm -f webm /dev/null"
     end
 
     def ffmpeg_cmd_pass2
-      "ffmpeg -y -i #{@filename} -c:v libvpx-vp9 -b:v #{bitrate}k -c:a libvorbis \
-       -vf scale='#{@adaptation.width}:trunc(#{@adaptation.width}/dar/2)*2',setsar=1 \
+      "ffmpeg -y #{debug_settings} -i #{@filename} -c:v libvpx-vp9 -crf 10 -b:v #{bitrate*1.1}k -c:a libvorbis \
+       -vf yadif,scale='#{@adaptation.width}:trunc(#{@adaptation.width}/dar/2)*2',setsar=1 \
        -speed 1 -tile-columns 6 -frame-parallel 1 -auto-alt-ref 1 -lag-in-frames 25 \
-       -pass 2 -passlogfile ffmpeg2pass-webm -y #{static_filepath}"
+       -pass 2 -passlogfile ffmpeg2pass-webm -pix_fmt yuv420p #{static_filepath}"
     end
 
     def static_filepath
       File.join output_directory, "progressive-vp9.webm"
     end
 
-
   end
 end

data/lib/abrizer/read_adaptations.rb

@@ -0,0 +1,34 @@
+module Abrizer
+  module ReadAdaptations
+
+
+
+    def read_adaptations
+      # Either we have a filepath to an original or we make the assumption we
+      # really have an identifier instead of a filepath and we use that
+      # identifier to look for an adaptations.json file. Failing finding the
+      # adaptations.json file we just use the adaptations based on the
+      # vp9_filepath.
+      if File.exist?(File.expand_path(@filepath)) && !File.directory?(@filepath)
+        @filename = @filepath
+        find_adaptations
+      elsif File.exist? adaptations_filepath
+        # assume we have an identifier and look up for the adaptations file
+        adaptations_json = File.read adaptations_filepath
+        adaptations = MultiJson.load adaptations_json
+        # TODO: There ought to be a class that recreates an Adaptation instance
+        # based on the adaptations.json file. For now we fake it with a
+        # OpenStruct.
+        @adaptations = adaptations.map do |a|
+          OpenStruct.new(a)
+        end
+      elsif File.exist? vp9_filepath
+        # assume we just got an identifier and look for the webm
+        @filename = vp9_filepath
+        find_adaptations
+      else
+        raise "Neither original file or VP9 version exist."
+      end
+    end
+  end
+end

data/lib/abrizer/sprites.rb

@@ -18,6 +18,37 @@ module Abrizer
     def create
       processor = VideoSprites::Processor.new(@filename, @output_directory, @options)
       processor.process
+      FileUtils.chmod_R "go+r", @output_directory
+      optimize_images
+    end
+
+    def optimize_images
+      optimize_sprites
+      optimize_individual_images
+    end
+
+    def optimize_sprites
+      `jpegoptim #{sprite_paths.join(' ')}`
+    end
+
+    def sprite_paths
+      Dir.glob(sprites_glob)
+    end
+
+    def sprites_glob
+      File.join @output_directory, "*.jpg"
+    end
+
+    def optimize_individual_images
+      `jpegoptim #{individual_image_paths.join(' ')}`
+    end
+
+    def individual_image_paths
+      Dir.glob(individual_image_glob)
+    end
+
+    def individual_image_glob
+      File.join @output_directory, "images/*.jpg"
     end
 
   end

data/lib/abrizer/temporary_poster.rb

@@ -14,6 +14,8 @@ module Abrizer
 
     def copy
       FileUtils.cp first_image_filepath, poster_image_filepath
+      `jpegoptim #{poster_image_filepath}`
+      FileUtils.chmod "ugo+r", poster_image_filepath
     end
 
   end

data/lib/abrizer/version.rb

@@ -1,3 +1,3 @@
 module Abrizer
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/abrizer.rb

@@ -4,23 +4,32 @@ MultiJson.use :yajl
 MultiJson.dump_options = {pretty: true}
 require 'jbuilder'
 require 'video_sprites'
+require 'ostruct'
 require "abrizer/version"
 require 'abrizer/filepath_helpers'
+require 'abrizer/read_adaptations'
+require 'abrizer/debug_settings'
+require 'abrizer/identifier_helpers'
+require 'abrizer/information_helpers'
 require 'abrizer/package_dash_shaka'
 require 'abrizer/package_hls_shaka'
 require 'abrizer/package_dash_bento'
 require 'abrizer/package_hls_bento'
 require 'abrizer/adaptation'
 require 'abrizer/adaptation_finder'
+require 'abrizer/adaptations_file'
 require 'abrizer/ffmpeg_processor'
 require 'abrizer/ffprobe_informer'
+require 'abrizer/ffprobe_file'
 require 'abrizer/processor'
 require 'abrizer/cleaner'
 require 'abrizer/progressive_mp4'
 require 'abrizer/progressive_vp9'
+require 'abrizer/progressive_mp3'
 require 'abrizer/sprites'
 require 'abrizer/captions'
 require 'abrizer/canvas'
+require 'abrizer/data'
 require 'abrizer/temporary_poster'
 require 'abrizer/all'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abrizer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jason Ronallo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-19 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,7 +152,6 @@ files:
 - Rakefile
 - Vagrantfile
 - abrizer.gemspec
-- ansible/development-playbook.retry
 - ansible/development-playbook.yml
 - ansible/development.ini
 - ansible/roles/apache/tasks/main.yml
@@ -187,6 +186,7 @@ files:
 - ansible/roles/franklinkim.environment/tasks/config.yml
 - ansible/roles/franklinkim.environment/tasks/main.yml
 - ansible/roles/franklinkim.environment/tests/main.yml
+- ansible/roles/rvm-setup/tasks/main.yml
 - ansible/roles/rvm_io.rvm1-ruby/.gitignore
 - ansible/roles/rvm_io.rvm1-ruby/.travis.yml
 - ansible/roles/rvm_io.rvm1-ruby/LICENSE
@@ -205,21 +205,29 @@ files:
 - lib/abrizer.rb
 - lib/abrizer/adaptation.rb
 - lib/abrizer/adaptation_finder.rb
+- lib/abrizer/adaptations_file.rb
 - lib/abrizer/all.rb
 - lib/abrizer/canvas.rb
 - lib/abrizer/captions.rb
 - lib/abrizer/cleaner.rb
 - lib/abrizer/cli.rb
+- lib/abrizer/data.rb
+- lib/abrizer/debug_settings.rb
 - lib/abrizer/ffmpeg_processor.rb
+- lib/abrizer/ffprobe_file.rb
 - lib/abrizer/ffprobe_informer.rb
 - lib/abrizer/filepath_helpers.rb
+- lib/abrizer/identifier_helpers.rb
+- lib/abrizer/information_helpers.rb
 - lib/abrizer/package_dash_bento.rb
 - lib/abrizer/package_dash_shaka.rb
 - lib/abrizer/package_hls_bento.rb
 - lib/abrizer/package_hls_shaka.rb
 - lib/abrizer/processor.rb
+- lib/abrizer/progressive_mp3.rb
 - lib/abrizer/progressive_mp4.rb
 - lib/abrizer/progressive_vp9.rb
+- lib/abrizer/read_adaptations.rb
 - lib/abrizer/sprites.rb
 - lib/abrizer/temporary_poster.rb
 - lib/abrizer/version.rb
@@ -243,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Creates MPEG-DASH and HLS streams from a video file.

data/ansible/development-playbook.retry

@@ -1 +0,0 @@
-localhost