hydra_hls 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5685ed42b13748b8b4f24ae299ef507c1c2301e4
-  data.tar.gz: 2712d618e496a8257d591b9d526d3f869e4fb384
+  metadata.gz: c32e4c406781d813aaee77d4af330e021b4b526f
+  data.tar.gz: c39f8ec36f2967a31d468944575a956051c3156c
 SHA512:
-  metadata.gz: 86375913f9e4bfb1359ebee52d177bc46915626ed87041694ad146dce010b69ab2fc4b48f50c857f2f41b5ae8d034a909fb181655cf307c5bcb5acfca66b311d
-  data.tar.gz: 8554200a884034ecbf7e28abbd68f6ddae3ee78dc3f0f1c5ea707e7739ca580460293bd3e4804eac24c8422f6e813b94fcbe0ead346fde1c63d04df2b483911c
+  metadata.gz: 24ec6986e2a6f3b20e58c8391d4998606b860f4ab1712e0dc2c500589e22ce4dd5276ad94ea0cbfc5b86eb114df0a0ad0c7b35e418c9b4b21d71f46dc084d6b4
+  data.tar.gz: c41ccd0fa7f7259da38e92ce41e8773a2f641cdb0f1abee7fca41ec37702f1f2e8535fbd3eb321258123936ff76fff51424a6ab142c9557c4b603736b2115c3d

data/app/models/concerns/hydra_hls/file_set_behavior.rb

@@ -1,3 +1,6 @@
+require "hydra_hls/derivatives/video_derivatives"
+require "hydra_hls/derivatives/audio_derivatives"
+
 module HydraHls
   module FileSetBehavior
     extend ActiveSupport::Concern
@@ -35,6 +38,7 @@ module HydraHls
           playlist << "RESOLUTION=#{options["resolution"]}\n"
           playlist << File.join(root_url,variant_url(format)) + "\n"
         }
+        playlist
     end
 
     def hls_segment_playlist root_url, format
@@ -78,7 +82,7 @@ module HydraHls
         { label: 'ogg', format: 'ogg', url: derivative_url('ogg') },
         { label: 'hls_hd', format: 'hls_hd',path: hls_dir}, 
         { label: 'hls', format: 'hls', path: hls_dir}]
-      HydraHls::Derivatives::AudioDerivatives.create(filename,outputs)
+      HydraHls::Derivatives::AudioDerivatives.create(filename,{:outputs => outputs})
     end
 
     def create_video_derivates filename, hls_dir
@@ -88,17 +92,21 @@ module HydraHls
                  { label: 'hls_high', format: "hls_high", path: hls_dir}, 
                  { label: 'hls_med', format: "hls_med", path: hls_dir}, 
                  { label: 'hls_low', format: "hls_low", path: hls_dir}]
-      HydraHls::Derivatives::VideoDerivatives.create(filename,outputs)
+      HydraHls::Derivatives::VideoDerivatives.create(filename,{:outputs => outputs})
     end
 
     def token line
-      @token ||=  Digest::SHA256.hexdigest("/" + File.join(segment_url_base,timestamp.to_s,line).strip[0...-9] + hls_config['token_secret'])
+      @token ||=  Digest::SHA256.hexdigest("/" + File.join(segment_url_base,timestamp.to_s,line).strip[0...-9] + token_secret)
     end
 
     def timestamp
       @timestamp ||= Time.now.to_i + 7200
     end
 
+    def token_secret
+      @token_secret ||= ENV['hls_token_secret']
+    end
+
     def hls_config
       @hls_config ||= YAML.load_file(Rails.root.join('config','hls.yml'))
     end

data/config/hls.yml

@@ -1,5 +1,4 @@
 ---
-token_secret: <%= ENV["hls_token_secret"] %>
 video:
      hls_high:
           bitrate: 6500000 

data/lib/generators/hydra_hls/install/templates/config/hls.yml.example

@@ -4,13 +4,11 @@ video:
           bitrate: 6500000 
           maxrate: 6800000 
           vf: "scale=1280:-2"
