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 /cmds/stagefright/record.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 'cmds/stagefright/record.cpp')
| -rw-r--r-- | cmds/stagefright/record.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cmds/stagefright/record.cpp b/cmds/stagefright/record.cpp index 4751580..323d448 100644 --- a/cmds/stagefright/record.cpp +++ b/cmds/stagefright/record.cpp @@ -21,6 +21,7 @@ #include <media/stagefright/CameraSource.h> #include <media/stagefright/MediaBufferGroup.h> #include <media/stagefright/MediaDebug.h> +#include <media/stagefright/MediaDefs.h> #include <media/stagefright/MetaData.h> #include <media/stagefright/MPEG4Extractor.h> #include <media/stagefright/MPEG4Writer.h> @@ -45,7 +46,7 @@ public: sp<MetaData> meta = new MetaData; meta->setInt32(kKeyWidth, mWidth); meta->setInt32(kKeyHeight, mHeight); - meta->setCString(kKeyMIMEType, "video/raw"); + meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_VIDEO_RAW); return meta; } @@ -149,8 +150,8 @@ int main(int argc, char **argv) { #endif sp<MetaData> enc_meta = new MetaData; - // enc_meta->setCString(kKeyMIMEType, "video/3gpp"); - enc_meta->setCString(kKeyMIMEType, "video/mp4v-es"); + // enc_meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_VIDEO_H263); + enc_meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_VIDEO_MPEG4); enc_meta->setInt32(kKeyWidth, width); enc_meta->setInt32(kKeyHeight, height); @@ -228,7 +229,8 @@ int main(int argc, char **argv) { #endif sp<MetaData> encMeta = new MetaData; - encMeta->setCString(kKeyMIMEType, 1 ? "audio/amr-wb" : "audio/mp4a-latm"); + encMeta->setCString(kKeyMIMEType, + 1 ? MEDIA_MIMETYPE_AUDIO_AMR_WB : MEDIA_MIMETYPE_AUDIO_AAC); encMeta->setInt32(kKeySampleRate, kSampleRate); encMeta->setInt32(kKeyChannelCount, kNumChannels); encMeta->setInt32(kKeyMaxInputSize, 8192); |