#endif
CHECK_ERR();
+ *pp_handle = anb;
+
+ return 0;
+}
+
+int IOMXHWBuffer_Lock( void *window, void *p_handle )
+{
+ ANativeWindow *anw = (ANativeWindow *)window;
+ ANativeWindowBuffer_t *anb = (ANativeWindowBuffer_t *)p_handle;
+ status_t err = NO_ERROR;
+
+ CHECK_ANW();
+ CHECK_ANB();
+
#if ANDROID_API >= 18
err = anw->lockBuffer_DEPRECATED( anw, anb );
#else
#endif
CHECK_ERR();
- *pp_handle = anb;
-
return 0;
}
if( !(pf_enable_graphic_buffers && pf_get_graphic_buffer_usage &&
pf_omx_hwbuffer_connect && pf_omx_hwbuffer_disconnect &&
pf_omx_hwbuffer_setup && pf_omx_hwbuffer_setcrop &&
- pf_omx_hwbuffer_dequeue && pf_omx_hwbuffer_queue &&
- pf_omx_hwbuffer_cancel &&
+ pf_omx_hwbuffer_dequeue && pf_omx_hwbuffer_lock &&
+ pf_omx_hwbuffer_queue && pf_omx_hwbuffer_cancel &&
((OMX_COMPONENTTYPE*)p_port->omx_handle)->UseBuffer) )
{
msg_Warn( p_dec, "direct output port enabled but can't find "
if( p_header && p_port->p_hwbuf->i_states[i] == BUF_STATE_OWNED )
{
+ if( pf_omx_hwbuffer_lock( p_port->p_hwbuf->window,
+ p_header->pBuffer ) != 0 )
+ {
+ msg_Err( p_dec, "lock failed" );
+ HWBUFFER_UNLOCK();
+ return -1;
+ }
OMX_DBG( "FillThisBuffer %p, %p", p_header, p_header->pBuffer );
OMX_FillThisBuffer( p_port->omx_handle, p_header );
}
* we call the dequeue function if there is at least one buffer
* available. */
err = pf_omx_hwbuffer_dequeue( p_port->p_hwbuf->window, &p_handle );
+ if( err == 0 )
+ err = pf_omx_hwbuffer_lock( p_port->p_hwbuf->window, p_handle );
HWBUFFER_LOCK();
unsigned int *);
int (*pf_omx_hwbuffer_setcrop) (void *, int, int, int, int);
int (*pf_omx_hwbuffer_dequeue) (void *, void **);
+int (*pf_omx_hwbuffer_lock) (void *, void *);
int (*pf_omx_hwbuffer_queue) (void *, void *);
int (*pf_omx_hwbuffer_cancel) (void *, void *);
pf_omx_hwbuffer_setup = dlsym( dll_handle, "OMXHWBuffer_Setup" );
pf_omx_hwbuffer_setcrop = dlsym( dll_handle, "OMXHWBuffer_Setcrop" );
pf_omx_hwbuffer_dequeue = dlsym( dll_handle, "OMXHWBuffer_Dequeue" );
+ pf_omx_hwbuffer_lock = dlsym( dll_handle, "OMXHWBuffer_Lock" );
pf_omx_hwbuffer_queue = dlsym( dll_handle, "OMXHWBuffer_Queue" );
pf_omx_hwbuffer_cancel = dlsym( dll_handle, "OMXHWBuffer_Cancel" );
#endif
unsigned int *);
int (*pf_omx_hwbuffer_setcrop) (void *, int, int, int, int);
int (*pf_omx_hwbuffer_dequeue) (void *, void **);
+int (*pf_omx_hwbuffer_lock) (void *, void *);
int (*pf_omx_hwbuffer_queue) (void *, void *);
int (*pf_omx_hwbuffer_cancel) (void *, void *);