diff options
| author | Andreas Huber <andih@google.com> | 2010-05-24 14:38:02 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-05-24 14:38:02 -0700 |
| commit | 4d1265cd007b9754d0645bc4fb95701140a45648 (patch) | |
| tree | 4e23c4db5564c42b79cb0636241583f0d2a6866e /media/libstagefright/OMXCodec.cpp | |
| parent | 6b19faca7040ba4ef67637801926ead2559c22e9 (diff) | |
| download | frameworks_av-4d1265cd007b9754d0645bc4fb95701140a45648.zip frameworks_av-4d1265cd007b9754d0645bc4fb95701140a45648.tar.gz frameworks_av-4d1265cd007b9754d0645bc4fb95701140a45648.tar.bz2 | |
Squashed commit of the following:
commit a2194ecc341fa0c530d0007d8561286c8b8f2d15
Author: Andreas Huber <andih@google.com>
Date: Fri May 21 12:50:09 2010 -0700
Instead of including the libvpx libraries prebuilt in our tree, build them from sources.
Change-Id: I5ec57decf1200cf9137fe13ff77d06f47950c3d7
commit 711098ca3f16800a22ccdb26a07e57e471cca438
Author: Andreas Huber <andih@google.com>
Date: Thu May 20 15:00:27 2010 -0700
Support for VPX/VP8 decoding in stagefright
Change-Id: I16d93faf3f56a5f8ec39c14367704469f914db9e
related-to-bug: 2483739
Change-Id: Ibc124f6af540c2715cb2325151eecdd6edf085ec
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 928a6c8..66011ca 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -28,6 +28,7 @@ #include "include/M4vH263Decoder.h" #include "include/MP3Decoder.h" #include "include/VorbisDecoder.h" +#include "include/VPXDecoder.h" #include "include/ESDS.h" @@ -76,6 +77,7 @@ FACTORY_CREATE(AACDecoder) FACTORY_CREATE(AVCDecoder) FACTORY_CREATE(M4vH263Decoder) FACTORY_CREATE(VorbisDecoder) +FACTORY_CREATE(VPXDecoder) FACTORY_CREATE_ENCODER(AMRNBEncoder) FACTORY_CREATE_ENCODER(AMRWBEncoder) FACTORY_CREATE_ENCODER(AACEncoder) @@ -118,6 +120,7 @@ static sp<MediaSource> InstantiateSoftwareCodec( FACTORY_REF(AVCDecoder) FACTORY_REF(M4vH263Decoder) FACTORY_REF(VorbisDecoder) + FACTORY_REF(VPXDecoder) }; for (size_t i = 0; i < sizeof(kFactoryInfo) / sizeof(kFactoryInfo[0]); ++i) { @@ -158,6 +161,7 @@ static const CodecInfo kDecoderInfo[] = { { MEDIA_MIMETYPE_VIDEO_AVC, "AVCDecoder" }, // { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.PV.avcdec" }, { MEDIA_MIMETYPE_AUDIO_VORBIS, "VorbisDecoder" }, + { MEDIA_MIMETYPE_VIDEO_VPX, "VPXDecoder" }, }; static const CodecInfo kEncoderInfo[] = { |