diff options
author | Andreas Huber <andih@google.com> | 2009-12-16 09:30:55 -0800 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2009-12-17 09:28:15 -0800 |
commit | 134ee6a324c35f39e3576172e4eae4c6de6eb9dc (patch) | |
tree | c402e0b47b926a0ed1bfee9fa2ef16822a19dd45 /media/libstagefright/omx/OMX.cpp | |
parent | 8ae1d0bdcef22f2bdd8d283e0e615f3ba6c3f4cd (diff) | |
download | frameworks_av-134ee6a324c35f39e3576172e4eae4c6de6eb9dc.zip frameworks_av-134ee6a324c35f39e3576172e4eae4c6de6eb9dc.tar.gz frameworks_av-134ee6a324c35f39e3576172e4eae4c6de6eb9dc.tar.bz2 |
Squashed commit of the following:
commit 144b1c40e9cf08a584c50e1bef7ba3f287e81a4f
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 16 09:28:23 2009 -0800
This H264 file shows a certain problem even better.
commit 3245f1f3b7471975aeeb824a756c987abd610f55
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 16 09:20:08 2009 -0800
Using only the QA testfiles now.
commit 074817eb3816c5dd70858a3594e3b92d799d873b
Author: Andreas Huber <andih@google.com>
Date: Tue Dec 15 16:17:39 2009 -0800
Yay, roles are back again now that the API is in place.
commit 6d847e4932cc38301ae27cb7283b7f1553a95457
Author: Andreas Huber <andih@google.com>
Date: Tue Dec 15 13:01:20 2009 -0800
Added commandline option for specifying the random seed for reproducable tests.
commit 62ab37b26336eaa67e49791c41c996acb6acee3f
Author: Andreas Huber <andih@google.com>
Date: Mon Dec 14 10:53:27 2009 -0800
When issuing a seek it is important that only the first MediaSource::read call has the seek option.
commit e77c46644b2fb6862bafa3569f7d304252074f1e
Author: Andreas Huber <andih@google.com>
Date: Mon Dec 7 16:39:07 2009 -0800
Make sure the tests are actually built, sp<OMXCodec> becomes sp<MediaSource>
commit 6df56915bd55a9445b3c6f953d3cc251d81579b8
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 3 14:25:36 2009 -0800
Temporarily disable support for querying the roles of OMX components.
commit 31bb26930df9e3658dea684cedb4b0f1a06a4a88
Author: Andreas Huber <andih@google.com>
Date: Tue Dec 1 13:36:52 2009 -0800
Disregard EOS events, slightly change the way the EOS flag on output buffers is handled.
commit 4c382fbc9aebee8197d5988d04378062809e7c48
Author: Andreas Huber <andih@google.com>
Date: Tue Dec 1 09:37:24 2009 -0800
New random seek test for the codec tests. Fixed "sticky" end-of-output-buffers flag behaviour in OMXCodec.
commit c762eac3e44309592b61a168d66e091cf609fa03
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 3 14:13:43 2009 -0800
Fix a typo.
commit 50540a59b65c7d476b0193c7494cd75895e6ca6d
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 3 09:48:35 2009 -0800
Some more fine tuning of the unit tests, make MPEG4Extractor less verbose.
commit 1157a7e52a0636706caa235abe16d2ff8a0b8140
Author: Andreas Huber <andih@google.com>
Date: Wed Oct 28 12:01:01 2009 -0700
Changes to the IOMX::listNodes API, this now returns the component's roles as well, unit tests now test all components in all supported roles by default.
commit 30fbf2d8c6cb927689f7ba75eb550a81e9df488a
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 26 09:45:26 2009 -0700
Initial check-in of unit tests for OMX components.
Diffstat (limited to 'media/libstagefright/omx/OMX.cpp')
-rw-r--r-- | media/libstagefright/omx/OMX.cpp | 40 |
1 files changed, 14 insertions, 26 deletions
diff --git a/media/libstagefright/omx/OMX.cpp b/media/libstagefright/omx/OMX.cpp index 94dbb6d..8c3f252 100644 --- a/media/libstagefright/omx/OMX.cpp +++ b/media/libstagefright/omx/OMX.cpp @@ -208,39 +208,27 @@ void OMX::binderDied(const wp<IBinder> &the_late_who) { instance->onObserverDied(mMaster); } -#if 0 -static void dumpRoles(OMXMaster *master, const char *name) { - Vector<String8> roles; - OMX_ERRORTYPE err = master->getRolesOfComponent(name, &roles); - - if (err != OMX_ErrorNone) { - LOGE("Could not get roles for component '%s'.", name); - return; - } - - if (roles.isEmpty()) { - LOGE("Component '%s' has NO roles!", name); - return; - } - - LOGI("Component '%s' has the following roles:", name); - - for (size_t i = 0; i < roles.size(); ++i) { - LOGI("%d) %s", i + 1, roles[i].string()); - } -} -#endif - -status_t OMX::listNodes(List<String8> *list) { +status_t OMX::listNodes(List<ComponentInfo> *list) { list->clear(); OMX_U32 index = 0; char componentName[256]; while (mMaster->enumerateComponents( componentName, sizeof(componentName), index) == OMX_ErrorNone) { - list->push_back(String8(componentName)); + list->push_back(ComponentInfo()); + ComponentInfo &info = *--list->end(); - // dumpRoles(mMaster, componentName); + info.mName = componentName; + + Vector<String8> roles; + OMX_ERRORTYPE err = + mMaster->getRolesOfComponent(componentName, &roles); + + if (err == OMX_ErrorNone) { + for (OMX_U32 i = 0; i < roles.size(); ++i) { + info.mRoles.push_back(roles[i]); + } + } ++index; } |