- Timestamp:
- 2009-06-12T23:07:30+12:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/gsdl-video/trunk/perllib/plugins/TimedHTMLPlugin.pm
r19785 r19828 626 626 627 627 628 ### my $videoconvert629 ### = new videoconvert($base_dir,$src_filename,$verbosity,$outhandle,$exp_duration);630 ### $self->{'videoconvert'} = $videoconvert;631 # ******632 633 628 $self->init_cache_for_file($src_filename); 634 629 630 # TimedHTML streaming isn't as complicated as VideoPlugin or AudioPlugin 631 # => src file is never converted beforehand to another type 632 633 my $convertto_regenerated = 0; 634 my $originalfilename = $src_filename; 635 636 my $streamable_regenerated = 0; 637 638 if ($media_type eq "audio") { 639 $streamable_regenerated = 640 $self->enable_audio_streaming($doc_obj, 641 $originalfilename,$src_filename, 642 $convertto_regenerated); 643 } 644 else { 645 # generate streamable video and audio 646 $streamable_regenerated = 647 $self->enable_full_streaming($doc_obj, 648 $originalfilename,$src_filename, 649 $convertto_regenerated, 650 $video_width,$video_height); 651 } 652 653 $self->{'streamable_regenerated'} = $streamable_regenerated; 654 655 my $base_url = "_httpstreamserverprefix_/collect/[collection]/index/assoc/{If}{[assocfilepath],[assocfilepath],[parent(Top):assocfilepath]}/"; 656 657 $doc_obj->add_metadata ($section, "baseurl",$base_url); 658 659 return; 660 661 #********************* 635 662 #--- 636 663 # Generate the Flash FLV format for streaming purposes … … 655 682 'message' => "Generating streamable video: $oflash_file" }; 656 683 657 my ($streamable_regenerated ,$streamable_result,$streamable_had_error)684 my ($streamable_regenerated2,$streamable_result,$streamable_had_error) 658 685 = $self->run_cached_general_cmd($stream_cmd,$oflash_filename,$streamable_options); 659 686 660 $self->{'streamable_regenerated '} = $streamable_regenerated;687 $self->{'streamable_regenerated2'} = $streamable_regenerated2; 661 688 662 689 if (!$streamable_had_error) { … … 670 697 'message' => "Reprocessing video stream to be seekable by timeline: $oflash_file" }; 671 698 672 if ($streamable_regenerated ) {699 if ($streamable_regenerated2) { 673 700 $self->run_general_cmd($streamseekable_cmd,$streamseekable_options); 674 701 } … … 688 715 # FlowPlayerWhite.swf height+26 pixels 689 716 if ($media_type eq "audio") { 690 $doc_obj->add_metadata ($section, " flashwidth", $video_width);691 $doc_obj->add_metadata ($section, " flashheight", 22 + 100);717 $doc_obj->add_metadata ($section, "audioflashwidth", $video_width); 718 $doc_obj->add_metadata ($section, "audioflashheight", 22 + 100); 692 719 } 693 720 else { … … 697 724 698 725 699 my $base_url = "_httpstreamserverprefix_/collect/[collection]/index/assoc/{If}{[assocfilepath],[assocfilepath],[parent(Top):assocfilepath]}/";700 701 $doc_obj->add_metadata ($section, "baseurl",$base_url );726 my $base_url2 = "_httpstreamserverprefix_/collect/[collection]/index/assoc/{If}{[assocfilepath],[assocfilepath],[parent(Top):assocfilepath]}/"; 727 728 $doc_obj->add_metadata ($section, "baseurl",$base_url2); 702 729 703 730 $self->{'oflash_file'} = $oflash_file; … … 815 842 'message' => "Reprocessing video stream to add cuepoints on timeline: $oflash_file" }; 816 843 817 my $streamable_regenerated = $self->{'streamable_regenerated'};818 819 if ($streamable_regenerated ) {844 my $streamable_regenerated2 = $self->{'streamable_regenerated'}; 845 846 if ($streamable_regenerated2) { 820 847 $self->run_general_cmd($streamcuepts_cmd,$streamcuepts_options); 821 848 }
Note:
See TracChangeset
for help on using the changeset viewer.