-          codec_code: "???"
           resolution: "1280x720"
      hls_med:
           bitrate: 3500000
           maxrate: 3600000 
           vf: "scale=960:-2"
-          codec_code: "???"
           resolution: "960x540"
      hls_low:
           r: 15 
@@ -21,7 +19,7 @@ video:
           g: 45 
           segment_list_type: m3u8 
           vf: "scale=480:-2"
-          codec_code: "???"
+          codec_code: "mp4a.40.2,avc1.42001e"
           resolution: "480x360"
      default:
           r: 29.97 
@@ -30,6 +28,7 @@ video:
           acodec: aac
           profile_v: main 
           level: 3.1 
+          codec_code: "mp4a.40.2,avc1.4d001f"
           segment_time: 9
           g: 90
           vf: "scale=960:-2" 
@@ -46,6 +45,5 @@ audio:
           segment_time: 9
           segment_format: mpeg_ts 
           segment_list_type: m3u8 
-          codec_code: ???
+          codec_code: "mp4a.40.2"
           resolution: 300x50
-token_secret: <%= ENV["hls_token_secret"] %>

data/lib/generators/hydra_hls/install/templates/controllers/file_sets_controller.rb

@@ -1,4 +1,4 @@
-class FileSetsController < CurationConcerns::FilesSetsController
+class FileSetsController < CurationConcerns::FileSetsController
   include HydraHls::FileSetsControllerBehavior  
 end
 

data/lib/hydra_hls/derivatives/audio_derivatives.rb

@@ -1,7 +1,8 @@
+require "hydra_hls/derivatives/processors/audio"
 module HydraHls::Derivatives
   class AudioDerivatives < Hydra::Derivatives::AudioDerivatives 
     def self.processor_class
-      Processors::AudioProcessor
+      HydraHls::Derivatives::Processors::Audio
     end
   end
 end

data/lib/hydra_hls/derivatives/processors/audio.rb

@@ -1,30 +1,36 @@
-module HydraHls::Derivatives::Processors
-  class Audio < Hydra::Derivatives::Processors::Audio
-    include Media
+require "hydra_hls/derivatives/processors"
+require "hydra_hls/derivatives/processors/media"
+module HydraHls
+  module Derivatives
+    module Processors
+      class Audio < Hydra::Derivatives::Processors::Audio
+        include Media
 
-    def options_for(format)
-      return super unless format.include?("hls")
-      input_options="-y"
-      outopts = get_hls_options(format).symbolize_keys
-      output_options = "-acodec #{outopts[:acodec]} -b:a #{outopts[:bitrate]} -maxrate: #{outopts[:maxrate]} -f segment -segment_time #{outopts[:segment_time]} -flags -global_header -segment_format mpeg_ts -segment_list_type m3u8"
+        def options_for(format)
+          return super unless format.include?("hls")
+          input_options="-y"
+          outopts = get_hls_options(format).symbolize_keys
+          output_options = "-acodec #{outopts[:acodec]} -b:a #{outopts[:bitrate]} -maxrate: #{outopts[:maxrate]} -f segment -segment_time #{outopts[:segment_time]} -flags -global_header -segment_format mpeg_ts -segment_list_type m3u8"
 
-      { Hydra::Derivatives::Processors::Ffmpeg::OUTPUT_OPTIONS => output_options, 
-        Hydra::Derivatives::Processors::Ffmpeg::INPUT_OPTIONS => input_options,
-        :format => format}
-    end
+          { Hydra::Derivatives::Processors::Ffmpeg::OUTPUT_OPTIONS => output_options, 
+            Hydra::Derivatives::Processors::Ffmpeg::INPUT_OPTIONS => input_options,
+            :format => format}
+        end
 
-    def codecs(format)
-      return super unless format.include?("hls")
-      options = get_hls_options(format)
-      "-acodec #{options[:acodec]}"
-    end
+        def codecs(format)
+          return super unless format.include?("hls")
+          options = get_hls_options(format)
+          "-acodec #{options[:acodec]}"
+        end
 
