Changeset 28369

Timestamp:

2013-10-09T23:31:21+13:00 (11 years ago)

Author:

davidb

Message:

Changes to work with newer version of ffmpeg

Location:

gs2-extensions/video-and-audio/trunk/src

Files:

• ffmpeg-20121003-static.exe (added)
• perllib/plugins/AudioConverter.pm (modified) (1 diff)
• perllib/plugins/AudioPlugin.pm (modified) (2 diffs)
• perllib/plugins/MultimediaPlugin.pm (modified) (1 diff)

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

@@ -100 +100 @@
     $result =~ s/^.*\'$audio_safe\'://s;
 
-    if ($result =~ m/Audio: (\w+), (\d+) Hz, (\w+)(?:, (\d+.*))?/m) {
+    if ($result =~ m/Audio: (\w+).*?, (\d+) Hz, (\w+)(?:, (\d+.*))?/m) {
     $atype = $1;
     $afreq = $2;

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

@@ -210 +210 @@
     $self->init_cache_for_file($filename);
 
-
     my $originalfilename = undef;
     my $type = "unknown";
@@ -235 +234 @@
                             
     $type = $converttotype;
+    $filename = $ofilename;
+    $file = $ofile;
+
+    ($aduration,$asize,$atype,$afreq,$achan,$arate) 
+        = &AudioConverter::identify($ofilename, $outhandle, $verbosity);
+
+    if ($aduration eq "N/A") {
+        print $outhandle "Unable to determine duration of converted $ofile\n";
+        $aduration = undef;
+    }
     }
     

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

@@ -99 +99 @@
     if (($ENV{'GSDLOS'} ne "windows" || Win32::IsWinNT())) {
 
+##  my $result = `ffmpeg -h 2>&1`;
     my $result = `ffmpeg -version 2>&1`;
 
-    if (!defined $result || $result !~ m/^FFmpeg version/im) {
+    if (!defined $result || $result !~ m/^FFmpeg\s+version/mi) {
         $self->{'ffmpeg_installed'} = 0;
         if (defined $result) {
+        print STDERR "Problem detecting ffmpeg:\n";
         print STDERR $result;
         }