diff options
| author | Andreas Huber <andih@google.com> | 2010-05-10 09:49:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-10 09:49:24 -0700 |
| commit | b1ccb623d9db42c451aa9dd4e8cf0e76b164aa50 (patch) | |
| tree | 47d13e256ed308eafc7815179266b73835c6e770 /media/libstagefright/OMXCodec.cpp | |
| parent | 35a055b8bfc6f3cbea409b2897caf936654519cb (diff) | |
| parent | ee7ff20e69498ebd53dd9717a0f984188341a75e (diff) | |
| download | frameworks_av-b1ccb623d9db42c451aa9dd4e8cf0e76b164aa50.zip frameworks_av-b1ccb623d9db42c451aa9dd4e8cf0e76b164aa50.tar.gz frameworks_av-b1ccb623d9db42c451aa9dd4e8cf0e76b164aa50.tar.bz2 | |
am 17078510: am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo
Merge commit '1707851090e6512a77247b0c260dd673ef687589' into kraken
* commit '1707851090e6512a77247b0c260dd673ef687589':
A new OggExtractor/VorbisDecoder combo to support approximate seeking.
Diffstat (limited to 'media/libstagefright/OMXCodec.cpp')
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index b7d6d42..ce4dd32 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -25,6 +25,7 @@ #include "include/AVCDecoder.h" #include "include/M4vH263Decoder.h" #include "include/MP3Decoder.h" +#include "include/VorbisDecoder.h" #include "include/ESDS.h" @@ -67,6 +68,7 @@ FACTORY_CREATE(AMRWBDecoder) FACTORY_CREATE(AACDecoder) FACTORY_CREATE(AVCDecoder) FACTORY_CREATE(M4vH263Decoder) +FACTORY_CREATE(VorbisDecoder) FACTORY_CREATE(AMRNBEncoder) static sp<MediaSource> InstantiateSoftwareCodec( @@ -83,6 +85,7 @@ static sp<MediaSource> InstantiateSoftwareCodec( FACTORY_REF(AACDecoder) FACTORY_REF(AVCDecoder) FACTORY_REF(M4vH263Decoder) + FACTORY_REF(VorbisDecoder) FACTORY_REF(AMRNBEncoder) }; for (size_t i = 0; @@ -123,6 +126,7 @@ static const CodecInfo kDecoderInfo[] = { { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.TI.Video.Decoder" }, { MEDIA_MIMETYPE_VIDEO_AVC, "AVCDecoder" }, // { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.PV.avcdec" }, + { MEDIA_MIMETYPE_AUDIO_VORBIS, "VorbisDecoder" }, }; static const CodecInfo kEncoderInfo[] = { |