changes.

[IRC.git] / Robust / src / Benchmarks / SSJava / MP3DecoderInfer / LayerIIIDecoder.java

diff --git a/Robust/src/Benchmarks/SSJava/MP3DecoderInfer/LayerIIIDecoder.java b/Robust/src/Benchmarks/SSJava/MP3DecoderInfer/LayerIIIDecoder.java
index d0f217dc8c3a872909493a3c132b69bb5ae9c6fb..bd57283d15780f7c98f84901a5c5038f403c3127 100644 (file)
--- a/Robust/src/Benchmarks/SSJava/MP3DecoderInfer/LayerIIIDecoder.java
+++ b/Robust/src/Benchmarks/SSJava/MP3DecoderInfer/LayerIIIDecoder.java
@@ -197,8 +197,7 @@ final class LayerIIIDecoder implements FrameDecoder {
     channels = (header.mode() == Header.SINGLE_CHANNEL) ? 1 : 2;
     max_gr = (header.version() == Header.MPEG1) ? 2 : 1;
 
-    sfreq = header.sample_frequency() + ((header.version() == Header.MPEG1) ? 3
-        : (header.version() == Header.MPEG25_LSF) ? 6 : 0); // SZD
+    sfreq = header.sample_frequency() + ((header.version() == Header.MPEG1) ? 3 : (header.version() == Header.MPEG25_LSF) ? 6 : 0); // SZD
 
     if (channels == 2) {
       switch (which_channels) {
@@ -1068,10 +1067,10 @@ final class LayerIIIDecoder implements FrameDecoder {
 
   private void huffman_decode(int part2_start_local, int ch, int gr) {
 
-    int x[] = new int[1];
-    int y[] = new int[1];
-    int v[] = new int[1];
-    int w[] = new int[1];
+    int[] x = new int[1];
+    int[] y = new int[1];
+    int[] v = new int[1];
+    int[] w = new int[1];
 
     int part2_3_end = part2_start_local + si.ch[ch].gr[gr].part2_3_length;
     int num_bits;
@@ -1204,8 +1203,7 @@ final class LayerIIIDecoder implements FrameDecoder {
   //
 
   // ssjava
-  private void dequantize_sample(
-  /* float xr[][], */int ch, int gr) {
+  private void dequantize_sample(int ch, int gr) {
 
     // gr_info_s gr_info = (si.ch[ch].gr[gr]); remove alias!
     int cb = 0;
@@ -1367,7 +1365,7 @@ final class LayerIIIDecoder implements FrameDecoder {
   // ssjava
   //
 
-  private void reorder(/* float xr[][], */int ch, int gr) {
+  private void reorder(int ch, int gr) {
     // the purpose of reordering: move 'short samples' back to their original
     // position
     // after reorder, the samples are no long ordered by frequency
@@ -1952,7 +1950,24 @@ final class LayerIIIDecoder implements FrameDecoder {
     float tmpf_16;
     float tmpf_17;
 
-    tmpf_0 = tmpf_1 = tmpf_2 = tmpf_3 = tmpf_4 = tmpf_5 = tmpf_6 = tmpf_7 = tmpf_8 = tmpf_9 = tmpf_10 = tmpf_11 = tmpf_12 = tmpf_13 = tmpf_14 = tmpf_15 = tmpf_16 = tmpf_17 = 0.0f;
+    tmpf_0 = 0.0f;
+    tmpf_1 = 0.0f;
+    tmpf_2 = 0.0f;
+    tmpf_3 = 0.0f;
+    tmpf_4 = 0.0f;
+    tmpf_5 = 0.0f;
+    tmpf_6 = 0.0f;
+    tmpf_7 = 0.0f;
+    tmpf_8 = 0.0f;
+    tmpf_9 = 0.0f;
+    tmpf_10 = 0.0f;
+    tmpf_11 = 0.0f;
+    tmpf_12 = 0.0f;
+    tmpf_13 = 0.0f;
+    tmpf_14 = 0.0f;
+    tmpf_15 = 0.0f;
+    tmpf_16 = 0.0f;
+    tmpf_17 = 0.0f;
 
     if (block_type == 2) {
 
@@ -2384,7 +2399,7 @@ final class LayerIIIDecoder implements FrameDecoder {
    * 12, 13, 14, 15, 16, 17 };
    */
 
-  private static/* final */int reorder_table[][]/* = loadReorderTable() */; // SZD:
+  private static final int reorder_table[][]/* = loadReorderTable() */; // SZD:
 
   // will
   // be
@@ -2403,7 +2418,7 @@ final class LayerIIIDecoder implements FrameDecoder {
    * ExceptionInInitializerError(ex); } }
    */
 
-  static int[] reorder(int scalefac_band[]) { // SZD: converted from
+  static int[] reorder(int[] scalefac_band) { // SZD: converted from
                                               // LAME
     int j = 0;
     int ix[] = new int[576];