diff options
| author | Andreas Huber <andih@google.com> | 2009-12-07 10:01:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-07 10:01:06 -0800 |
| commit | f553a58425c66a990dbc5f4579c976a0636fc573 (patch) | |
| tree | 3934713b8fb374bf07efa2bc1574f8a77e2f1f5c | |
| parent | 0b1a9f7648a9e57b0eaf6766f73810de94136669 (diff) | |
| parent | 5921fb51e0219ddd7cad439a73495f320c57d50e (diff) | |
| download | frameworks_base-f553a58425c66a990dbc5f4579c976a0636fc573.zip frameworks_base-f553a58425c66a990dbc5f4579c976a0636fc573.tar.gz frameworks_base-f553a58425c66a990dbc5f4579c976a0636fc573.tar.bz2 | |
am 5921fb51: Merge change I91eb0354 into eclair-mr2
Merge commit '5921fb51e0219ddd7cad439a73495f320c57d50e' into eclair-mr2-plus-aosp
* commit '5921fb51e0219ddd7cad439a73495f320c57d50e':
Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.
| -rw-r--r-- | cmds/stagefright/audioloop.cpp | 4 | ||||
| -rw-r--r-- | cmds/stagefright/record.cpp | 4 | ||||
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 2 | ||||
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/cmds/stagefright/audioloop.cpp b/cmds/stagefright/audioloop.cpp index 70ab559..3788e73 100644 --- a/cmds/stagefright/audioloop.cpp +++ b/cmds/stagefright/audioloop.cpp @@ -38,12 +38,12 @@ int main() { meta->setInt32(kKeyMaxInputSize, maxInputSize); } - sp<OMXCodec> encoder = OMXCodec::Create( + sp<MediaSource> encoder = OMXCodec::Create( client.interface(), meta, true /* createEncoder */, source); - sp<OMXCodec> decoder = OMXCodec::Create( + sp<MediaSource> decoder = OMXCodec::Create( client.interface(), meta, false /* createEncoder */, encoder); diff --git a/cmds/stagefright/record.cpp b/cmds/stagefright/record.cpp index a31a5c0..2ec0b70 100644 --- a/cmds/stagefright/record.cpp +++ b/cmds/stagefright/record.cpp @@ -154,7 +154,7 @@ int main(int argc, char **argv) { sp<MetaData> meta = source->getFormat(); - sp<OMXCodec> decoder = OMXCodec::Create( + sp<MediaSource> decoder = OMXCodec::Create( client.interface(), meta, false /* createEncoder */, source); int width, height; @@ -173,7 +173,7 @@ int main(int argc, char **argv) { enc_meta->setInt32(kKeyWidth, width); enc_meta->setInt32(kKeyHeight, height); - sp<OMXCodec> encoder = + sp<MediaSource> encoder = OMXCodec::Create( client.interface(), enc_meta, true /* createEncoder */, decoder); diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index 4199252..351763c 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -33,7 +33,7 @@ struct OMXCodec : public MediaSource, enum CreationFlags { kPreferSoftwareCodecs = 1, }; - static sp<OMXCodec> Create( + static sp<MediaSource> Create( const sp<IOMX> &omx, const sp<MetaData> &meta, bool createEncoder, const sp<MediaSource> &source, diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 670f748..7c77214 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -274,7 +274,7 @@ void OMXCodec::findMatchingCodecs( } // static -sp<OMXCodec> OMXCodec::Create( +sp<MediaSource> OMXCodec::Create( const sp<IOMX> &omx, const sp<MetaData> &meta, bool createEncoder, const sp<MediaSource> &source, |