Changeset 22432 for gs2-extensions/video/trunk/perllib/plugins/VideoPlugin.pm

Timestamp:

2010-07-19T14:00:53+12:00 (14 years ago)

Author:

davidb

Message:

Adjustment of calling BaseMediaConverter to pass in additional input file parameter

File:

• gs2-extensions/video/trunk/perllib/plugins/VideoPlugin.pm (modified) (11 diffs)

gs2-extensions/video/trunk/perllib/plugins/VideoPlugin.pm

@@ -133 +133 @@
 
     # Generate the keyframes with ffmpeg and hive
-    my ($keyframe_cmd,$okeyframe_filename) = $self->keyframe_cmd($originalfilename || $filename);
+    my $ifilename = $originalfilename || $filename;
+    my ($keyframe_cmd,$okeyframe_filename) = $self->keyframe_cmd($ifilename);
     
     my $keyframe_options = { @{$self->{'ffmpeg_monitor'}},
@@ -139 +140 @@
                  'message' => "Extracting keyframes" }; 
     
-    $self->run_cached_general_cmd($keyframe_cmd,$okeyframe_filename,$keyframe_options);
+    $self->run_cached_general_cmd($keyframe_cmd,
+                  $ifilename,$okeyframe_filename,
+                  $keyframe_options);
     $self->parse_shot_xml();
 
@@ -164 +167 @@
 
 
-    # Generate the thumbnail with convert, a la ImagePlug
+    # Generate the thumbnail with convert, a la ImagePlugin
 
     my $thumbnailfile = &util::filename_cat($output_dir,"$ivideo_root-thumbnail.$thumbnailtype");
-    
     
     my $optionally_run_general_cmd = "run_uncached_general_cmd";
@@ -176 +178 @@
     
 ###    print STDERR "**** creating thumbnail: $thumbnail_width x $thumbnail_height\n";
-    my $ofilename = $self->get_ovideo_filename($self->{'enable_streaming'});
+    my $ofilename = $self->get_ovideo_filename($self->{'enable_streaming'});
     my ($thumb_cmd ,$othumb_filename)
     = $self->keyframe_thumbnail_cmd($ofilename,$thumbnailfile,$thumbnail_width,$thumbnail_height);
@@ -186 +188 @@
     
     my ($thumb_regenerated,$thumb_result,$thumb_had_error)
-    = $self->$optionally_run_general_cmd($thumb_cmd,$thumbnailfile,$thumb_options);
+    = $self->$optionally_run_general_cmd($thumb_cmd,$ofilename,$thumbnailfile,$thumb_options);
     
     # Add the thumbnail as an associated file ...
@@ -209 +211 @@
     #   2.thumbnail was cached, so imagemagick convert was not run
     # Either way, the solution is the same:
-    # => run "identify $thumbnailfile" and parse result
-    
-    $thumb_result = `identify \"$thumbnailfile\"`;
+    # => run "identify $thumbnailfile" and parse result 
+    $thumb_result = `identify \"$thumbnailfile\" 2>&1`;
     
     if ($thumb_result =~ m/([0-9]+)x([0-9]+)/) {
@@ -285 +286 @@
                    
     my ($screenview_regenerated,$screenview_result,$screenview_had_error)
-    = $self->$optionally_run_general_cmd($screenview_cmd,$screenviewfilename,$screenview_options);
+    = $self->$optionally_run_general_cmd($screenview_cmd,
+                         $filename,$screenviewfilename,
+                         $screenview_options);
     
 
@@ -341 +344 @@
     = &VideoConverter::identify($filename, $outhandle, $verbosity);
 
+    if ($video_duration =~ m/^(\d\d):(\d\d):(\d\d)\.(\d)$/) {
+    $video_duration = $1*3600 + $2*60 + $3 + ($4/10.0);
+    }
+
     #if ($vfps eq "unknown") {
     #print $outhandle "Unknown framerate, defaulting to 25 frames per second.\n";
@@ -350 +357 @@
     #my $total_dur_secs = $dur_hour*3600 + $dur_min*60 + $dur_sec;
     
-    my $total_dur_secs = $video_duration / 1000;
+    my $total_dur_secs = $video_duration / 1000;
 
     $self->{'video-fps'} = $vfps;
@@ -448 +455 @@
 
     ($convertto_regenerated,$convertto_result,$convertto_error)
-        = $self->run_cached_general_cmd($convertto_command,$filename,$convertto_options);
+        = $self->run_cached_general_cmd($convertto_command,
+                        $originalfilename,$filename,
+                        $convertto_options);
                             
     $type = $converttotype;
@@ -580 +589 @@
                  $thumbnail_width,$thumbnail_height);
     }
-
 
     if ($self->{'extract_keyframes'}) {