Merge pull request #308 from alnitak/switchToDrMp3

- use dr_mp3.h instead of minimp3.h for MP3 streaming
- fix crash when calling addAudioDataStream before the play #306

Author: alnitak

.vscode/launch.json

@@ -8,7 +8,7 @@
             "name": "Flutter debug",
             "type": "dart",
             "request": "launch",
-            "program": "lib/buffer_stream/websocket.dart",
+            "program": "lib/buffer_stream/web_radio.dart",
             "flutterMode": "debug",
             // "env": {
             //     "NO_OPUS_OGG_LIBS": "1"

.vscode/tasks.json

@@ -3,7 +3,7 @@
     "tasks": [
         {
             "label": "compile linux debug verbose",
-            "command": "cd ${workspaceFolder}/example; flutter build linux -t lib/buffer_stream/websocket.dart --debug --verbose",
+            "command": "cd ${workspaceFolder}/example; flutter build linux -t lib/buffer_stream/web_radio.dart --debug --verbose",
             // "args": ["build", "linux", "--verbose"],
             "type": "shell"
         },

CHANGELOG.md

@@ -1,3 +1,7 @@
+#### 3.3.4 (10 Sep 2025)
+- use of dr_mp3.h instead of minimp3 for streaming MP3
+- fix crash when calling addAudioDataStream before play #306
+
 #### 3.3.3 (4 Sep 2025)
 - fix seek a buffer stream actually seeks at half the wanted position #296
 

example/pubspec.lock

@@ -132,7 +132,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "3.3.2"
+    version: "3.3.3"
   flutter_test:
     dependency: "direct dev"
     description: flutter

lib/src/exceptions/exceptions.dart

@@ -113,7 +113,7 @@ abstract class SoLoudCppException extends SoLoudException {
       case PlayerErrors.streamEndedAlready:
         return const SoLoudStreamEndedAlreadyCppException();
       case PlayerErrors.failedToCreateOpusDecoder:
-        return const SoLoudFailedToCreateOpusDecoderCppException();
+        return const SoLoudFailedToCreateDecoderCppException();
       case PlayerErrors.failedToDecodeOpusPacket:
         return const SoLoudFailedToDecodeOpusPacketCppException();
       case PlayerErrors.bufferStreamCanBePlayedOnlyOnce:

lib/src/exceptions/exceptions_from_cpp.dart

@@ -289,15 +289,15 @@ class SoLoudStreamEndedAlreadyCppException extends SoLoudCppException {
 }
 
 /// An error occurred while creating an Opus decoder.
-class SoLoudFailedToCreateOpusDecoderCppException extends SoLoudCppException {
-  /// Creates a new [SoLoudFailedToCreateOpusDecoderCppException].
-  const SoLoudFailedToCreateOpusDecoderCppException([super.message]);
+class SoLoudFailedToCreateDecoderCppException extends SoLoudCppException {
+  /// Creates a new [SoLoudFailedToCreateDecoderCppException].
+  const SoLoudFailedToCreateDecoderCppException([super.message]);
 
   @override
   String get description =>
-      'Failed to create an Opus decoder. This could happen when some internal '
-      'error occurred while creating the decoder. Maybe not enough memory. '
-      '(on the C++ side).';
+      'Failed to create decoder. This could happen when some internal '
+      'error occurred while creating the decoder. Maybe not enough memory or '
+      'maybe the data is corrupted. (on the C++ side).';
 }
 
 /// An error occurred while decoding Opus data.

pubspec.yaml

@@ -3,7 +3,7 @@ description: >-
   A low-level audio plugin for Flutter,
   mainly meant for games and immersive apps.
   Based on the SoLoud (C++) audio engine.
-version: 3.3.3
+version: 3.3.4
 homepage: https://github.com/alnitak/flutter_soloud
 maintainer: Marco Bavagnoli (@lildeimos)
 platforms:

src/audiobuffer/audiobuffer.cpp

@@ -39,6 +39,15 @@ namespace SoLoud
 	{
 		std::lock_guard<std::mutex> lock(buffer_lock_mutex);
 
+		// When using BufferType::AUTO, samplerate and channels are got from the stream. Hence we need to update them
+		// regardless of how are set by setBufferStream. But these parameters need to be set after the play
+		// function is called and the instance of this class is created.
+		if (mParent->autoTypeSamplerate != 0.f) {
+			mBaseSamplerate = mParent->autoTypeSamplerate;
+			mSamplerate = mParent->autoTypeSamplerate;
+			mChannels = mParent->autoTypeChannels;
+		}
+
 		// This happens when using RELEASED buffer type
 		if (mParent->mBuffer.getFloatsBufferSize() == 0)
 		{
@@ -226,6 +235,9 @@ namespace SoLoud
 		if (pcmFormat.dataType == BufferType::OPUS)
 			pcmFormat.dataType = BufferType::AUTO;
 
+		mInstance = nullptr;
+		autoTypeChannels = 0;
+		autoTypeSamplerate = 0.f;
 		mBytesReceived = 0;
 		mUncompressedBytesReceived = 0;
 		mSampleCount = 0;
@@ -317,7 +329,7 @@ namespace SoLoud
 						  static_cast<const unsigned char *>(aData) + aDataLen);
 			mBytesReceived += aDataLen;
 			// Performing some buffering. We need some data to be added expecially when using opus or mp3.
-			if (buffer.size() > 1024 * 16) // 16 KB of data.
+			if (buffer.size() > 1024 * 32) // 16 KB of data.
 			{
 				// For PCM data we must align the data to the bytes per sample.
 				if (!(mPCMformat.dataType == BufferType::AUTO))
@@ -381,14 +393,13 @@ namespace SoLoud
 					{
 						mPCMformat.sampleRate = sampleRate;
 						mBaseSamplerate = sampleRate;
-						mInstance->mSamplerate = sampleRate;
-						mInstance->mBaseSamplerate = sampleRate;
+						autoTypeSamplerate = sampleRate;
 					}
 					if (channels != -1)
 					{
 						mPCMformat.channels = channels;
 						mChannels = channels;
-						mInstance->mChannels = channels;
+						autoTypeChannels = channels;
 					}
 				}
 

src/audiobuffer/audiobuffer.h

@@ -47,6 +47,8 @@ namespace SoLoud
     ActiveSound* mParent;
     dartOnBufferingCallback_t mOnBufferingCallback;
     dartOnMetadataCallback_t mOnMetadataCallback;
+    unsigned int autoTypeChannels;
+    float autoTypeSamplerate;
     unsigned int mMaxBufferSize;
     int64_t mSampleCount;
     uint64_t mBytesConsumed;