Changeset 18982

Timestamp:

2009-04-15T17:24:24+12:00 (15 years ago)

Author:

davidb

Message:

Some mods to work with Windows version of ffmpeg

Location:

extensions/gsdl-video/trunk/perllib/plugins

Files:

• MultimediaConverter.pm (modified) (2 diffs)
• TimedHTMLPlugin.pm (modified) (3 diffs)
• VideoConverter.pm (modified) (2 diffs)

extensions/gsdl-video/trunk/perllib/plugins/MultimediaConverter.pm

@@ -95 +95 @@
     my $result = `ffmpeg -h 2>&1`;
 
-    if (!defined $result || $result !~ m/^FFmpeg version/) {
+    if (!defined $result || $result !~ m/^FFmpeg version/m) {
         $self->{'ffmpeg_installed'} = 0;
         print $outhandle $result;
@@ -223 +223 @@
 
     my $gsdlhome = $ENV{'GSDLHOME'};
+    $gsdlhome = &util::filename_to_regex($gsdlhome);
+
     my $filename_gsdlenv = $filename;
     $filename_gsdlenv =~ s@^$gsdlhome@\$GSDLHOME@;

extensions/gsdl-video/trunk/perllib/plugins/TimedHTMLPlugin.pm

@@ -28 +28 @@
 package TimedHTMLPlugin;
 
-##use videoconvert;
-
 use HTMLPlugin;
 use VideoConverter;
@@ -68 +66 @@
    
     new VideoConverter($pluginlist, $inputargs, $hashArgOptLists);
-
+    
     my $self = (defined $hashArgOptLists) 
     ? new HTMLPlugin($pluginlist,$inputargs,$hashArgOptLists)
     : new HTMLPlugin($pluginlist,$inputargs);
-    
+ 
     my $collect_dir = $ENV{'GSDLCOLLECTDIR'};
 
@@ -725 +723 @@
 ### = new videoconvert($base_dir,$src_filename,$verbosity,$outhandle,$exp_duration);
 ###    $self->{'videoconvert'} = $videoconvert;
+# ******
+
+    $self->init_cache_for_file($src_filename);
 
     #---

extensions/gsdl-video/trunk/perllib/plugins/VideoConverter.pm

@@ -192 +192 @@
     $result =~ s/^.*\'$video_safe\'://s;
 
-    if ($result =~ m/Video: (.*?) fps/m) {
+##    if ($result =~ m/Video: (.*?) fps/m) {
+    if ($result =~ m/^\s+Stream.*?Video: (.*?)$/m) {
     my $video_info = $1;
-    if ($video_info =~ m/([^,]+),(?: ([^,]+),)? (\d+)x(\d+),.*?(\d+\.\d+)/)
-    {
-        $vtype = $1;
-        $vcodec = $2 if defined $2;
-        $width = $3;
-        $height = $4;
-        $fps = $5;
+    $video_info =~ s/\s*\[.*?\]//g;
+
+    my @video_fields = split(/,\s*/,$video_info);
+    
+    $vtype = shift @video_fields;
+
+    if ($video_fields[0] !~ m/(\d+)x(\d+)/) {
+        $vcodec = shift @video_fields;
     }
+    my $video_dim = shift @video_fields;
+
+    ($width,$height) = ($video_dim =~ m/(\d+)x(\d+)/);
+
+#   if ($video_info =~ m/([^,]+),(?: ([^,]+),)? (\d+)x(\d+),.*?(\d+\.\d+)/)
+#   {
+#       $vtype = $1;
+#       $vcodec = $2 if defined $2;
+#       $width = $3;
+#       $height = $4;
+#       $fps = $5;
+#   }
     }
 
@@ -493 +507 @@
     my $collect = $ENV{'GSDLCOLLECTION'};
  
+    print STDERR "**** Warning: need to remove dependency of GEXT_VIDEO_SERVER and _PREFIX\n";
+
     my $flvtool_cmd = "flvtool2 -vAUtP \"$cue_filename\" -thumbLocation:$video_server$video_prefix/collect/$collect/index/assoc/$assocfilepath \"$oflash_filename\"";