Changeset 21825

Timestamp:

2010-03-26T12:34:09+13:00 (14 years ago)

Author:

max

Message:

Allow to not keep the original file
Two settings for streaming (flv or mp4)

File:

• gs2-extensions/video/trunk/perllib/plugins/VideoPlugin.pm (modified) (4 diffs)

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

@@ -176 +176 @@
     
 ###    print STDERR "**** creating thumbnail: $thumbnail_width x $thumbnail_height\n";
-
+    my $ofilename = $self->get_ovideo_filename($self->{'enable_streaming'});
     my ($thumb_cmd ,$othumb_filename)
-    = $self->keyframe_thumbnail_cmd($filename,$thumbnailfile,$thumbnail_width,$thumbnail_height);
+    = $self->keyframe_thumbnail_cmd($ofilename,$thumbnailfile,$thumbnail_width,$thumbnail_height);
     
     my $thumb_options = { 'verbosity' => $verbosity,
@@ -337 +337 @@
     }
 
-    my ($video_type, $video_width, $video_height, $video_duration, $video_size,
-    $vcodec,$vfps,$atype,$afreq,$achan,$arate) 
+    my ($video_type, $video_width, $video_height, $video_duration, $durationDisplay, $video_size,
+    $vcodec,$vrate,$vfps,$atype,$afreq,$achan,$arate) 
     = &VideoConverter::identify($filename, $outhandle, $verbosity);
 
-    if ($vfps eq "unknown") {
-    print $outhandle "Unknown framerate, defaulting to 25 frames per second.\n";
-    $vfps = 25;
-    }
-
-    my ($dur_hour,$dur_min,$dur_sec) 
-    = ($video_duration =~ m/(\d+):(\d+):(\d+\.\d+)/);
-    my $total_dur_secs = $dur_hour*3600 + $dur_min*60 + $dur_sec;
+    #if ($vfps eq "unknown") {
+    #print $outhandle "Unknown framerate, defaulting to 25 frames per second.\n";
+    #$vfps = 25;
+    #}
+
+    #my ($dur_hour,$dur_min,$dur_sec) 
+    #= ($video_duration =~ m/(\d+):(\d+):(\d+\.\d+)/);
+    #my $total_dur_secs = $dur_hour*3600 + $dur_min*60 + $dur_sec;
+    
+    my $total_dur_secs = $video_duration / 1000;
 
     $self->{'video-fps'} = $vfps;
@@ -519 +521 @@
     $doc_obj->add_metadata ($section, "srcicon", "[VideoType]");
 
+    
     # Add the original file as an associated file
-    # $doc_obj->associate_file($filename,$file,"video/$type",$section);
+    if ($self->{'keep_original_video'} eq "true") {
+        $doc_obj->associate_file($filename,$file,"video/$type",$section);
+    }
 
 
     if ($self->{'extract_keyframes'}) {
-    $self->extract_keyframes($doc_obj,$originalfilename,$filename);
+        $self->extract_keyframes($doc_obj,$originalfilename,$filename);
     }
 
     my $streamable_regenerated = 0;
-
-    if ($self->{'enable_flv_streaming'} && !$self->{'enable_mp4_streaming'}) {  
+    
+    # Create a VP6+MP3 streaming ready video file with FFMpeg
+    if ($self->{'enable_streaming'} eq "flv") { 
         $streamable_regenerated 
             = $self->enable_full_streaming($doc_obj,
@@ -537 +543 @@
     }
 
-    # Create an H264+ACC video file with Handbrake
-      if ($self->{'enable_mp4_streaming'}) {    
+    # Create an H264+ACC streaming ready video file with Handbrake
+    if ($self->{'enable_streaming'} eq "mp4") {
         $streamable_regenerated 
             = $self->enable_h264_streaming($doc_obj,