Changeset 26532 for gs2-extensions/video-and-audio/trunk

Timestamp:

2012-11-27T06:36:24+13:00 (11 years ago)

Author:

davidb

Message:

enable-streaming-list added to allow 'mp3' as a streamable target. Updated call to audio_convertto_cmd to be consistent with the newer cached_cmd API.

File:

• gs2-extensions/video-and-audio/trunk/src/perllib/plugins/AudioPlugin.pm (modified) (4 diffs)

gs2-extensions/video-and-audio/trunk/src/perllib/plugins/AudioPlugin.pm

@@ -39 +39 @@
 }
 
+
+my $enable_streaming_list =
+    [{'name' => "disabled", 'desc' => "Do not create any audio file optimised for streaming over the Internet."},
+     {'name' => "flv", 'desc' => "Uses the FLV format for streaming media. Better to target old computers."},
+     {'name' => "mp4", 'desc' => "Uses the MP4 container with H264 and AAC codecs. Better quality at very low bitrates but more ressources intensive."},
+     {'name' => "mp3", 'desc' => "(audio only) Uses MP3 for psuedo streaming."}
+     ];
+
+my $streaming_mime_types = { "flv" => "video/flv",
+                 "mp4" => "video/mp4",
+                 "mp3" => "audio/mpeg" };
 
 my $arguments =
@@ -60 +71 @@
     'type' => "string",
     'deft' => "200k",
-    'reqd' => "no" } ];
+    'reqd' => "no" },
+
+      { 'name' => "enable_streaming",
+        'desc' => "{MultimediaPlug.enable_streaming}",
+        'type' => "enum",
+        'list' => $enable_streaming_list,
+    'deft' => "disabled",
+    'reqd' => "no" } 
+
+];
 
 my $options = { 'name'     => "AudioPlugin",
@@ -202 +222 @@
     $originalfilename = $filename;
 
-    my $convertto_command = $self->audio_convertto_cmd($filename,$converttotype);
+    my ($convertto_command,$ofilename,$ofile) = $self->audio_convertto_cmd($filename,$converttotype);
 
     my $convertto_result;
@@ -212 +232 @@
 
     ($convertto_regenerated,$convertto_result,$convertto_error)
-        = $self->run_cached_general_cmd($convertto_command,$filename,$convertto_options);
+        = $self->run_cached_general_cmd($convertto_command,$filename,$ofilename,$convertto_options);
                             
     $type = $converttotype;