diff options
author | Andreas Huber <andih@google.com> | 2009-12-07 18:32:57 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-07 18:32:57 -0800 |
commit | 1d44bea4443050ef39604032dc88334f69e87aa7 (patch) | |
tree | 5128cc4f5119fd44b8aca675762415eb9cc20ca7 /cmds | |
parent | 4454ac76572d79185f54f6f983c846ead7431b39 (diff) | |
parent | f553a58425c66a990dbc5f4579c976a0636fc573 (diff) | |
download | frameworks_base-1d44bea4443050ef39604032dc88334f69e87aa7.zip frameworks_base-1d44bea4443050ef39604032dc88334f69e87aa7.tar.gz frameworks_base-1d44bea4443050ef39604032dc88334f69e87aa7.tar.bz2 |
am f553a584: am 5921fb51: Merge change I91eb0354 into eclair-mr2
Merge commit 'f553a58425c66a990dbc5f4579c976a0636fc573'
* commit 'f553a58425c66a990dbc5f4579c976a0636fc573':
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.
Diffstat (limited to 'cmds')
-rw-r--r-- | cmds/stagefright/audioloop.cpp | 4 | ||||
-rw-r--r-- | cmds/stagefright/record.cpp | 4 |
2 files changed, 4 insertions, 4 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); |