-    private
+        private
 
-    def get_hls_options(format)
-      config = YAML.load_file(Rails.root.join('config','hls.yml'))["audio"]
-      config["default"].merge(config[format])
-    end
+        def get_hls_options(format)
+          config = YAML.load_file(Rails.root.join('config','hls.yml'))["audio"]
+          config["default"].merge(config[format])
+        end
 
+      end
+    end
   end
 end

data/lib/hydra_hls/derivatives/processors/media.rb

@@ -1,24 +1,28 @@
-module HydraHls::Derivatives::Processors
-  module Media
-    
-    def encode_file(file_suffix, options)
-      return super(file_suffix,options) unless file_suffix.include?("hls")
-      Dir::mktmpdir(['sufia', "_#{file_suffix}"], Hydra::Derivatives.temp_file_base){ |temp_dir|
-        self.class.encode(source_path, options, temp_dir.to_s, true)
-        HydraHls::HlsOutputFileService.call(directives, temp_dir)
-      }
-    end
+module HydraHls
+  module Derivatives
+    module Processors
+      module Media
+
+        def encode_hls(input_path, options, output_dir)
+          segment_base = File.join(output_dir, options[:format])
+          segment_list = segment_base + ".m3u8"
+          segment_files = segment_base + "_%05d.ts"
+          inopts = options[Hydra::Derivatives::Processors::Ffmpeg::INPUT_OPTIONS] ||= "-y"
+          outopts = options[Hydra::Derivatives::Processors::Ffmpeg::OUTPUT_OPTIONS] 
+          output_files = "-segment_list #{segment_list} #{segment_files}"
+          self.class.execute "#{Hydra::Derivatives.ffmpeg_path} #{inopts} -i \"#{input_path}\" #{outopts} #{output_files}"
+        end
 
-    def self.encode(input_path, options, output_dir, hls=false)
-      return super(input_path,options,output_dir) unless hls
-      segment_base = File.join(output_dir, options[:format])
-      segment_list = segment_base + ".m3u8"
-      segment_files = segment_base + "_%05d.ts"
-      inopts = options[INPUT_OPTIONS] ||= "-y"
-      outopts = options[OUTPUT_OPTIONS] 
-      output_files = "-segment_list #{segment_list} #{segment_files}"
-      execute "#{Hydra::Derivatives.ffmpeg_path} #{inopts} -i \"#{input_path}\" #{outopts} #{output_files}"
-    end
 
-  end
+        def encode_file(file_suffix, options)
+          return super(file_suffix,options) unless file_suffix.include?("hls")
+          Dir::mktmpdir(['sufia', "_#{file_suffix}"], Hydra::Derivatives.temp_file_base){ |temp_dir|
+            encode_hls(source_path, options, temp_dir.to_s)
+            HydraHls::HlsOutputFileService.call(directives, temp_dir)
+          }
+        end
+
+      end
+    end
+  end 
 end

data/lib/hydra_hls/derivatives/processors/video.rb

@@ -1,30 +1,37 @@
-module HydraHls::Derivatives::Processors
-  class Video < Hydra::Derivatives::Processors::Video::Processor
-    include Media
+require "hydra_hls/derivatives/processors"
+require "hydra_hls/derivatives/processors/media"
+module HydraHls
+  module Derivatives
+    module Processors
+      class Video < Hydra::Derivatives::Processors::Video::Processor
+        include Media
 
