staugaard-transcoding_machine 0.2.2 → 0.2.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 2
+:patch: 3
 :major: 0
 :minor: 2

data/lib/transcoding_machine/media_format.rb

@@ -61,7 +61,7 @@ module TranscodingMachine
     end
     
     def can_transcode?(media_file_attributes)
-      !media_file_attributes[:video] && media_file_attributes[:audio] && media_file_attributes[:bitrate] >= @bitrate
+      !media_file_attributes.video? && media_file_attributes.audio? && media_file_attributes.bitrate >= @bitrate
     end
   end
   
@@ -74,7 +74,7 @@ module TranscodingMachine
       
       case args[:aspect_ratio]
       when String
-        Server::MediaFileAttributes::ASPECT_RATIO_VALUES[args[:aspect_ratio]]
+        @aspect_ratio = Server::MediaFileAttributes::ASPECT_RATIO_VALUES[args[:aspect_ratio]]
       when Float
         @aspect_ratio = args[:aspect_ratio]
       end
@@ -82,10 +82,18 @@ module TranscodingMachine
       @fixed_criteria << MediaFormatCriterium.new(:key => :video,
                                                   :operator => :equals,
                                                   :value => true)
+      
+      @fixed_criteria << MediaFormatCriterium.new(:key => :width,
+                                                  :operator => :equals,
+                                                  :value => @width)
+      
+      @fixed_criteria << MediaFormatCriterium.new(:key => :aspect_ratio,
+                                                  :operator => :equals,
+                                                  :value => @aspect_ratio)
     end
 
     def can_transcode?(media_file_attributes)
-      media_file_attributes[:video] && media_file_attributes[:width] >= @width && media_file_attributes[:aspect_ratio] == @aspect_ratio
+      media_file_attributes.video? && media_file_attributes.width >= @width && media_file_attributes.aspect_ratio == @aspect_ratio
     end
   end
 end

data/lib/transcoding_machine/server/media_file_attributes.rb

@@ -81,9 +81,9 @@ module TranscodingMachine
           puts "EXIFTOOL:"
           puts exiftool.inspect
           store(:poster_time, exiftool.poster_time)
-          if exiftool.aspect_ratio and video_aspect != exiftool.aspect_ratio
+          if exiftool.aspect_ratio and aspect_ratio != exiftool.aspect_ratio
             store(:height, (width / exiftool.aspect_ratio).to_i)
-            store(:video_aspect, exiftool.aspect_ratio)
+            store(:aspect_ratio, exiftool.aspect_ratio)
           elsif exiftool.width && exiftool.height
             store(:width, exiftool.width)
             store(:height, exiftool.height)
@@ -200,7 +200,7 @@ module TranscodingMachine
         output[:video_format] = ffmpeg_track[:format] || mplayer_track[:format]
         output[:width] = ffmpeg_track[:width] || mplayer_track[:width]
         output[:height] = ffmpeg_track[:height] || mplayer_track[:height]
-        output[:video_aspect] = ffmpeg_track[:aspect] || mplayer_track[:aspect]
+        output[:aspect_ratio] = ffmpeg_track[:aspect] || mplayer_track[:aspect]
         output[:video_fps] = ffmpeg_track[:fps] || mplayer_track[:fps]
         output[:video_bitrate] = ffmpeg_track[:bitrate] || mplayer_track[:bitrate]
 
@@ -263,7 +263,7 @@ module TranscodingMachine
       end
 
       def derive_values
-        store(:video_aspect, video_aspect_ratio) if (video? && has_key?(:width) && has_key?(:height))
+        store(:aspect_ratio, video_aspect_ratio) if (video? && has_key?(:width) && has_key?(:height))
 
         if file_name && (m = file_name.match(/.+\.(\w+)/))
           store(:file_extension, m[1])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: staugaard-transcoding_machine
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Mick Staugaard
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-15 00:00:00 -07:00
+date: 2009-04-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency