- Timestamp:
- 2009-08-20T17:00:18+12:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/gsdl-video/trunk/perllib/plugins/VideoPlugin.pm
r20111 r20347 118 118 my $self = shift (@_); 119 119 120 return q^(?i)\.(mpe?g|flv|mov|qt|wmv|vob|avi|mp4|m4v )$^;120 return q^(?i)\.(mpe?g|flv|mov|qt|wmv|vob|avi|mp4|m4v|ts)$^; 121 121 } 122 122 … … 257 257 { 258 258 my $self = shift (@_); 259 my ($doc_obj,$filename,$ screenviewtype, $screenview_width,$screenview_height) = @_;259 my ($doc_obj,$filename,$convertto_regenerated, $screenviewtype, $screenview_width,$screenview_height) = @_; 260 260 261 261 my $section = $doc_obj->get_top_section(); … … 264 264 my $ivideo_root = $self->{'cached_file_root'}; 265 265 266 266 my $optionally_run_general_cmd = "run_uncached_general_cmd"; 267 if ($self->{'enable_cache'}) { 268 $optionally_run_general_cmd 269 = ($convertto_regenerated) ? "regenerate_general_cmd" : "run_cached_general_cmd"; 270 } 267 271 # make the screenview image 268 272 … … 276 280 'message' => "Generating screenview image" }; 277 281 278 my ($result,$had_error) 279 = $self->run_general_cmd($screenview_cmd,$screenview_options); 282 283 my ($screenview_regenerated,$screenview_result,$screenview_had_error) 284 = $self->$optionally_run_general_cmd($screenview_cmd,$screenviewfilename,$screenview_options); 285 280 286 281 287 # get screenview dimensions, size and type 282 if ($ result =~ m/[0-9]+x[0-9]+=>([0-9]+)x([0-9]+)/) {288 if ($screenview_result =~ m/[0-9]+x[0-9]+=>([0-9]+)x([0-9]+)/) { 283 289 $doc_obj->add_metadata ($section, "ScreenWidth", $1); 284 290 $doc_obj->add_metadata ($section, "ScreenHeight", $2); … … 481 487 # Also want to set filename as 'Source' metadata to be 482 488 # consistent with other plugins 483 $doc_obj->add_utf8_metadata ($section, "Source", $filemeta_url_safe);489 # $doc_obj->add_utf8_metadata ($section, "Source", $filemeta_url_safe); 484 490 485 491 … … 520 526 my $streamable_regenerated = 0; 521 527 522 if ($self->{'enable_ streaming'}) {523 $streamable_regenerated524 528 if ($self->{'enable_flv_streaming'} && !$self->{'enable_mp4_streaming'}) { 529 $streamable_regenerated 530 = $self->enable_full_streaming($doc_obj, 525 531 $originalfilename,$filename, 526 532 $convertto_regenerated, … … 528 534 } 529 535 536 # Create an H264+ACC video file with Handbrake 537 if ($self->{'enable_mp4_streaming'}) { 538 $streamable_regenerated 539 = $self->enable_h264_streaming($doc_obj, 540 $originalfilename,$filename, 541 $convertto_regenerated, 542 $video_width,$video_height); 543 } 530 544 531 545 my $thumbnailsize = $self->{'thumbnailsize'} || 100; … … 591 605 $screenview_height = int($screenview_height/2) * 2; 592 606 593 $self->extract_screenview($doc_obj,$filename, 607 $self->extract_screenview($doc_obj,$filename, $convertto_regenerated, 594 608 $screenviewtype, 595 609 $screenview_width,$screenview_height);
Note:
See TracChangeset
for help on using the changeset viewer.