X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fio%2FOggVorbisIdentifier.java;fp=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fio%2FOggVorbisIdentifier.java;h=d889b976eaa7be01be16d9c812a3b92a9c609f5d;hb=d0f12db4a8fe02601743e4b23618d44e193fd474;hp=ab732b80e6e2810fcb2567d4662f1e8af57df607;hpb=8c09fba110650c1bab4d7bb813bade45fe2b80f5;p=sonitus.git

diff --git a/src/main/java/net/pterodactylus/sonitus/io/OggVorbisIdentifier.java b/src/main/java/net/pterodactylus/sonitus/io/OggVorbisIdentifier.java
index ab732b8..d889b97 100644
--- a/src/main/java/net/pterodactylus/sonitus/io/OggVorbisIdentifier.java
+++ b/src/main/java/net/pterodactylus/sonitus/io/OggVorbisIdentifier.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
 
 import net.pterodactylus.sonitus.data.Format;
 
+import com.google.common.base.Optional;
 import com.jcraft.jogg.Packet;
 import com.jcraft.jogg.Page;
 import com.jcraft.jogg.StreamState;
@@ -49,10 +50,13 @@ public class OggVorbisIdentifier {
 	 * Format} describing the stream.
 	 *
 	 * @param inputStream
-	 * @return
+	 * 		The input stream to identify as Ogg Vorbis
+	 * @return The identified format, or {@link com.google.common.base.Optional#absent()}
+	 *         if the stream could not be identified
 	 * @throws IOException
+	 * 		if an I/O error occurs
 	 */
-	public static Format identify(InputStream inputStream) throws IOException {
+	public static Optional<Format> identify(InputStream inputStream) throws IOException {
 
 		/* stuff needed to decode Ogg. */
 		Packet packet = new Packet();
@@ -79,7 +83,7 @@ public class OggVorbisIdentifier {
 			syncState.wrote(read);
 			switch (syncState.pageout(page)) {
 				case -1:
-					throw new IdentifierException("Hole in Ogg data!");
+					return Optional.absent();
 				case 1:
 					if (!streamStateInitialized) {
 						/* init stream state. */
@@ -90,11 +94,11 @@ public class OggVorbisIdentifier {
 						streamStateInitialized = true;
 					}
 					if (streamState.pagein(page) == -1) {
-						throw new IdentifierException("Error parsing Ogg data!");
+						return Optional.absent();
 					}
 					switch (streamState.packetout(packet)) {
 						case -1:
-							throw new IdentifierException("Error parsing Ogg data!");
+							return Optional.absent();
 						case 1:
 							info.synthesis_headerin(comment, packet);
 							packetsRead++;
@@ -109,7 +113,7 @@ public class OggVorbisIdentifier {
 			buffer = syncState.data;
 		}
 
-		return new Format(info.channels, info.rate, "Vorbis");
+		return Optional.of(new Format(info.channels, info.rate, "Vorbis"));
 	}
 
 }