Changeset 20346

Timestamp:

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

Author:

max

Message:

Add Handbrake support, add 3 new arguments for handbrake: streamingHQsize, streamingHQVideoBitrate and streamingHQAudioBitrate.

File:

• extensions/gsdl-video/trunk/perllib/plugins/VideoConverter.pm (modified) (3 diffs)

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

@@ -121 +121 @@
     'deft' => "200k",
     'reqd' => "no" },
+    { 'name' => "streamingHQsize",
+    'desc' => "{VideoPlugin.streamingsize}",
+    'type' => "int",
+    'deft' => "576",
+    'reqd' => "no" },
+    { 'name' => "streamingHQVideoBitrate",
+    'desc' => "{VideoPlugin.streamingbitrate}",
+    'type' => "int",
+    'deft' => "426",
+    'reqd' => "no" },
+    { 'name' => "streamingHQAudioBitrate",
+    'desc' => "{VideoPlugin.streamingbitrate}",
+    'type' => "int",
+    'deft' => "86",
+    'reqd' => "no" },
 
       { 'name' => "minimumsize",
@@ -373 +388 @@
 
 
+sub stream_mp4_video_cmd
+{
+    my $self = shift (@_);
+    my ($ivideo_filename,$streaming_HQ_size, $streaming_HQ_VideoBitrate,
+     $streaming_HQ_AudioBitrate) = @_;
+
+
+    my $output_dir = $self->{'cached_dir'};
+    my $ivideo_root = $self->{'cached_file_root'};
+
+    my $omp4_file = "${ivideo_root}_vHQstream.mp4";
+    my $omp4_filename = &util::filename_cat($output_dir,$omp4_file);
+
+
+    #my $exp_duration = $self->{'exp_duration'};
+    #my $t_opt = (defined $exp_duration) ? "-t $exp_duration" : "";
+
+
+    
+    my $size;   
+    # Looks for empty string as well as fullsize string
+    if(!$streaming_HQ_size || $streaming_HQ_size eq "fullsize") { 
+        $size = "--strict-anamorphic";
+    } else {
+        $size = "-w $streaming_HQ_size --loose-anamorphic";
+    }
+    
+
+    my $ivideo_filename_gsdlenv = $self->gsdlhome_independent($ivideo_filename);
+    my $omp4_filename_gsdlenv = $self->gsdlhome_independent($omp4_filename);
+    
+    my $pre_opts = "--decomb -t 1 -c 1";
+    my $post_opts = "-f mp4 $size -O -e x264 -b $streaming_HQ_VideoBitrate -a 1 -E faac -6 dpl2 -B $streaming_HQ_AudioBitrate -D 0.0 -x ref=2:bframes=2:me-umh -v 1";
+    
+    my $handbrake_cmd = "HandbrakeCLI.exe -i \"$ivideo_filename_gsdlenv\" $pre_opts -o \"$omp4_filename_gsdlenv\" $post_opts";
+
+
+    return ($handbrake_cmd,$omp4_filename,$omp4_file);
+}
+
+
+
 sub stream_flv_video_cmd
 {
@@ -889 +946 @@
 }
 
+sub enable_h264_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 H264 video file format for streaming purposes using the cache feature if used
+
+    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_HQ_size    = $self->{'streamingHQsize'};
+    my $streaming_HQ_VideoBitrate    = $self->{'streamingHQVideoBitrate'};
+    my $streaming_HQ_AudioBitrate    = $self->{'streamingHQAudioBitrate'};
+    
+  ##  my $streaming_quality = "high";
+    
+    my ($stream_cmd,$oflash_filename,$oflash_file) 
+    = $self->stream_mp4_video_cmd($originalfilename || $filename,
+                     $streaming_HQ_size,
+                     $streaming_HQ_VideoBitrate,
+                     $streaming_HQ_AudioBitrate);
+    
+    
+    my $streamable_options = { @{$self->{'handbrake_monitor'}},
+                               '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);
+    
+    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);
+    
+    #add the metadata for the resulting file that should be open inside the flash video player
+    $doc_obj->add_utf8_metadata ($section, "streamablevideo", $streamable_url_safe);
+    $doc_obj->associate_file($oflash_filename,$oflash_file,"video/mp4",
+                 $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