Changeset 19828 for extensions/gsdl-video/trunk/perllib/plugins/TimedHTMLPlugin.pm

Timestamp:

2009-06-12T23:07:30+12:00 (15 years ago)

Author:

davidb

Message:

Continued development of plugins to work smoothly with Flash player

File:

• extensions/gsdl-video/trunk/perllib/plugins/TimedHTMLPlugin.pm (modified) (6 diffs)

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

@@ -626 +626 @@
 
     
-###    my $videoconvert 
-### = new videoconvert($base_dir,$src_filename,$verbosity,$outhandle,$exp_duration);
-###    $self->{'videoconvert'} = $videoconvert;
-# ******
-
     $self->init_cache_for_file($src_filename);
 
+    # TimedHTML streaming isn't as complicated as VideoPlugin or AudioPlugin
+    # => src file is never converted beforehand to another type
+
+    my $convertto_regenerated = 0;
+    my $originalfilename = $src_filename;
+
+    my $streamable_regenerated = 0;
+
+    if ($media_type eq "audio") {
+    $streamable_regenerated = 
+        $self->enable_audio_streaming($doc_obj,
+                      $originalfilename,$src_filename,
+                      $convertto_regenerated);
+    }
+    else {
+    # generate streamable video and audio
+    $streamable_regenerated = 
+        $self->enable_full_streaming($doc_obj,
+                     $originalfilename,$src_filename,
+                     $convertto_regenerated,
+                     $video_width,$video_height);
+    }
+
+    $self->{'streamable_regenerated'} = $streamable_regenerated;
+
+    my $base_url = "_httpstreamserverprefix_/collect/[collection]/index/assoc/{If}{[assocfilepath],[assocfilepath],[parent(Top):assocfilepath]}/";
+
+    $doc_obj->add_metadata ($section, "baseurl",$base_url);
+
+    return;
+
+#*********************
     #---
     # Generate the Flash FLV format for streaming purposes
@@ -655 +682 @@
                    'message' => "Generating streamable video: $oflash_file" }; 
 
-    my ($streamable_regenerated,$streamable_result,$streamable_had_error)
+    my ($streamable_regenerated2,$streamable_result,$streamable_had_error)
     = $self->run_cached_general_cmd($stream_cmd,$oflash_filename,$streamable_options);
 
-    $self->{'streamable_regenerated'} = $streamable_regenerated;
+    $self->{'streamable_regenerated2'} = $streamable_regenerated2;
 
     if (!$streamable_had_error) {
@@ -670 +697 @@
                        'message' => "Reprocessing video stream to be seekable by timeline: $oflash_file" }; 
 
-    if ($streamable_regenerated) {
+    if ($streamable_regenerated2) {
         $self->run_general_cmd($streamseekable_cmd,$streamseekable_options);
     }
@@ -688 +715 @@
     # FlowPlayerWhite.swf  height+26 pixels
     if ($media_type eq "audio") {
-    $doc_obj->add_metadata ($section, "flashwidth",    $video_width);
-    $doc_obj->add_metadata ($section, "flashheight",   22 + 100);
+    $doc_obj->add_metadata ($section, "audioflashwidth",    $video_width);
+    $doc_obj->add_metadata ($section, "audioflashheight",   22 + 100);
     }
     else {
@@ -697 +724 @@
 
     
-    my $base_url = "_httpstreamserverprefix_/collect/[collection]/index/assoc/{If}{[assocfilepath],[assocfilepath],[parent(Top):assocfilepath]}/";
-
-    $doc_obj->add_metadata ($section, "baseurl",$base_url);
+    my $base_url2 = "_httpstreamserverprefix_/collect/[collection]/index/assoc/{If}{[assocfilepath],[assocfilepath],[parent(Top):assocfilepath]}/";
+
+    $doc_obj->add_metadata ($section, "baseurl",$base_url2);
     
     $self->{'oflash_file'} = $oflash_file;
@@ -815 +842 @@
                  'message' => "Reprocessing video stream to add cuepoints on timeline: $oflash_file" }; 
 
-    my $streamable_regenerated = $self->{'streamable_regenerated'};
-
-    if ($streamable_regenerated) {
+    my $streamable_regenerated2 = $self->{'streamable_regenerated'};
+
+    if ($streamable_regenerated2) {
     $self->run_general_cmd($streamcuepts_cmd,$streamcuepts_options);
     }