added sox code for SVCD audio resampling, from Joseph A. Caputo <jcaputo1@comcast.net>

Author: ex-nerd

trunk/export_SVCD.pm

@@ -30,8 +30,7 @@ package export_SVCD;
 					};
 		bless($self, $class);
 	# Make sure that we have an mp2 encoder
-		$Prog{mp2_encoder} = find_program('toolame', 'mp2enc');
-		push @{$self->{errors}}, 'You need toolame or mp2enc to export an svcd.' unless ($Prog{mp2_encoder});
+		$Prog{mp2_encoder} = find_program('toolame');
 	# Make sure that we have an mplexer
 		$Prog{mplexer} = find_program('tcmplex', 'mplex');
 		push @{$self->{errors}}, 'You need tcmplex or mplex to export an svcd.' unless ($Prog{mplexer});
@@ -180,12 +179,18 @@ package export_SVCD;
 		}
 	# Now we fork off a process to encode the audio
 		if ($Prog{mp2_encoder} =~ /\btoolame$/) {
-			$sample = $nuv_info{audio_sample_rate} / 1000;
-			$command = "nice -n 19 toolame -s $sample -m j -b $self->{a_bitrate} $self->{fifodir}/audout $self->{tmp_a}";
+		# Resample audio?
+			if ($nuv_info{audio_sample_rate} != 44100) {
+				$command = "nice -n 19 sox -t raw -r $nuv_info{audio_sample_rate} -s -w -c 2 $self->{fifodir}/audout -t raw -r 44100 -s -w -c 2 - resample"
+						  ." | nice -n 19 toolame -s 44.1 -m j -b $self->{a_bitrate} - $self->{tmp_a}";
+			}
+		# Audio is the proper sample rate
+			else {
+				$command = "nice -n 19 toolame -s 44.1 -m j -b $self->{a_bitrate} $self->{fifodir}/audout $self->{tmp_a}";
+			}
 		}
 		else {
-			$command = "nice -n 19 ffmpeg -f s16le -ar $nuv_info{audio_sample_rate} -ac 2 -i $self->{fifodir}/audout -vn -f wav -"
-					  ." | nice -n 19 mp2enc -b $self->{a_bitrate} -r $nuv_info{audio_sample_rate} -s -o $self->{tmp_a}";
+			$command = "nice -n 19 ffmpeg -f s16le -ar $nuv_info{audio_sample_rate} -ac 2 -i $self->{fifodir}/audout -ar 44100 -ab $self->{a_bitrate} -vn -f mp2 $self->{tmp_a}";
 		}
 		if ($DEBUG) {
 			print "\ntoolame command:\n\n$command\n";

trunk/nuvexport

@@ -41,8 +41,9 @@ Super VideoCD's are an mpeg2 enhancement of the original VideoCD format.
 In order to encode an svcd, you need ffmpeg, yuvscaler, and mpeg2enc.  Most of
 these come with the mjpeg package.
 
-You will also need an mp2 audio encoder.  mp2enc comes with mjpeg, but I strongly
-suggest that you grab toolame; it's a much better encoder.
+You will also need an mp2 audio encoder.  I strongly suggest that you grab
+toolame, it's an excellent encoder based on the LAME engine.  If you don't,
+nuvexport will use ffmpeg.
 
 To multiplex the audio and video streams, you can use mjpeg's mplex program, but
 I've had bad luck with this, and suggest that you install transcode in order to
@@ -105,9 +106,9 @@ format and use Microsoft's Windows Media Encoder to encode a WMV file.
 	use export_SVCD;
 	use export_VCD;
 	use export_WMV;
-        use export_Trans_XviD;
-        use export_Trans_VCD;
-        use export_Trans_SVCD;
+	use export_Trans_XviD;
+	use export_Trans_VCD;
+	use export_Trans_SVCD;
 
 # Make sure that we have mythtranscode installed
 	$Prog{mythtranscode} = find_program('mythtranscode');