Changeset 26288 for gs3-extensions/audioDB

Timestamp:

2012-10-05T04:22:03+13:00 (12 years ago)

Author:

davidb

Message:

Plugin changed so it now also generates '.ogg' audio files (useful for Firefox playing audio with HTML5 <audio> element

Location:

gs3-extensions/audioDB/trunk/src/perllib/plugins

Files:

• AudioDBPlugin.pm (modified) (3 diffs)
• FFTExtractor.pm (modified) (1 diff)

gs3-extensions/audioDB/trunk/src/perllib/plugins/AudioDBPlugin.pm

@@ -144 +144 @@
     # if filename ext not .wav convert (optionally cached) to wav
 
-    my $wav_filename;
 
     my ($input_ext) = ($filename_full_path =~ m/\.(.*?)$/);
@@ -150 +149 @@
 
 
+    my $wav_filename;
     if ($input_ext ne "wav") {  
     $wav_filename = $self->convert_audio_format($filename_full_path,"wav");
@@ -157 +157 @@
     }
     $doc_obj->associate_file($wav_filename, "doc.wav", "audio/wav", $top_section);
+
+    my $ogg_filename;
+    if ($input_ext ne "ogg") {  
+    $ogg_filename = $self->convert_audio_format($filename_full_path,"ogg", "-acodec libvorbis");
+    # $ogg_filename = $self->convert_audio_format($filename_full_path,"ogg", "-acodec libvorbis -ab 160000");
+    }
+    else {
+    $ogg_filename = $filename_full_path;
+    }
+    $doc_obj->associate_file($ogg_filename, "doc.ogg", "audio/ogg", $top_section);
+
 
     if ($self->{'enable_streaming'} ne "disabled") {

gs3-extensions/audioDB/trunk/src/perllib/plugins/FFTExtractor.pm

@@ -106 +106 @@
 
     # Setup and run the ffmpeg command
-    my $ffmpeg_cmd = "ffmpeg -y $convert_options";
-    $ffmpeg_cmd .= " -i \"$native_source_file_path\"";
+    my $ffmpeg_cmd = "ffmpeg -y";
+    $ffmpeg_cmd .= " -i \"$native_source_file_path\" $convert_options";
     $ffmpeg_cmd .= " \"$native_target_file_path\"";