obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

4 files changed, 668 insertions, 0 deletions

diff --git a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java
new file mode 100644
index 000000000..26fb12b09
--- /dev/null
+++ b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReader.java
@@ -0,0 +1,185 @@
+/*GstAudioFileReader -- GNU Classpath GStreamer AudioFileReader.
+ Copyright (C) 2007 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.javax.sound.sampled.gstreamer.io;
+
+import gnu.java.lang.CPStringBuilder;
+
+import gnu.javax.sound.sampled.gstreamer.GStreamerMixer;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import javax.sound.sampled.AudioFileFormat;
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.UnsupportedAudioFileException;
+import javax.sound.sampled.spi.AudioFileReader;
+
+/**
+ * An implementation of a general AudioFileReader. Uses GStreamer to
+ * parse and retrieve informations about the file passed as input.
+ *
+ * @author Mario Torre <neugens@limasoftware.net>
+ */
+public class GstAudioFileReader
+    extends AudioFileReader
+{
+  @Override
+  public AudioFileFormat getAudioFileFormat(File file)
+      throws UnsupportedAudioFileException, IOException
+  {
+    CPStringBuilder name = new CPStringBuilder(file.getName());
+    String _name = name.substring(name.lastIndexOf(".") + 1);
+
+    return getAudioFileFormat(
+               new BufferedInputStream(new FileInputStream(file)), _name);
+  }
+
+  @Override
+  public AudioFileFormat getAudioFileFormat(InputStream is)
+      throws UnsupportedAudioFileException, IOException
+  {
+    return getAudioFileFormat(is, null);
+  }
+
+  private AudioFileFormat getAudioFileFormat(InputStream is, String extension)
+    throws UnsupportedAudioFileException
+    {
+      AudioFormat format = null;
+      try
+        {
+          format = GstAudioFileReaderNativePeer.getAudioFormat(is);
+        }
+      catch (Exception e)
+        {
+          UnsupportedAudioFileException ex =
+            new UnsupportedAudioFileException("Unsupported encoding.");
+
+          ex.initCause(ex.getCause());
+          throw ex;
+        }
+
+      if (format == null)
+        throw new UnsupportedAudioFileException("Unsupported encoding.");
+
+      String name = format.getProperty(GStreamerMixer.GST_DECODER).toString();
+
+      if (extension == null)
+        {
+          extension =
+            format.getProperty(GStreamerMixer.GST_FILE_EXTENSION).toString();
+        }
+
+      AudioFileFormat.Type type =
+        new AudioFileFormat.Type(name, extension);
+
+      // TODO: we should calculate this in some way. We don't need it, but
+      // application may want to use this data.
+      return new AudioFileFormat(type, format, AudioSystem.NOT_SPECIFIED);
+    }
+
+  @Override
+  public AudioFileFormat getAudioFileFormat(URL url)
+      throws UnsupportedAudioFileException, IOException
+  {
+    return getAudioFileFormat(new BufferedInputStream(url.openStream()));
+  }
+
+  @Override
+  public AudioInputStream getAudioInputStream(File file)
+      throws UnsupportedAudioFileException, IOException
+  {
+    InputStream stream = new FileInputStream(file);
+    long length = file.length();
+
+    AudioFormat format = null;
+
+    try
+      {
+        format = GstAudioFileReaderNativePeer.getAudioFormat(file);
+      }
+    catch (Exception e)
+      {
+        UnsupportedAudioFileException ex =
+          new UnsupportedAudioFileException("Unsupported encoding.");
+
+        ex.initCause(ex.getCause());
+        throw ex;
+      }
+
+    // get the header size
+    if (format == null)
+      throw new UnsupportedAudioFileException("Unsupported encoding.");
+
+    return new AudioInputStream(stream, format, length);
+  }
+
+  @Override
+  public AudioInputStream getAudioInputStream(InputStream is)
+      throws UnsupportedAudioFileException, IOException
+  {
+    AudioFormat format = null;
+
+    try
+      {
+        format = GstAudioFileReaderNativePeer.getAudioFormat(is);
+      }
+    catch (Exception e)
+      {
+        // TODO Auto-generated catch block
+        e.printStackTrace();
+      }
+
+    // get the header size
+    if (format == null)
+      throw new UnsupportedAudioFileException("Unsupported encoding.");
+
+    return new AudioInputStream(is, format, AudioSystem.NOT_SPECIFIED);
+  }
+
+  @Override
+  public AudioInputStream getAudioInputStream(URL url)
+      throws UnsupportedAudioFileException, IOException
+  {
+    return getAudioInputStream(new BufferedInputStream(url.openStream()));
+  }
+}
diff --git a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.java b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.java
new file mode 100644
index 000000000..6345d7654
--- /dev/null
+++ b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileReaderNativePeer.java
@@ -0,0 +1,284 @@
+/*GstAudioFileReaderNativePeer -- GNU Classpath GStreamer AudioFileReader
+  native peer class.
+ Copyright (C) 2007 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.javax.sound.sampled.gstreamer.io;
+
+import gnu.classpath.Pointer;
+import gnu.javax.sound.sampled.gstreamer.GStreamerMixer;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.AudioFormat.Encoding;
+
+/**
+ * GStreamer native peer for GstAudioFileReader.
+ *
+ * @author Mario Torre <neugens@limasoftware.net>
+ */
+final class GstAudioFileReaderNativePeer
+{
+  private static final String GST_ENCODING = "GStreamer Generic Audio Reader";
+
+  private static class GstHeader
+  {
+    /*
+     * NOTE: these properties are accessed by the native code, be careful
+     * if you change them.
+     * Not all the fields are necessarily set.
+     *
+     */
+    public String file = null;
+
+    public String suffix = null;
+
+    public String name = null;
+
+    public String mimetype = null;
+
+    public String endianness = null;
+
+    public String channels = null;
+
+    public String rate = null;
+
+    public String width = null;
+
+    public String depth = null;
+
+    public String isSigned = null;
+
+    public String layer = null;
+
+    public String bitrate = null;
+
+    public String framed = null;
+
+    public String type = null;
+  }
+
+  public static AudioFormat getAudioFormat(File file) throws Exception
+  {
+    GstHeader header = new GstHeader();
+    header.file = file.getAbsolutePath();
+
+    if (!gstreamer_get_audio_format_file(header))
+      return null;
+
+    return getAudioFormat(header);
+  }
+
+  public static AudioFormat getAudioFormat(InputStream is) throws Exception
+  {
+    return getAudioFormat(is, new GstHeader());
+  }
+
+  public static AudioFormat getAudioFormat(URL url) throws Exception
+  {
+    GstHeader header = new GstHeader();
+    header.file = url.toExternalForm();
+
+    return getAudioFormat(url.openStream(), header);
+  }
+
+  private static AudioFormat getAudioFormat(InputStream is, GstHeader header)
+      throws Exception
+  {
+    BufferedInputStream stream = new BufferedInputStream(is);
+    if(!stream.markSupported())
+      throw new IOException("Stream must support marking.");
+
+    stream.mark(0);
+
+    if (!gstreamer_get_audio_format_stream(header, new GstInputStream(stream).
+                                           getNativeClass()))
+      return null;
+
+    return getAudioFormat(header);
+  }
+
+  private static Encoding getEncoding(GstHeader header)
+  {
+    StringBuilder buffer = new StringBuilder();
+
+    if (header.name == null)
+      {
+        buffer.append(GST_ENCODING);
+        if (header.mimetype != null)
+          {
+            buffer.append(" ");
+            buffer.append(header.mimetype);
+          }
+
+        header.name = buffer.toString();
+      }
+    else
+      {
+        // strip the "decoder" word from the name, if any
+        // this is a bit ugly, the alternative would be to still output the
+        // full name of the decoder/demuxer
+        String lowerCase = header.name.toLowerCase();
+        int index = lowerCase.indexOf("decoder");
+        if (index == -1)
+          {
+            index = lowerCase.indexOf("demuxer");
+          }
+
+        if (index == -1)
+          index = lowerCase.length();
+
+        buffer.append(header.name.substring(0, index));
+
+      }
+
+    return new Encoding(buffer.toString().trim());
+  }
+
+  private static AudioFormat getAudioFormat(GstHeader header)
+    throws Exception
+  {
+    int na = AudioSystem.NOT_SPECIFIED;
+
+    /* we use mimetype as an header, but this could have some side effects */
+    Encoding encoding = getEncoding(header);
+
+    float sampleRate = ((header.rate != null) ?
+                         new Float(header.rate).floatValue() : na);
+
+    int sampleSizeInBits = ((header.depth != null) ?
+                             new Integer(header.depth).intValue() : na);
+
+    int channels = ((header.channels != null) ?
+                     new Integer(header.channels).intValue() : na);
+
+    boolean bigEndian = false;
+    if (header.endianness != null)
+      {
+        if (header.endianness.compareTo("4321") == 0)
+          bigEndian = true;
+      }
+
+    String ext = null;
+
+    int frameSize = na;
+    float frameRate = na;
+    String lowerCase = header.name.toLowerCase();
+
+    // FIXME: frameRate = sampleRate in these cases under all the tests so far
+    // but I'm not sure if this is always correct...
+    if (lowerCase.contains("law") || lowerCase.contains("au"))
+      {
+        frameSize = (sampleSizeInBits >> 3) * channels;
+        frameRate = sampleRate;
+        ext = "au";
+      }
+    else if (lowerCase.contains("wav"))
+      {
+        frameSize = ((sampleSizeInBits + 7) / 8) * channels;
+        frameRate = sampleRate;
+        ext = "wav";
+      }
+    else if (lowerCase.contains("iff"))
+      {
+        frameSize = (sampleSizeInBits * channels) / 8;
+        frameRate = sampleRate;
+        ext = "aiff";
+      }
+
+    // write all the additional properties we got to identify
+    // the gstreamer plugin actually used to deal with this stream
+    Map<String, Object> properties = new HashMap<String, Object>();
+    properties.put(GStreamerMixer.GST_BACKEND, true);
+    properties.put(GStreamerMixer.GST_DECODER, header.name);
+    properties.put(GStreamerMixer.GST_TYPE_NAME, encoding.toString());
+    if (ext != null)
+      properties.put(GStreamerMixer.GST_FILE_EXTENSION, ext);
+
+    /* now we put in some of the additional properties if we have them */
+    if (header.type != null) properties.put("type", header.type);
+    if (header.framed != null) properties.put("framed", header.framed);
+    if (header.bitrate != null) properties.put("bitrate", header.bitrate);
+    if (header.isSigned != null) properties.put("isSigned", header.isSigned);
+    if (header.depth != null) properties.put("depth", header.depth);
+    if (header.mimetype != null) properties.put("mimetype", header.mimetype);
+
+    AudioFormat format = new AudioFormat(encoding,
+                                         sampleRate,
+                                         sampleSizeInBits,
+                                         channels,
+                                         frameSize,
+                                         frameRate,
+                                         bigEndian,
+                                         properties);
+    return format;
+  }
+
+  /* ***** native methods ***** */
+
+  /**
+   * Retrieve header information about the stream being played.
+   */
+  native static final
+  protected boolean gstreamer_get_audio_format_stream(GstHeader info,
+                                                      Pointer pointer);
+
+  /**
+   * Retrieve header information about the file being played.
+   */
+  native static final
+  protected boolean gstreamer_get_audio_format_file(GstHeader info);
+
+  /**
+   * Initialize the native peer and enables the object cache.
+   * It is meant to be used by the static initializer.
+   */
+  native private static final void init_id_cache();
+
+  static
+  {
+    System.loadLibrary("gstreamerpeer"); //$NON-NLS-1$
+    init_id_cache();
+  }
+}
diff --git a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileWriter.java b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileWriter.java
new file mode 100644
index 000000000..9b395dca2
--- /dev/null
+++ b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstAudioFileWriter.java
@@ -0,0 +1,80 @@
+/*GstAudioFileWriter -- GNU Classpath GStreamer AudioFileReader.
+ Copyright (C) 2007 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+package gnu.javax.sound.sampled.gstreamer.io;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioFileFormat.Type;
+import javax.sound.sampled.spi.AudioFileWriter;
+
+public class GstAudioFileWriter
+    extends AudioFileWriter
+{
+  @Override
+  public Type[] getAudioFileTypes()
+  {
+    // TODO Auto-generated method stub
+    return null;
+  }
+
+  @Override
+  public Type[] getAudioFileTypes(AudioInputStream ais)
+  {
+    // TODO Auto-generated method stub
+    return null;
+  }
+
+  @Override
+  public int write(AudioInputStream ais, Type type, File out)
+      throws IOException
+  {
+    // TODO Auto-generated method stub
+    return 0;
+  }
+
+  @Override
+  public int write(AudioInputStream ais, Type type, OutputStream os)
+      throws IOException
+  {
+    // TODO Auto-generated method stub
+    return 0;
+  }
+
+}
diff --git a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstInputStream.java b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstInputStream.java
new file mode 100644
index 000000000..56bddcaad
--- /dev/null
+++ b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/io/GstInputStream.java
@@ -0,0 +1,119 @@
+/* GstInputStream.java -- Trampoline class for an InputStream, mean to be used
+ by native code.
+ Copyright (C) 2007 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package gnu.javax.sound.sampled.gstreamer.io;
+
+import gnu.classpath.Pointer;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Encapsulates the functionality of an InputStream Object.
+ *
+ * This class is only meant to be used by the native code, to allow reading
+ * of the given InputStream as part of a the GStreamer InputStream Source
+ * Plugin.
+ *
+ * <strong>Note:</strong> this class will be not garbage collected as the
+ * native code contains strong references to internal fields.
+ * The native layer provides a method that can be called by the C code to
+ * free the resources and to let the garbage collected to handle this class
+ * when not needed anymore.
+ *
+ * @author Mario Torre <neugens@limasoftware.net>
+ */
+public class GstInputStream
+{
+  /** The real InputStream on which to perform reading operations. */
+  private InputStream istream;
+
+  /**
+   * Initialized in the native code, don't change without changes
+   * in the native layer.
+   */
+  private Pointer gstInputStream = null;
+
+  public GstInputStream(InputStream istream)
+  {
+    this.istream = istream;
+    init_instance();
+  }
+
+  public int read(byte[] buf, int off, int len) throws IOException
+  {
+    return this.istream.read(buf, off, len);
+  }
+
+  public int available() throws IOException
+  {
+    return this.istream.available();
+  }
+
+  /**
+   * Return a reference to the GstInputStream native class as a Pointer object.
+   * This method is intended as an helper accessor and the returned pointer
+   * needs to be casted and used in the native code only.
+   *
+   * @return Pointer to the native GstInputStream class.
+   */
+  public Pointer getNativeClass()
+  {
+    return this.gstInputStream;
+  }
+
+  /* native methods */
+
+  /**
+   * Initialize the native peer and enables the object cache.
+   * It is meant to be used by the class constructor.
+   */
+  native private final void init_instance();
+
+  /**
+   * Initialize the native peer and enables the object cache.
+   * It is meant to be used by the static initializer.
+   */
+  native private static final void init_id_cache();
+
+  static
+  {
+    System.loadLibrary("gstreamerpeer"); //$NON-NLS-1$
+    init_id_cache();
+  }
+}