Changeset 20344 for extensions

Timestamp:

2009-08-20T16:50:11+12:00 (15 years ago)

Author:

max

Message:

Change ffmpeg_monitor_init to unbuffered_monitor_init and add handbrake_monitor_line that will display some Handbrake feedback

File:

• extensions/gsdl-video/trunk/perllib/plugins/MultimediaConverter.pm (modified) (5 diffs)

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

@@ -144 +144 @@
     }
                   
-    my @ffmpeg_monitor   = ( 'monitor_init'   , "MultimediaConverter::ffmpeg_monitor_init",
+    my @ffmpeg_monitor   = ( 'monitor_init'   , "MultimediaConverter::unbuffered_monitor_init",
                  'monitor_line'   , "MultimediaConverter::ffmpeg_monitor_line",
-                 'monitor_deinit' , "MultimediaConverter::ffmpeg_monitor_deinit" );
+                 'monitor_deinit' , "MultimediaConverter::unbuffered_monitor_deinit" );
                     
                     
     $self->{'ffmpeg_monitor'} = \@ffmpeg_monitor;
 
+  my @handbrake_monitor   = ( 'monitor_init'   , "MultimediaConverter::unbuffered_monitor_init",
+                 'monitor_line'   , "MultimediaConverter::handbrake_monitor_line",
+                 'monitor_deinit' , "MultimediaConverter::unbuffered_monitor_deinit" );
+                    
+                    
+    $self->{'handbrake_monitor'} = \@handbrake_monitor;
 
 }
@@ -238 +244 @@
 
 
-sub ffmpeg_monitor_init
+sub unbuffered_monitor_init
 {
     my $saved_record_sep = $/;
@@ -254 +260 @@
 
 
-sub ffmpeg_monitor_deinit
+sub unbuffered_monitor_deinit
 {
     my ($saved_rec) = @_;
@@ -272 +278 @@
     my $had_error = 0;
     my $generate_dot = 0;
-
+    
     if ($line =~ m/^frame=/) 
     {
@@ -282 +288 @@
 
 
-
+sub handbrake_monitor_line
+{
+    my ($line) = @_;
+    
+    my $had_error = 0;
+    my $generate_dot = 0;
+    
+    if ($line =~ m/^Encoding:/) 
+    {
+        print STDERR $line;
+    }
+    else {
+        $generate_dot = 1;
+    }
+
+    return ($had_error,$generate_dot);
+}
 
 1;