Removed unused values and formatting

ps3mediaserver · Jun 21, 2012 · e6e428f · e6e428f
1 parent 878ad2a
commit e6e428f
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/src/main/java/net/pms/encoders/TSMuxerVideo.java b/src/main/java/net/pms/encoders/TSMuxerVideo.java
@@ -289,8 +289,10 @@ public ProcessWrapper launchTranscode(
 							"-srate", "48000",
 							"-o", ffAudioPipe[0].getInputPipe()
 						};
-						if (!params.mediaRenderer.isMuxDTSToMpeg())   // use PCM trick when media renderer does not support DTS in MPEG
-						{
+
+						// Use PCM trick when media renderer does not support DTS in MPEG
+						if (!params.mediaRenderer.isMuxDTSToMpeg()) {
+
 							ffAudioPipe[0].setModifier(sm);
 						}
 					} else {
@@ -365,7 +367,7 @@ public ProcessWrapper launchTranscode(
 									)
 								)
 							) && params.mediaRenderer.isLPCMPlayable();
-						if ( !ac3Remux && (dtsRemux || pcm) ) {
+						if (!ac3Remux && (dtsRemux || pcm)) {
 							StreamModifier sm = new StreamModifier();
 							sm.setPcm(pcm);
 							sm.setDtsembed(dtsRemux);
@@ -465,9 +467,9 @@ public ProcessWrapper launchTranscode(
 		boolean mp4_with_non_h264 = (media.getContainer().equals("mp4") && !media.getCodecV().equals("h264"));
 		if (ffAudioPipe != null && ffAudioPipe.length == 1) {
 			String timeshift = "";
-			boolean ac3Remux = false;
-			boolean dtsRemux = false;
-			boolean pcm = false;
+			boolean ac3Remux;
+			boolean dtsRemux;
+			boolean pcm;
 			boolean ps3_and_stereo_and_384_kbits = (params.mediaRenderer.getRendererName().equalsIgnoreCase("Playstation 3") && params.aid.getNrAudioChannels() == 2) && (params.aid.getBitRate() > 370000 && params.aid.getBitRate() < 400000);
 			ac3Remux = params.aid.isAC3() && !ps3_and_stereo_and_384_kbits && configuration.isRemuxAC3();
 			dtsRemux = configuration.isDTSEmbedInPCM() && params.aid.isDTS() && params.mediaRenderer.isDTSPlayable();
@@ -495,12 +497,10 @@ public ProcessWrapper launchTranscode(
 				// AC3 remux takes priority
 				type = "A_AC3";
 			} else {
-				if ( pcm || this instanceof TsMuxerAudio )
-				{
+				if (pcm || this instanceof TsMuxerAudio) {
 					type = "A_LPCM";
 				}
-				if ( dtsRemux || this instanceof TsMuxerAudio )
-				{
+				if (dtsRemux || this instanceof TsMuxerAudio) {
 					type = "A_LPCM";
 					if (params.mediaRenderer.isMuxDTSToMpeg()) {
 						type = "A_DTS";
@@ -515,9 +515,9 @@ public ProcessWrapper launchTranscode(
 			for (int i = 0; i < media.getAudioCodes().size(); i++) {
 				DLNAMediaAudio lang = media.getAudioCodes().get(i);
 				String timeshift = "";
-				boolean ac3Remux = false;
-				boolean dtsRemux = false;
-				boolean pcm = false;
+				boolean ac3Remux;
+				boolean dtsRemux;
+				boolean pcm;
 				boolean ps3_and_stereo_and_384_kbits = (params.mediaRenderer.getRendererName().equalsIgnoreCase("Playstation 3") && lang.getNrAudioChannels() == 2) && (lang.getBitRate() > 370000 && lang.getBitRate() < 400000);
 				ac3Remux = lang.isAC3() && !ps3_and_stereo_and_384_kbits && configuration.isRemuxAC3();
 				dtsRemux = configuration.isDTSEmbedInPCM() && lang.isDTS() && params.mediaRenderer.isDTSPlayable();