Commit: 9685d51d1190cd90dadacdf5c4989d4cf78eb975 - nvc_serv (git)

Voice data server for navigation voice changer app.

Commit MetaInfo

• Revisión: 9685d51d1190cd90dadacdf5c4989d4cf78eb975 (tree)
• Tiempo: 2013-10-20 00:40:06
• Autor: HMML <hmml3939@gmai...>
• Commiter: HMML

Log Message

Fix preview generation for mixed rate/channel data.

Cambiar Resumen

• modified: lib/paperclip_processors/voice_preview.rb

Diferencia incremental

--- a/lib/paperclip_processors/voice_preview.rb
+++ b/lib/paperclip_processors/voice_preview.rb
@@ -38,14 +38,20 @@ class VoicePreview < Paperclip::Processor
           end
         end
       end
-      tfiles.empty? and return dst # give up
-      system(*['sox', tfiles.sort, dst_path].flatten) or raise "Failed to execute sox: #{$?}"
+      tfiles.empty? and raise "File missing."
+      tfiles.each do |tf|
+        `soxi -r "#{tf}"`.to_i == 44100 && `soxi -c "#{tf}"`.to_i == 1 and next
+        rtmp = "#{tmpdir}/rate-convert-tmp-#{$$}.ogg"
+        system('sox', tf, '-c', '1', '-r', '44100', rtmp) or raise "Failed on rate/channel conversion, sox fail (#{$?})"
+        FileUtils.mv rtmp, tf
+      end
+      system(*['sox', tfiles.sort, dst_path].flatten) or raise "Failed to concat, sox fail (#{$?})"
     rescue => e
-      raise Paperclip::Error, "Error: Failed to generate preview ogg: #{e.message}"
+      Rails.logger.error "Error: Failed to generate preview voice: #{e.message}"
+      raise Paperclip::Error, "Error: Failed to generate preview voice: #{e.message}"
     ensure
        FileUtils.remove_entry_secure tmpdir
     end
-
     dst
   end
 end