diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-10 18:08:08 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-10 18:08:08 -0400 |
| commit | c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3 (patch) | |
| tree | 33c7ac42078e308f0bf24ef8c4841663089ab13f /media/libstagefright/MP3Extractor.cpp | |
| parent | 88e3f827e657ef741099b24896c17533fa9ef61e (diff) | |
| parent | e6c409632f773e41f33188272a0072be9fcb783f (diff) | |
| download | frameworks_base-c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3.zip frameworks_base-c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3.tar.gz frameworks_base-c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3.tar.bz2 | |
Merge change 24583 into eclair
* changes:
Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API.
Diffstat (limited to 'media/libstagefright/MP3Extractor.cpp')
| -rw-r--r-- | media/libstagefright/MP3Extractor.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libstagefright/MP3Extractor.cpp b/media/libstagefright/MP3Extractor.cpp index 14f3e0c..7fd699f 100644 --- a/media/libstagefright/MP3Extractor.cpp +++ b/media/libstagefright/MP3Extractor.cpp @@ -23,6 +23,7 @@ #include <media/stagefright/MediaBuffer.h> #include <media/stagefright/MediaBufferGroup.h> #include <media/stagefright/MediaDebug.h> +#include <media/stagefright/MediaDefs.h> #include <media/stagefright/MediaErrors.h> #include <media/stagefright/MediaSource.h> #include <media/stagefright/MetaData.h> @@ -330,7 +331,7 @@ MP3Extractor::MP3Extractor(const sp<DataSource> &source) mMeta = new MetaData; - mMeta->setCString(kKeyMIMEType, "audio/mpeg"); + mMeta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_MPEG); mMeta->setInt32(kKeySampleRate, sample_rate); mMeta->setInt32(kKeyBitRate, bitrate); mMeta->setInt32(kKeyChannelCount, num_channels); @@ -510,7 +511,7 @@ bool SniffMP3( return false; } - *mimeType = "audio/mpeg"; + *mimeType = MEDIA_MIMETYPE_AUDIO_MPEG; *confidence = 0.3f; return true; |