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/MediaDefs.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/MediaDefs.cpp')
-rw-r--r-- | media/libstagefright/MediaDefs.cpp | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/media/libstagefright/MediaDefs.cpp b/media/libstagefright/MediaDefs.cpp new file mode 100644 index 0000000..87b5b24 --- /dev/null +++ b/media/libstagefright/MediaDefs.cpp @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <media/stagefright/MediaDefs.h> + +namespace android { + +const char *MEDIA_MIMETYPE_IMAGE_JPEG = "image/jpeg"; + +const char *MEDIA_MIMETYPE_VIDEO_AVC = "video/avc"; +const char *MEDIA_MIMETYPE_VIDEO_MPEG4 = "video/mp4v-es"; +const char *MEDIA_MIMETYPE_VIDEO_H263 = "video/3gpp"; +const char *MEDIA_MIMETYPE_VIDEO_RAW = "video/raw"; + +const char *MEDIA_MIMETYPE_AUDIO_AMR_NB = "audio/3gpp"; +const char *MEDIA_MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb"; +const char *MEDIA_MIMETYPE_AUDIO_MPEG = "audio/mpeg"; +const char *MEDIA_MIMETYPE_AUDIO_AAC = "audio/mp4a-latm"; +const char *MEDIA_MIMETYPE_AUDIO_RAW = "audio/raw"; + +const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mpeg4"; + +} // namespace android |