X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmp3decoder.cpp;h=ec08be7f9a5969bfe2ee67ad81f4a1eb5adf6bbd;hb=85914b1843bd89ca94a722cc26e572089dbd0774;hp=8ddad47032ee08eae3155ec133747773f9546726;hpb=7961a6bc2a735d08a5d1ffeb6772ec3d545cb98c;p=libs%2Fal.git

diff --git a/source/mp3decoder.cpp b/source/mp3decoder.cpp
index 8ddad47..ec08be7 100644
--- a/source/mp3decoder.cpp
+++ b/source/mp3decoder.cpp
@@ -54,8 +54,10 @@ Mp3Decoder::Mp3Decoder(IO::Seekable &io):
 
 	try
 	{
-		decode_frame();
-		format = (priv->frame.header.mode==MAD_MODE_SINGLE_CHANNEL ? MONO16 : STEREO16);
+		if(!fill_input() || !decode(false))
+			throw runtime_error("no mp3 data");
+
+		format = create_format(2, MAD_NCHANNELS(&priv->frame.header));
 		freq = priv->frame.header.samplerate;
 	}
 	catch(...)
@@ -92,17 +94,14 @@ void Mp3Decoder::rewind()
 
 unsigned Mp3Decoder::read(char *buf, unsigned len)
 {
-	unsigned nchan = (format==STEREO16 ? 2 : 1);
+	unsigned nchan = get_n_channels(format);
 	mad_pcm &pcm = priv->synth.pcm;
 
 	unsigned pos = 0;
 	while(pos+2*nchan<=len)
 	{
-		if(read_pos>=pcm.length)
-		{
-			if(!decode_frame())
-				break;
-		}
+		if(read_pos>=pcm.length && !decode(true))
+			break;
 
 		for(unsigned i=0; i<nchan; ++i)
 		{
@@ -135,26 +134,34 @@ bool Mp3Decoder::fill_input()
 	return len;
 }
 
-bool Mp3Decoder::decode_frame()
+bool Mp3Decoder::try_decode(bool full)
 {
-	while(1)
+	if(full)
+		return !mad_frame_decode(&priv->frame, &priv->stream);
+	else
+		return !mad_header_decode(&priv->frame.header, &priv->stream);
+}
+
+bool Mp3Decoder::decode(bool full)
+{
+	while(!try_decode(full))
 	{
-		if(!priv->stream.buffer || priv->stream.error==MAD_ERROR_BUFLEN)
+		if(priv->stream.error==MAD_ERROR_BUFLEN)
+		{
 			if(!fill_input())
 				return false;
-
-		if(!mad_frame_decode(&priv->frame, &priv->stream))
-		{
-			mad_synth_frame(&priv->synth, &priv->frame);
-			read_pos = 0;
-			return true;
 		}
-
-		if(priv->stream.error==MAD_ERROR_BUFLEN)
-			continue;
 		else if(!MAD_RECOVERABLE(priv->stream.error))
 			throw mp3_error("mad_frame_decode", priv->stream.error);
 	}
+
+	if(full)
+	{
+		read_pos = 0;
+		mad_synth_frame(&priv->synth, &priv->frame);
+	}
+
+	return true;
 }
 
 } // namespace AL