Changeset 25516 for gs2-extensions/video-and-audio/trunk/src/perllib/plugins/VideoPlugin.pm

Timestamp:

2012-05-02T17:08:23+12:00 (12 years ago)

Author:

davidb

Message:

Code changes prompted by the development of ReplayMe

File:

• gs2-extensions/video-and-audio/trunk/src/perllib/plugins/VideoPlugin.pm (modified) (11 diffs)

gs2-extensions/video-and-audio/trunk/src/perllib/plugins/VideoPlugin.pm

@@ -121 +121 @@
 }
 
-
+ 
 sub extract_keyframes
 {
     my $self = shift (@_);
+    my ($doc_obj,$originalfilename,$filename, $video_width,$video_height) = @_;
+    
+    
+    if ($self->{'keyframes_algorithm'} eq "ffkeyframe") {
+        $self->extract_ffKeyframes($doc_obj,$originalfilename,$filename);
+    }
+    else {
+        $self->extract_mtnKeyframes($doc_obj,$originalfilename,$filename, $video_width,$video_height);
+    }
+}
+    
+  
+sub extract_ffKeyframes
+{
+    my $self = shift (@_);
     my ($doc_obj,$originalfilename,$filename) = @_;
 
@@ -134 +149 @@
     # Generate the keyframes with ffmpeg and hive
     my $ifilename = $originalfilename || $filename;
-    my ($keyframe_cmd,$okeyframe_filename) = $self->keyframe_cmd($ifilename);
+    my ($keyframe_cmd,$okeyframe_filename) = $self->ffKeyframe_cmd($ifilename);
     
     my $keyframe_options = { @{$self->{'ffmpeg_monitor'}},
@@ -150 +165 @@
 }
 
+
+sub extract_mtnKeyframes
+{
+    my $self = shift (@_);
+    my ($doc_obj,$originalfilename,$filename,$video_width,$video_height) = @_;
+
+    my $section = $doc_obj->get_top_section();
+
+    my $output_dir   = $self->{'cached_dir'};
+    my $ivideo_root  = $self->{'cached_file_root'};
+
+    my $verbosity = $self->{'verbosity'};
+    my $outhandle = $self->{'outhandle'};
+    
+    # Generate the keyframes with ffmpeg and hive
+    my $ifilename = $originalfilename || $filename;
+    my ($keyframe_cmd,$okeyframe_filename) = $self->mtnKeyframe_cmd($ifilename, $video_width,$video_height);
+    
+    my $keyframe_options = {  'verbosity' => $verbosity,
+                 'outhandle' => $outhandle,
+                 'message_prefix' => "Keyframe",
+                 'message' => "Extracting keyframes" }; 
+    
+    $self->run_cached_general_cmd($keyframe_cmd,
+                  $ifilename,$okeyframe_filename,
+                  $keyframe_options);
+                  
+    $self->parse_shot_dir();
+
+    my $keep_keyframe_timeline = $self->{'keep_keyframe_timeline'};
+    $self->associate_keyframes($doc_obj,$section,$keep_keyframe_timeline);
+
+}
 
 
@@ -340 +388 @@
     }
 
-    my ($video_type, $video_width, $video_height, $video_duration, $durationDisplay, $video_size,
-    $vcodec,$vrate,$vfps,$atype,$afreq,$achan,$arate) 
-    = &VideoConverter::identify($filename, $outhandle, $verbosity);
-
+    my $identify_hash = &VideoConverter::identifyMI($filename, $outhandle, $verbosity);
+    
+    my $video_type     = $identify_hash->{'vtype'};
+    my $video_width    = $identify_hash->{'width'};
+    my $video_height   = $identify_hash->{'height'};
+    my $video_duration = $identify_hash->{'duration'};
+    my $video_size     = $identify_hash->{'filesize'};
+    my $vcodec         = $identify_hash->{'vcodec'};
+    my $vfps           = $identify_hash->{'fps'};
+    my $atype          = $identify_hash->{'acodec'};
+    my $afreq          = $identify_hash->{'afreq'};
+    my $achan          = $identify_hash->{'achan'};
+    my $arate          = $identify_hash->{'arate'};
+
+    if ($video_duration =~ m/^(\d\d):(\d\d):(\d\d)\.(\d+)$/) {
+      # ffmpeg can generate durations in this form.
+      # MediaInof works in milliseconds, so work to this same resolution
+        $video_duration = ($1*3600 + $2*60 + $3 + ($4/10.0)) * 1000.0;
+    }
 
 #    if ($video_duration =~ m/^(\d\d):(\d\d):(\d\d)\.(\d+)$/) {
@@ -361 +424 @@
     $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;
@@ -505 +564 @@
 
     $file = $file_unicode;
+
 #    my $filemeta = $self->filename_to_utf8_metadata($file);
 #    my $filemeta_url_safe = $self->url_safe($filemeta);
@@ -550 +610 @@
 
 
-    if ($self->{'extract_keyframes'}) {
-        $self->extract_keyframes($doc_obj,$originalfilename,$filename);
+    if ($self->{'create_keyframes'} eq "true") {
+        $self->extract_keyframes($doc_obj,$originalfilename,$filename,$video_width,$video_height);
     }
 
@@ -626 +686 @@
     }
 
-    if ($self->{'extract_keyframes'}) {
+    if (($self->{'create_keyframes'}  eq "true") && ($self->{'create_montage'}  eq "true")) {
     $self->extract_keyframes_montage($doc_obj,$filename,$thumbnailtype);
     }
@@ -686 +746 @@
     ? 1 : 0;
 
-    if (($enable_streaming) && ($self->{'extract_keyframes'})) {
+    if (($enable_streaming) && ($self->{'create_keyframes'} eq "true")) {
     my $section = $doc_obj->get_top_section();
     my $oflash_filename = $self->{'oflash_filename'};
@@ -713 +773 @@
 
 
+sub open_on_cue
+{
+    my ($self) = shift @_;
+    my ($cue_filename) = @_;
+
+    open(CUEOUT,">$cue_filename")
+    || die "Unable to open $cue_filename: $!\n";
+    print CUEOUT "<tags>\n";
+
+}
+
+sub close_on_cue
+{
+    print CUEOUT "</tags>\n";
+    close(CUEOUT);
+}
 
 sub output_distributed_keyframes
@@ -970 +1046 @@
     if ($element eq "seg") {
 
-    $self->output_distributed_keyframes($self->{'keyframe_timeline'},$self->{'keep_keyframes'});
+    $self->output_distributed_keyframes($self->{'keyframe_timeline'},$self->{'ffkeyframe_num_shots'});