Mesa (master): st/omx: provide constant number of components
Emil Velikov
evelikov at kemper.freedesktop.org
Thu Jun 26 13:05:25 UTC 2014
Module: Mesa
Branch: master
Commit: 9a9742f92c9ad9d8af7fbddc96a18157f7945d61
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a9742f92c9ad9d8af7fbddc96a18157f7945d61
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Tue Jun 10 02:28:00 2014 +0100
st/omx: provide constant number of components
The number of components and their names/roles should
be kept constant as all of that information cached.
Note: Make sure to rebuild the .omxregister file, by executing
$ omxregister-bellagio.
Cc: Leo Liu <leo.liu at amd.com>
Cc: Christian König <christian.koenig at amd.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
src/gallium/state_trackers/omx/entrypoint.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/gallium/state_trackers/omx/entrypoint.c b/src/gallium/state_trackers/omx/entrypoint.c
index d6f149e..a765666 100644
--- a/src/gallium/state_trackers/omx/entrypoint.c
+++ b/src/gallium/state_trackers/omx/entrypoint.c
@@ -51,22 +51,21 @@ static unsigned omx_usecount = 0;
int omx_component_library_Setup(stLoaderComponentType **stComponents)
{
OMX_ERRORTYPE r;
- unsigned i = 0;
if (stComponents == NULL)
return 2;
/* component 0 - video decoder */
- r = vid_dec_LoaderComponent(stComponents[i]);
- if (r == OMX_ErrorNone)
- ++i;
+ r = vid_dec_LoaderComponent(stComponents[0]);
+ if (r != OMX_ErrorNone)
+ return OMX_ErrorInsufficientResources;
/* component 1 - video encoder */
- r = vid_enc_LoaderComponent(stComponents[i]);
- if (r == OMX_ErrorNone)
- ++i;
+ r = vid_enc_LoaderComponent(stComponents[1]);
+ if (r != OMX_ErrorNone)
+ return OMX_ErrorInsufficientResources;
- return i;
+ return 2;
}
struct vl_screen *omx_get_screen(void)
More information about the mesa-commit
mailing list