Changeset 25346 for gs2-extensions/video-and-audio/trunk/src/perllib/plugins/AudioConverter.pm

Timestamp:

2012-04-05T15:53:05+12:00 (12 years ago)

Author:

davidb

Message:

Updates to code that take account of changes in the central PM modules

File:

• gs2-extensions/video-and-audio/trunk/src/perllib/plugins/AudioConverter.pm (modified) (3 diffs)

gs2-extensions/video-and-audio/trunk/src/perllib/plugins/AudioConverter.pm

@@ -155 +155 @@
 
 
-sub audio_stream_cmd
+sub audio_stream_ffmpeg_cmd
 {
     my $self = shift (@_);
-    my ($iaudio_filename,
+    my ($iaudio_filename, $ofile_ext,
     $streaming_bitrate,$streaming_size, 
     $opt_streaming_achan, $opt_streaming_arate) = @_;
@@ -171 +171 @@
     my $iaudio_root = $self->{'cached_file_root'};
 
-    my $mp3_file = "${iaudio_root}_stream.mp3";
-    my $mp3_filename = &util::filename_cat($output_dir,$mp3_file);
+    my $op_file = "${iaudio_root}_stream.$ofile_ext";
+    my $op_filename = &util::filename_cat($output_dir,$op_file);
 
     my $exp_duration = $self->{'exp_duration'};
@@ -188 +188 @@
 
     my $iaudio_filename_gsdlenv = $self->gsdlhome_independent($iaudio_filename);
-    my $mp3_filename_gsdlenv = $self->gsdlhome_independent($mp3_filename);
-
-    
-    $ffmpeg_cmd = "ffmpeg -i \"$iaudio_filename_gsdlenv\" $all_opts -y \"$mp3_filename_gsdlenv\"";
-
-    return ($ffmpeg_cmd,$mp3_filename,$mp3_file);
-}
+    my $op_filename_gsdlenv = $self->gsdlhome_independent($op_filename);
+
+    
+    $ffmpeg_cmd = "ffmpeg -i \"$iaudio_filename_gsdlenv\" $all_opts -y \"$op_filename_gsdlenv\"";
+
+    return ($ffmpeg_cmd,$op_filename,$op_file);
+}
+
+
+
+sub stream_mp4_audio_cmd
+{
+    my $self = shift (@_);
+    my ($ivideo_filename,$streaming_HQ_size, $streaming_HQ_AudioBitrate) = @_;
+
+    my $output_dir = $self->{'cached_dir'};
+    my $ivideo_root = $self->{'cached_file_root'};
+
+    my $omp4_file = "${ivideo_root}_aHQstream.mp4";
+    my $omp4_filename = &util::filename_cat($output_dir,$omp4_file);
+
+
+    #my $exp_duration = $self->{'exp_duration'};
+    #my $t_opt = (defined $exp_duration) ? "-t $exp_duration" : "";
+
+    my $deinterlace = $self->{'videoDeinterlacingFilter'};
+    my $video_processing_parameters;    
+    # Use specific resizing algorythms depending if we need to downsize the video resolution or not
+    if(!$streaming_HQ_size || $streaming_HQ_size eq "fullsize") { 
+        $video_processing_parameters = "--strict-anamorphic";
+    } else {
+        $video_processing_parameters = "-w $streaming_HQ_size --loose-anamorphic";
+    }
+    # Use the deinterlace video filter if enabled in the plugin
+    if ($deinterlace eq "true")
+    {
+        $video_processing_parameters .= " --decomb";
+    }
+
+    my $ivideo_filename_gsdlenv = $self->gsdlhome_independent($ivideo_filename);
+    my $omp4_filename_gsdlenv = $self->gsdlhome_independent($omp4_filename);
+    
+    # Generate the pre and post video parameters for Handbrake v0.9.4
+    my $pre_opts = "-t 1 -c 1";
+    my $post_opts = "-f mp4 -O $video_processing_parameters -e x264 -a 1 -E faac -6 dpl2 -R Auto -B $streaming_HQ_AudioBitrate -D 0.0 -x ref=2:bframes=2:subq=6:mixed-refs=0:weightb=0:8x8dct=0:trellis=0";
+
+    my $handbrake_cmd = "HandbrakeCLI.exe -i \"$ivideo_filename_gsdlenv\" $pre_opts -o \"$omp4_filename_gsdlenv\" $post_opts";
+
+    #print STDERR "****\nHandbrake command: $handbrake_cmd\n****\n";
+    
+    return ($handbrake_cmd,$omp4_filename,$omp4_file);
+}
+
+