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

Timestamp:

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

Author:

davidb

Message:

Adjustment of calling BaseMediaConverter to pass in additional input file parameter

File:

• gs2-extensions/video/trunk/perllib/plugins/VideoConverter.pm (modified) (10 diffs)

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

@@ -208 +208 @@
 # Here we use mediaInfo to get all the possible metadata in XML form that could then be parsed
 #the result will vary depending on the file type and how it was encoded
-sub mediaInfo_XML_Cmd   {
-    my ($video, $outhandle, $verbosity) = @_;
-    
-    # Use MediaInfo CLI to get the file spec according to the requested parameter
+sub mediaInfo_XML_Cmd {
+    my ($video, $outhandle, $verbosity) = @_;
+    
+    # Use MediaInfo CLI to get the file spec according to the requested parameter
     my $command = "mediainfo --Output=XML \"$video\"";
-
+    
     print $outhandle "  $command\n" if ($verbosity > 2);
     my $result = '';
     $result = `$command 2>&1`;
     print $outhandle "  $result\n" if ($verbosity > 4);
-    
+    
     # Return the asked spec
     return ($result);
@@ -224 +224 @@
 
 #Here we parse the video specs contained in the XML text in order to create a metadata entry for each field
-sub mediaInfo_parse_XML     {
-    my ($xmlTxt, $outhandle, $verbosity) = @_;
-    
-    my @parts = split(/<track\s+type=\"(.*?)\">/is,$xmlTxt);
-    
-    shift @parts; # Skip preamble
-    my $metadata_table = {};
-
-    while (@parts) {
-        my $type = shift(@parts);
-        my $vals = shift(@parts);
-        my @fieldlist=();
-        while ($vals =~ s/<(.*?)>(.*?)<\/\1>//) {
-          my $metaname = $1;
-          my $metaval  = $2;
-          my $fullmetaname = "mi.$type\^$metaname";
-          $metadata_table->{$fullmetaname}= $metaval;
-          push(@fieldlist,$fullmetaname);
-        }
-        
-        $metadata_table->{"mi.${type}Fields"}= join(",",@fieldlist);
-        
+sub mediaInfo_parse_XML {
+    my ($xmlTxt, $outhandle, $verbosity) = @_;
+    
+    my @parts = split(/<track\s+type=\"(.*?)\">/is,$xmlTxt);
+    
+    shift @parts; # Skip preamble
+    my $metadata_table = {};
+    
+    while (@parts) {
+    my $type = shift(@parts);
+    my $vals = shift(@parts);
+    my @fieldlist=();
+    while ($vals =~ s/<(.*?)>(.*?)<\/\1>//) {
+        my $metaname = $1;
+        my $metaval  = $2;
+        my $fullmetaname = "mi.$type\^$metaname";
+        $metadata_table->{$fullmetaname}= $metaval;
+        push(@fieldlist,$fullmetaname);
     }
     
-    return $metadata_table;
-
-}
-
-sub identify { 
+    $metadata_table->{"mi.${type}Fields"}= join(",",@fieldlist);
+    
+    }
+    
+    return $metadata_table;
+
+}
+
+sub identifyMI { 
     my ($video, $outhandle, $verbosity) = @_;
 
@@ -291 +291 @@
 
 
-sub identify2 { 
+sub identify { 
     my ($video, $outhandle, $verbosity) = @_;
 
@@ -1001 +1001 @@
 
     
+    my $ifilename = $originalfilename || $filename;
+
     my ($stream_cmd,$ofla_filename,$ofla_file) 
-    = $self->stream_flv_audio_cmd($originalfilename || $filename);
+    = $self->stream_flv_audio_cmd($ifilename);
     
     
@@ -1011 +1013 @@
 
     my ($streamable_regenerated,$streamable_result,$streamable_had_error)
-    = $self->$optionally_run_general_cmd($stream_cmd,$ofla_filename,
+    = $self->$optionally_run_general_cmd($stream_cmd,
+                         $ifilename,$ofla_filename,
                          $streamable_options);
 
@@ -1072 +1075 @@
     my $streaming_quality = "high";
     
+    my $ifilename = $originalfilename || $filename;
+
     my ($stream_cmd,$oflash_filename,$oflash_file) 
-    = $self->stream_flv_video_cmd($originalfilename || $filename,
+    = $self->stream_flv_video_cmd($ifilename,
                      $video_width,$video_height,
                      $streaming_quality,
@@ -1085 +1090 @@
 
     my ($streamable_regenerated,$streamable_result,$streamable_had_error)
-    = $self->$optionally_run_general_cmd($stream_cmd,$oflash_filename,$streamable_options);
+    = $self->$optionally_run_general_cmd($stream_cmd,
+                         $ifilename,$oflash_filename,
+                         $streamable_options);
     
     if (!$streamable_had_error) {
@@ -1131 +1138 @@
 sub enable_h264_streaming
 {
-    my $self = shift (@_);
+    my $self = shift (@_);
     my ($doc_obj,$originalfilename,$filename,$convertto_regenerated,
     $video_width,$video_height) = @_;
-    
+    
 
     my $section = $doc_obj->get_top_section();
@@ -1153 +1160 @@
     my $streaming_HQ_AudioBitrate    = $self->{'streamingHQAudioBitrate'};
 
+    my $ifilename = $originalfilename || $filename;
     my ($stream_cmd,$oflash_filename,$oflash_file) 
-    = $self->stream_mp4_video_cmd($originalfilename || $filename,
+    = $self->stream_mp4_video_cmd($ifilename,
                      $streaming_HQ_size,
                      $streaming_HQ_VideoBitrate,
@@ -1161 +1169 @@
     
     my $streamable_options = { @{$self->{'handbrake_monitor'}},
-                               'message_prefix' => "MP4 Stream",
-                               'message' => "Generating streamable MP4 video: $oflash_file" }; 
+                   'message_prefix' => "MP4 Stream",
+                   'message' => "Generating streamable MP4 video: $oflash_file" }; 
     
 
     my ($streamable_regenerated,$streamable_result,$streamable_had_error)
-    = $self->$optionally_run_general_cmd($stream_cmd,$oflash_filename,$streamable_options);
+    = $self->$optionally_run_general_cmd($stream_cmd,
+                         $ifilename,$oflash_filename,
+                         $streamable_options);
     
     if (!$streamable_had_error) {