- Timestamp:
- 2009-08-20T16:50:11+12:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/gsdl-video/trunk/perllib/plugins/MultimediaConverter.pm
r18995 r20344 144 144 } 145 145 146 my @ffmpeg_monitor = ( 'monitor_init' , "MultimediaConverter:: ffmpeg_monitor_init",146 my @ffmpeg_monitor = ( 'monitor_init' , "MultimediaConverter::unbuffered_monitor_init", 147 147 'monitor_line' , "MultimediaConverter::ffmpeg_monitor_line", 148 'monitor_deinit' , "MultimediaConverter:: ffmpeg_monitor_deinit" );148 'monitor_deinit' , "MultimediaConverter::unbuffered_monitor_deinit" ); 149 149 150 150 151 151 $self->{'ffmpeg_monitor'} = \@ffmpeg_monitor; 152 152 153 my @handbrake_monitor = ( 'monitor_init' , "MultimediaConverter::unbuffered_monitor_init", 154 'monitor_line' , "MultimediaConverter::handbrake_monitor_line", 155 'monitor_deinit' , "MultimediaConverter::unbuffered_monitor_deinit" ); 156 157 158 $self->{'handbrake_monitor'} = \@handbrake_monitor; 153 159 154 160 } … … 238 244 239 245 240 sub ffmpeg_monitor_init246 sub unbuffered_monitor_init 241 247 { 242 248 my $saved_record_sep = $/; … … 254 260 255 261 256 sub ffmpeg_monitor_deinit262 sub unbuffered_monitor_deinit 257 263 { 258 264 my ($saved_rec) = @_; … … 272 278 my $had_error = 0; 273 279 my $generate_dot = 0; 274 280 275 281 if ($line =~ m/^frame=/) 276 282 { … … 282 288 283 289 284 290 sub handbrake_monitor_line 291 { 292 my ($line) = @_; 293 294 my $had_error = 0; 295 my $generate_dot = 0; 296 297 if ($line =~ m/^Encoding:/) 298 { 299 print STDERR $line; 300 } 301 else { 302 $generate_dot = 1; 303 } 304 305 return ($had_error,$generate_dot); 306 } 285 307 286 308 1;
Note:
See TracChangeset
for help on using the changeset viewer.