tivohmo 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97a335b0ba3a6e8c3cfc489ec4d8e7055defb358
-  data.tar.gz: 98772403f11ba0604ef06b05e4152b8e6bdf3e00
+  metadata.gz: ac6001b62350b9a28f965390492e60ff2407f728
+  data.tar.gz: 284efd92ec46f6cae8771aac3b9f791c6a42b041
 SHA512:
-  metadata.gz: 4b807b78720881a2001d0f302db1352e497faa1354fd32a4458301fa58e68f480c4fe5b64ce321bcb7c01e879ab22fed04a4ac327f99d52a008b74dbfcaa0fef
-  data.tar.gz: ef366ff7a5bd01f12762a8785202f77709ac8099e9e73bad23b770202b346ca0189e6563d6c58b8a93c17bce0d70e197902abab7bbce46677300785cb562b4d3
+  metadata.gz: 8599fa6f50e310f56eb9160659aca81e0f37f08e08df436b6bee14e351cd77932fdfc1cd8f59d622ff2ac6677b61bf96bf80a35d5cd12d28e3cdcf5b67f34631
+  data.tar.gz: 889f69f0adab913e2860c2d36d29a6b546e9cd0d161b5aba2b8dff7a1f268560013e4dcfab43893d9a455ade5fe706075b9f6962ec372c12099e1869718f4cce

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.1.2 (10/12/2014)
+------------------
+
+fix log msg <f7202de> [Matt Conway]
+tweak transcoding <08f4af5> [Matt Conway]
+
 0.1.1 (10/12/2014)
 ------------------
 

data/lib/tivohmo/adapters/streamio/transcoder.rb

@@ -50,7 +50,8 @@ module TivoHMO
           opts = select_audio_sample_rate(opts)
           opts = select_container(opts)
 
-          opts[:custom] = opts[:custom].join(" ") if opts[:custom]
+          custom = opts.delete(:custom)
+          opts[:custom] = custom.join(" ") if custom
           opts.delete(:format)
 
           opts
@@ -110,9 +111,19 @@ module TivoHMO
         end
 
         def select_video_bitrate(opts)
-          if video_info[:video_bitrate].to_i >= opts[:video_max_bitrate]
-            opts[:video_bitrate] = (video_info[:video_max_bitrate] * 0.95).to_i
+
+          vbr = video_info[:video_bitrate] || video_info[:bitrate]
+
+          if vbr && vbr > 0
+            if vbr >= opts[:video_max_bitrate]
+              opts[:video_bitrate] = (video_info[:video_max_bitrate] * 0.95).to_i
+            else
+              opts[:video_bitrate] = vbr
+            end
           end
+
+          opts[:video_bitrate] ||= 16384
+
           opts
         end
 
@@ -158,16 +169,24 @@ module TivoHMO
         end
 
         def select_video_frame_rate(opts)
-          if !VIDEO_FRAME_RATES.include?(video_info[:frame_rate])
-            opts[:frame_rate] = 29.97
+
+          frame_rate = video_info[:frame_rate].to_f
+          VIDEO_FRAME_RATES.each do |r|
+            if frame_rate >= r.to_f
+              opts[:frame_rate] = r
+              break
+            end
           end
+
+          opts[:frame_rate] ||= 29.97
+
           opts
         end
 
         def run_transcode(output_filename, format)
 
           logger.debug "Movie Info: " +
-                          video_info.collect {|k, v| "#{k}='#{v}'"}.join(' ')
+                          video_info.collect {|k, v| "#{k}=#{v.inspect}"}.join(' ')
 
           opts = transcoder_options(format)
 
@@ -182,9 +201,9 @@ module TivoHMO
 
           transcode_thread = Thread.new do
             begin
-              logger.info "Starting transcode to: #{output_filename}"
+              logger.info "Starting transcode of '#{movie.path}' to '#{output_filename}'"
               transcoded_movie = movie.transcode(output_filename, opts, t_opts) do |progress|
-                logger.info "Trancoding #{item}: #{progress}"
+                logger.info ("[%3i%%] Transcoding #{File.basename(movie.path)}" % (progress * 100).to_i)
                 raise "Halted" if Thread.current[:halt]
               end
               logger.info "Transcoding completed, transcoded file size: #{File.size(output_filename)}"

data/lib/tivohmo/api/transcoder.rb

@@ -9,8 +9,7 @@ module TivoHMO
       include GemLogger::LoggerSupport
 
       # https://code.google.com/p/streambaby/wiki/video_compatibility
-      VIDEO_FRAME_RATES = %w[23.98 24.00 25.00 29.97
-                             30.00 50.00 59.94 60.00]
+      VIDEO_FRAME_RATES = %w[60.00 59.94 50.00 30.00 29.97 25.00 24.00 23.98]
       VIDEO_CODECS = %w[mpeg2video] # h264 only for push?
       VIDEO_WIDTHS = %w[1920 1440 1280 720 704 544 480 352]
       VIDEO_HEIGHTS = %w[1080 720 480 240]

data/lib/tivohmo/cli.rb

@@ -13,6 +13,8 @@ module TivoHMO
 
     def self.description
       desc = <<-DESC
+        TivoHMO version #{TivoHMO::VERSION}
+
         Runs a HMO server.  Specify one or more applications to show up as top level
         shares in the TiVo Now Playing view.  The application, identifier,
         transcoder, metadata options can be given in groups to apply the transcoder
@@ -23,12 +25,15 @@ module TivoHMO
         tivohmo -a TivoHMO::Adapters::Filesystem::Application -i ~/Video/Movies \\
                 -a TivoHMO::Adapters::Filesystem::Application -i ~/Video/TV
 
-        to run two top level filesystem video serving apps for different dirs,
-        or
+        to run two top level filesystem video serving apps for different dirs, or
 
         tivohmo -a TivoHMO::Adapters::Filesystem::Application -t Vids -i ~/Video
 
-        to run the single filesystem app with a custom title
+        to run the single filesystem app with a custom title, or
+
+        tivohmo -a TivoHMO::Adapters::Plex::Application -t PlexVideo -i localhost
+
+        to run the single plex app with a custom title
       DESC
       desc.split("\n").collect(&:strip).join("\n")
     end

data/lib/tivohmo/version.rb

@@ -1,3 +1,3 @@
 module TivoHMO
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tivohmo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Matt Conway