diff options
| author | Christian König <[email protected]> | 2013-08-05 11:41:27 -0600 |
|---|---|---|
| committer | Christian König <[email protected]> | 2014-02-13 11:11:24 +0100 |
| commit | 0ef3ce415522c77f11477c340efeef7b61cb8cb3 (patch) | |
| tree | eded5723a185e5b682816b5bb32b0074a961c91c /src/gallium/state_trackers/omx/entrypoint.c | |
| parent | 9ff0cf903dc4ed806961d1e099d1308322092892 (diff) | |
st/omx: initial OpenMAX H264 encoder v7
v2 (chk): fix eos handling
v3 (leo): implement scaling configuration support
v4 (leo): fix bitrate bug
v5 (chk): add workaround for bug in Bellagio
v6 (chk): fix div by 0 if framerate isn't known,
user separate pipe object for scale and transfer,
always flush the transfer pipe before encoding
v7 (chk): make suggested changes, cleanup a bit more,
only advertise encoder on supported hardware
Signed-off-by: Christian König <[email protected]>
Signed-off-by: Leo Liu <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers/omx/entrypoint.c')
| -rw-r--r-- | src/gallium/state_trackers/omx/entrypoint.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/omx/entrypoint.c b/src/gallium/state_trackers/omx/entrypoint.c index fb46849bf66..52b2495dd99 100644 --- a/src/gallium/state_trackers/omx/entrypoint.c +++ b/src/gallium/state_trackers/omx/entrypoint.c @@ -41,6 +41,7 @@ #include "entrypoint.h" #include "vid_dec.h" +#include "vid_enc.h" pipe_static_mutex(omx_lock); static Display *omx_display = NULL; @@ -52,13 +53,19 @@ int omx_component_library_Setup(stLoaderComponentType **stComponents) OMX_ERRORTYPE r; if (stComponents == NULL) - return 1; + return 2; + /* component 0 - video decoder */ r = vid_dec_LoaderComponent(stComponents[0]); if (r != OMX_ErrorNone) return r; - return 1; + /* component 1 - video encoder */ + r = vid_enc_LoaderComponent(stComponents[1]); + if (r != OMX_ErrorNone) + return r; + + return 2; } struct vl_screen *omx_get_screen(void) |