-    def options_for(format)
-      return super unless format.include?("hls")
-      input_option_string="-y"
-      outopts = get_hls_options(format).symbolize_keys
-      output_option_string = "-pix_fmt #{outopts[:pix_fmt]} -vcodec #{outopts[:vcodec]} -acodec #{outopts[:acodec]} -r #{outopts[:r]} -profile:v #{outopts[:profile_v]} -level #{outopts[:level]} -b:v #{outopts[:bitrate]} -maxrate: #{outopts[:maxrate]} -f segment -segment_time #{outopts[:segment_time]} -g #{outopts[:g]} -map 0 -flags -global_header -segment_format mpeg_ts -segment_list_type m3u8 -vf #{outopts[:vf]} "
-      
-      { Hydra::Derivatives::Processors::Ffmpeg::OUTPUT_OPTIONS => output_option_string, 
-        Hydra::Derivatives::Processors::Ffmpeg::INPUT_OPTIONS => input_option_string,
-        :format => format}
-    end
+        def options_for(format)
+          return super unless format.include?("hls")
+          input_option_string="-y"
+          outopts = get_hls_options(format).symbolize_keys
+          output_option_string = "-pix_fmt #{outopts[:pix_fmt]} -vcodec #{outopts[:vcodec]} -acodec #{outopts[:acodec]} -r #{outopts[:r]} -profile:v #{outopts[:profile_v]} -level #{outopts[:level]} -b:v #{outopts[:bitrate]} -maxrate: #{outopts[:maxrate]} -f segment -segment_time #{outopts[:segment_time]} -g #{outopts[:g]} -map 0 -flags -global_header -segment_format mpeg_ts -segment_list_type m3u8 -vf #{outopts[:vf]} "
+          
+          { Hydra::Derivatives::Processors::Ffmpeg::OUTPUT_OPTIONS => output_option_string, 
+            Hydra::Derivatives::Processors::Ffmpeg::INPUT_OPTIONS => input_option_string,
+            :format => format}
+        end
 
-    def codecs(format)
-      return super unless format.include?("hls")
-      options = get_hls_options(format)
-      "-vcodec #{options[:vcodec]} -acodec #{options[:acodec]}"
-    end
+        def codecs(format)
+          return super unless format.include?("hls")
+          options = get_hls_options(format)
+          "-vcodec #{options[:vcodec]} -acodec #{options[:acodec]}"
+        end
+
+        private
 
-    private
+        def get_hls_options(format)
+          config = YAML.load_file(Rails.root.join('config','hls.yml'))["video"]
+          config["default"].merge(config[format])
+        end
 
-    def get_hls_options(format)
-      config = YAML.load_file(Rails.root.join('config','hls.yml'))["video"]
-      config["default"].merge(config[format])
+       
+      end
     end
-    
   end
 end

data/lib/hydra_hls/derivatives/processors.rb

@@ -1,5 +1,7 @@
-module HydraHls::Derivatives
-  module Processors
-    extend ActiveSupport::Autoload
+module HydraHls
+  module Derivatives
+    module Processors
+      extend ActiveSupport::Autoload
+    end
   end
 end

data/lib/hydra_hls/derivatives/video_derivatives.rb

@@ -1,7 +1,10 @@
-module HydraHls::Derivatives
-  class UcscVideoDerivatives < Hydra::Derivatives::VideoDerivatives 
-    def self.processor_class
-      Processors::VideoProcessor
+require "hydra_hls/derivatives/processors/video"
+module HydraHls
+  module Derivatives
+    class VideoDerivatives < Hydra::Derivatives::VideoDerivatives 
+      def self.processor_class
+        HydraHls::Derivatives::Processors::Video
+      end
     end
   end
 end

data/lib/hydra_hls/derivatives.rb

@@ -1,3 +1,5 @@
+require "hydra_hls/derivatives/audio_derivatives"
+require "hydra_hls/derivatives/video_derivatives"
 module HydraHls
   module Derivatives
   end

data/lib/hydra_hls/engine.rb

@@ -1,5 +1,6 @@
 module HydraHls
   class Engine < ::Rails::Engine
+    config.autoload_paths << File.expand_path("derivatives", __FILE__)
     engine_name 'hydra_hls'
   end
 end

data/lib/hydra_hls/version.rb

@@ -1,3 +1,3 @@
 module HydraHls
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra_hls
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ned Henry, UCSC Library Digital Initiatives
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails