Changeset 19828 for extensions/gsdl-video/trunk/perllib/plugins/VideoConverter.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/VideoConverter.pm (modified) (4 diffs)

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

@@ -373 +373 @@
 
 
-sub stream_cmd
+sub stream_flv_video_cmd
 {
     my $self = shift (@_);
@@ -390 +390 @@
     my $ivideo_root = $self->{'cached_file_root'};
 
-    my $oflash_file = "${ivideo_root}_stream.flv";
+    my $oflash_file = "${ivideo_root}_vstream.flv";
     my $oflash_filename = &util::filename_cat($output_dir,$oflash_file);
 
@@ -441 +441 @@
     return ($ffmpeg_cmd,$oflash_filename,$oflash_file);
 }
+
+
+
+
+sub stream_flv_audio_cmd
+{
+    # AudioConverter also has a routine for doing this
+    # => merge into one!
+    # **************
+
+    my $self = shift (@_);
+    my ($ivideo_filename, $opt_streaming_achan, $opt_streaming_arate) = @_;
+
+    # Convert either audio or video to streamable audio format
+
+    my $streaming_achan 
+    = (defined $opt_streaming_achan) ? $opt_streaming_achan : 2;
+
+    my $streaming_arate 
+    = (defined $opt_streaming_arate) ? $opt_streaming_arate : 22050;
+
+    my $output_dir = $self->{'cached_dir'};
+    my $ivideo_root = $self->{'cached_file_root'};
+
+    my $ofla_file = "${ivideo_root}_astream.flv";
+    my $ofla_filename = &util::filename_cat($output_dir,$ofla_file);
+
+    my $exp_duration = $self->{'exp_duration'};
+    my $t_opt = (defined $exp_duration) ? "-t $exp_duration" : "";
+
+    my $main_opts = "-vn -y $t_opt";
+
+    my $stream_opts .= " -ac $streaming_achan -ar $streaming_arate";
+
+    my $all_opts = "$main_opts $stream_opts"; 
+
+    my $ffmpeg_cmd;
+
+    my $ivideo_filename_gsdlenv = $self->gsdlhome_independent($ivideo_filename);
+    my $ofla_filename_gsdlenv = $self->gsdlhome_independent($ofla_filename);
+    $ffmpeg_cmd = "ffmpeg -i \"$ivideo_filename_gsdlenv\" $all_opts -y \"$ofla_filename_gsdlenv\"";
+
+    return ($ffmpeg_cmd,$ofla_filename,$ofla_file);
+}
+
 
 
@@ -698 +743 @@
 
 
+sub enable_audio_streaming
+{
+    my $self = shift (@_);
+    my ($doc_obj,$originalfilename,$filename,$convertto_regenerated) = @_;
+
+    my $section = $doc_obj->get_top_section();
+
+    my $output_dir   = $self->{'cached_dir'};
+    my $ivideo_root  = $self->{'cached_file_root'};
+    
+    # Generate FLV audio-only format for streaming purposes
+
+    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";
+    }
+
+    
+    my ($stream_cmd,$ofla_filename,$ofla_file) 
+    = $self->stream_flv_audio_cmd($originalfilename || $filename);
+    
+    
+    my $streamable_options = { @{$self->{'ffmpeg_monitor'}},
+                   'message_prefix' => "Stream",
+                   'message' => "Generating streamable audio: $ofla_file" }; 
+    
+
+    my ($streamable_regenerated,$streamable_result,$streamable_had_error)
+    = $self->$optionally_run_general_cmd($stream_cmd,$ofla_filename,
+                         $streamable_options);
+
+
+    if (!$streamable_had_error) {
+    my ($streamseekable_cmd,$ostreamseekable_filename) = $self->streamseekable_cmd($ofla_filename);
+    
+    my $streamseekable_options = { @{$self->{'flvtool2_monitor'}},
+                       'message_prefix' => "Stream Seekable",
+                       'message' => "Reprocessing audio stream to be seekable by timeline: $ofla_file" }; 
+    
+    if ($streamable_regenerated) {
+        $self->run_general_cmd($streamseekable_cmd,$streamseekable_options);
+    }
+    
+    my $streamable_url = $ofla_file;
+    my $streamable_url_safe = $self->url_safe($streamable_url);
+
+    $doc_obj->add_utf8_metadata ($section, "streamableaudio", $streamable_url_safe);
+    $doc_obj->associate_file($ofla_filename,$ofla_file,"audio/flash",
+                 $section);
+    }
+
+    $doc_obj->add_metadata ($section, "audioflashwidth",    400);
+    $doc_obj->add_metadata ($section, "audioflashheight",   22 + 100);
+
+    $self->{'ofla_file'} = $ofla_file;
+    $self->{'ofla_filename'} = $ofla_filename;
+
+    return $streamable_regenerated;
+}
+
+
+
+
+
+sub enable_video_streaming
+{
+    my $self = shift (@_);
+    my ($doc_obj,$originalfilename,$filename,$convertto_regenerated,
+    $video_width,$video_height) = @_;
+
+    my $section = $doc_obj->get_top_section();
+
+    my $output_dir   = $self->{'cached_dir'};
+    my $ivideo_root  = $self->{'cached_file_root'};
+    
+    # Generate the Flash FLV format for streaming purposes
+
+    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";
+    }
+
+
+    my $streaming_bitrate = $self->{'streamingbitrate'};
+    my $streaming_size    = $self->{'streamingsize'};
+    
+    my $streaming_quality = "high";
+    
+    my ($stream_cmd,$oflash_filename,$oflash_file) 
+    = $self->stream_flv_video_cmd($originalfilename || $filename,
+                     $video_width,$video_height,
+                     $streaming_quality,
+                     $streaming_bitrate, $streaming_size);
+    
+    
+    my $streamable_options = { @{$self->{'ffmpeg_monitor'}},
+                   'message_prefix' => "Stream",
+                   'message' => "Generating streamable video: $oflash_file" }; 
+    
+
+    my ($streamable_regenerated,$streamable_result,$streamable_had_error)
+    = $self->$optionally_run_general_cmd($stream_cmd,$oflash_filename,$streamable_options);
+    
+    if (!$streamable_had_error) {
+    my ($streamseekable_cmd,$ostreamseekable_filename) = $self->streamseekable_cmd($oflash_filename);
+    
+    my $streamseekable_options = { @{$self->{'flvtool2_monitor'}},
+                       'message_prefix' => "Stream Seekable",
+                       'message' => "Reprocessing video stream to be seekable by timeline: $oflash_file" }; 
+    
+    if ($streamable_regenerated) {
+        $self->run_general_cmd($streamseekable_cmd,$streamseekable_options);
+    }
+    
+    my $streamable_url = $oflash_file;
+    my $streamable_url_safe = $self->url_safe($streamable_url);
+    
+    $doc_obj->add_utf8_metadata ($section, "streamablevideo", $streamable_url_safe);
+    $doc_obj->associate_file($oflash_filename,$oflash_file,"video/flash",
+                 $section);
+    }
+
+
+    #
+    # FlowPlayer.swf       height+22 pixels
+    # FlowPlayerBlack.swf  height+16 pixels
+    # FlowPlayerThermo.swf height+16 pixels
+    # FlowPlayerWhite.swf  height+26 pixels
+
+    my $flashwidth = $video_width;
+    my $flashheight = $video_height + 22;
+
+    if ($self->{'extractkeyframes'}) {
+    $flashheight += 100;
+    }
+
+    $doc_obj->add_metadata ($section, "flashwidth",    $flashwidth);
+    $doc_obj->add_metadata ($section, "flashheight",   $flashheight);
+     
+    $self->{'oflash_file'} = $oflash_file;
+    $self->{'oflash_filename'} = $oflash_filename;
+
+    return $streamable_regenerated;
+}
+
+
+sub enable_full_streaming
+{
+    my $self = shift (@_);
+    my ($doc_obj,$originalfilename,$filename,$convertto_regenerated,
+    $video_width,$video_height) = @_;
+
+    my $video_streamable_regenerated
+    = $self->enable_video_streaming($doc_obj,$originalfilename,$filename,
+                    $convertto_regenerated,
+                    $video_width,$video_height);
+
+    my $audio_streamable_regenerated
+    = $self->enable_audio_streaming($doc_obj,$originalfilename,$filename,
+                    $convertto_regenerated);
+
+    return ($video_streamable_regenerated || $audio_streamable_regenerated);
+}
+
+
+
 sub flvtool2_monitor_line
 {