commit c79827a76f91fd36c2f3d598dc7288f6abb86745
author Andreas Huber <andih@google.com> Tue Jan 05 10:54:55 2010 -0800
committer Andreas Huber <andih@google.com> Tue Jan 05 10:54:55 2010 -0800
tree 542b695315a629fe9f59bc4abf93874d8ecf9700
parent 57d2c3ad1929f0eff7e0abc47c28c09f32ac5494

I must have broken raw-audio decoding in the recent past, this fixes it.

related-to-bug: http://b/issue?id=2352199

media/libstagefright/AwesomePlayer.cpp

diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 9e388f9..6bcdfba 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -26,11 +26,13 @@
 #include <media/stagefright/DataSource.h>
 #include <media/stagefright/FileSource.h>
 #include <media/stagefright/MediaBuffer.h>
+#include <media/stagefright/MediaDefs.h>
 #include <media/stagefright/MediaExtractor.h>
 #include <media/stagefright/MediaDebug.h>
 #include <media/stagefright/MediaSource.h>
 #include <media/stagefright/MetaData.h>
 #include <media/stagefright/OMXCodec.h>
+
 namespace android {
 
 struct AwesomeEvent : public TimedEventQueue::Event {
@@ -516,10 +518,19 @@
         return UNKNOWN_ERROR;
     }
 
-    mAudioSource = OMXCodec::Create(
-            mClient.interface(), source->getFormat(),
-            false, // createEncoder
-            source);
+    sp<MetaData> meta = source->getFormat();
+
+    const char *mime;
+    CHECK(meta->findCString(kKeyMIMEType, &mime));
+
+    if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_RAW)) {
+        mAudioSource = source;
+    } else {
+        mAudioSource = OMXCodec::Create(
+                mClient.interface(), source->getFormat(),
+                false, // createEncoder
+                source);
+    }
 
     if (mAudioSource != NULL) {
         int64_t durationUs;