Changeset 20347 for extensions

Timestamp:

2009-08-20T17:00:18+12:00 (15 years ago)

Author:

max

Message:

Add the .ts as new recognized extension, solve the problem of screenviews that were regenerated each time without using their cached version, and solve the problem of the source metadata that used to be added twice to the document object.

File:

• extensions/gsdl-video/trunk/perllib/plugins/VideoPlugin.pm (modified) (8 diffs)

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

@@ -118 +118 @@
     my $self = shift (@_);
 
-    return q^(?i)\.(mpe?g|flv|mov|qt|wmv|vob|avi|mp4|m4v)$^; 
+    return q^(?i)\.(mpe?g|flv|mov|qt|wmv|vob|avi|mp4|m4v|ts)$^; 
 }
 
@@ -257 +257 @@
 {
     my $self = shift (@_);
-    my ($doc_obj,$filename,$screenviewtype, $screenview_width,$screenview_height) = @_;
+    my ($doc_obj,$filename,$convertto_regenerated, $screenviewtype, $screenview_width,$screenview_height) = @_;
 
     my $section = $doc_obj->get_top_section();
@@ -264 +264 @@
     my $ivideo_root  = $self->{'cached_file_root'};
     
-    
+    my $optionally_run_general_cmd = "run_uncached_general_cmd";
+    if ($self->{'enable_cache'}) {  
+    $optionally_run_general_cmd 
+    = ($convertto_regenerated) ? "regenerate_general_cmd" : "run_cached_general_cmd";
+    }
     # make the screenview image
 
@@ -276 +280 @@
                    'message' => "Generating screenview image" }; 
 
-    my ($result,$had_error)
-    = $self->run_general_cmd($screenview_cmd,$screenview_options);
+                   
+    my ($screenview_regenerated,$screenview_result,$screenview_had_error)
+    = $self->$optionally_run_general_cmd($screenview_cmd,$screenviewfilename,$screenview_options);
+    
 
     # get screenview dimensions, size and type
-    if ($result =~ m/[0-9]+x[0-9]+=>([0-9]+)x([0-9]+)/) {
+    if ($screenview_result =~ m/[0-9]+x[0-9]+=>([0-9]+)x([0-9]+)/) {
     $doc_obj->add_metadata ($section, "ScreenWidth", $1);
     $doc_obj->add_metadata ($section, "ScreenHeight", $2);
@@ -481 +487 @@
     # Also want to set filename as 'Source' metadata to be
     # consistent with other plugins
-    $doc_obj->add_utf8_metadata ($section, "Source", $filemeta_url_safe);
+    # $doc_obj->add_utf8_metadata ($section, "Source", $filemeta_url_safe);
 
 
@@ -520 +526 @@
     my $streamable_regenerated = 0;
 
-    if ($self->{'enable_streaming'}) {  
-    $streamable_regenerated 
-        = $self->enable_full_streaming($doc_obj,
+    if ($self->{'enable_flv_streaming'} && !$self->{'enable_mp4_streaming'}) {  
+        $streamable_regenerated 
+            = $self->enable_full_streaming($doc_obj,
                        $originalfilename,$filename,
                        $convertto_regenerated,
@@ -528 +534 @@
     }
 
+    # Create an H264+ACC video file with Handbrake
+      if ($self->{'enable_mp4_streaming'}) {    
+        $streamable_regenerated 
+            = $self->enable_h264_streaming($doc_obj,
+                       $originalfilename,$filename,
+                       $convertto_regenerated,
+                       $video_width,$video_height);
+    }
 
     my $thumbnailsize = $self->{'thumbnailsize'} || 100;
@@ -591 +605 @@
     $screenview_height = int($screenview_height/2) * 2;
     
-    $self->extract_screenview($doc_obj,$filename,
+    $self->extract_screenview($doc_obj,$filename, $convertto_regenerated, 
                   $screenviewtype,
                   $screenview_width,$screenview_height);