diff --git a/‎include/oboe/Utilities.h‎
Lines changed: 2 additions & 0 deletions b/‎include/oboe/Utilities.h‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/common/QuirksManager.cpp‎
Lines changed: 8 additions & 0 deletions b/‎src/common/QuirksManager.cpp‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/common/Utilities.cpp‎
Lines changed: 10 additions & 0 deletions b/‎src/common/Utilities.cpp‎
Lines changed: 10 additions & 0 deletions
@@ -94,6 +94,8 @@ bool isAtLeastPreReleaseCodename(const std::string& codename);
 
 int getChannelCountFromChannelMask(ChannelMask channelMask);
 
+bool isCompressedFormat(AudioFormat format);
+
 } // namespace oboe
 
 #endif //OBOE_UTILITIES_H
@@ -16,6 +16,7 @@
 
 #include <oboe/AudioStreamBuilder.h>
 #include <oboe/Oboe.h>
+#include <oboe/Utilities.h>
 
 #include "OboeDebug.h"
 #include "QuirksManager.h"
@@ -201,13 +202,20 @@ bool QuirksManager::isConversionNeeded(
     const bool isInput = builder.getDirection() == Direction::Input;
     const bool isFloat = builder.getFormat() == AudioFormat::Float;
     const bool isIEC61937 = builder.getFormat() == AudioFormat::IEC61937;
+    const bool isCompressed = isCompressedFormat(builder.getFormat());
 
     // There should be no conversion for IEC61937. Sample rates and channel counts must be set explicitly.
     if (isIEC61937) {
         LOGI("QuirksManager::%s() conversion not needed for IEC61937", __func__);
         return false;
     }
 
+    if (isCompressed) {
+        LOGI("QuirksManager::%s() conversion not needed for compressed format %d",
+             __func__, builder.getFormat());
+        return false;
+    }
+
     // There are multiple bugs involving using callback with a specified callback size.
     // Issue #778: O to Q had a problem with Legacy INPUT streams for FLOAT streams
     // and a specified callback size. It would assert because of a bad buffer size.
 
@@ -17,6 +17,7 @@
 
 #include <stdlib.h>
 #include <unistd.h>
+#include <set>
 #include <sstream>
 
 #ifdef __ANDROID__
@@ -344,4 +345,13 @@ int getChannelCountFromChannelMask(ChannelMask channelMask) {
     return __builtin_popcount(static_cast<uint32_t>(channelMask));
 }
 
+
+std::set<AudioFormat> COMPRESSED_FORMATS = {
+        AudioFormat::MP3, AudioFormat::AAC_LC, AudioFormat::AAC_HE_V1, AudioFormat::AAC_HE_V2,
+        AudioFormat::AAC_ELD, AudioFormat::AAC_XHE, AudioFormat::OPUS
+};
+bool isCompressedFormat(AudioFormat format) {
+    return COMPRESSED_FORMATS.count(format) != 0;
+}
+
 }// namespace oboe