Changeset 21335 for gs2-extensions/gsdl-video/trunk/perllib/plugins/VideoConverter.pm

Timestamp:

2009-12-11T00:16:34+13:00 (14 years ago)

Author:

davidb

Message:

Support added for -keep_keyframes option

File:

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

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

@@ -106 +106 @@
     'deft' => "200k",
     'reqd' => "no" },
-      { 'name' => "extractkeyframes",
+      { 'name' => "extract_keyframes",
     'desc' => "{VideoPlugin.extractkeyframes}",
     'type' => "flag",
     'deft' => "0",
+    'reqd' => "no" },
+      { 'name' => "keep_keyframes",
+    'desc' => "{VideoPlugin.keep_keyframes}",
+    'type' => "string",
+    'deft' => "all",
     'reqd' => "no" },
       { 'name' => "streamingsize",
@@ -590 +595 @@
     my $ivideo_root = $self->{'cached_file_root'};
 
+    ## my $cue_filename = &util::filename_cat($output_dir,"on_cue.xml");
+
+    my $flvtool_cmd = "flvtool2 -vUP \"$oflash_filename\"";
+
+    return ($flvtool_cmd,$oflash_filename);
+}
+
+
+sub streamkeyframes_cmd
+{
+    my $self = shift (@_);
+    my ($oflash_filename,$doc_obj,$section) = @_;
+
+    my $assocfilepath 
+    = $doc_obj->get_metadata_element($section,"assocfilepath");
+
+    my $output_dir = $self->{'cached_dir'};
+
     my $cue_filename = &util::filename_cat($output_dir,"on_cue.xml");
-
-    my $flvtool_cmd = "flvtool2 -vUP \"$oflash_filename\"";
+ 
+    my $flvtool_cmd = "flvtool2 -vAUtP \"$cue_filename\"  \"$oflash_filename\"";
 
     return ($flvtool_cmd,$oflash_filename);
@@ -598 +621 @@
 
 
-sub streamkeyframes_cmd
+sub streamkeyframes_cmd_old
 {
     my $self = shift (@_);
@@ -633 +656 @@
     my $cue_filename = &util::filename_cat($output_dir,"on_cue.xml");
 
-    my $video_server = $ENV{'GEXT_VIDEO_SERVER'}; 
-    my $video_prefix = $ENV{'GEXT_VIDEO_PREFIX'};
-
-    my $collect = $ENV{'GSDLCOLLECTION'};
+    ##my $video_server = $ENV{'GEXT_VIDEO_SERVER'}; 
+    ##my $video_prefix = $ENV{'GEXT_VIDEO_PREFIX'};
+
+    ## my $collect = $ENV{'GSDLCOLLECTION'};
 
     ## my $thumbloc = "$video_server$video_prefix/collect/$collect";
@@ -685 +708 @@
     }
     else {
-    # extractkeyframe has either not been switched on, or else had
+    # extract_keyframe has either not been switched on, or else had
     # a problem when running
     # => extract a from 
@@ -770 +793 @@
     my ($self) = shift(@_);
 
-    my ($doc_obj,$section) = @_;
-
-    my $output_dir = $self->{'cached_dir'};
-    my $timeline = $self->{'keyframe_timeline'};
+    my ($doc_obj,$section,$timeline) = @_;
+
+    my $output_dir = $self->{'cached_dir'};
     
     my $count = 1;
@@ -786 +808 @@
                  $section);
     $doc_obj->add_utf8_metadata($section,"KeyframeTimestamp",$timestamp);
+    $doc_obj->add_utf8_metadata($section,"KeyframeFrameNum",$t);
 
     $count++;
     }
 
-    $doc_obj->add_utf8_metadata($section,"NumKeyframes",scalar(@{$self->{'keyframe_fnames'}}));
+    #### $doc_obj->add_utf8_metadata($section,"NumKeyframes",scalar(@{$self->{'keyframe_fnames'}}));
+
+    $doc_obj->add_utf8_metadata($section,"NumKeyframes",scalar(keys %$timeline));
 
 
@@ -933 +958 @@
     my $flashheight = $video_height + 22;
 
-    if ($self->{'extractkeyframes'}) {
+    if ($self->{'extract_keyframes'}) {
     $flashheight += 100;
     }
@@ -1020 +1045 @@
     my $flashheight = $video_height + 22;
 
-    if ($self->{'extractkeyframes'}) {
+    if ($self->{'extract_keyframes'}) {
     $flashheight += 100;
     }