Skip to content

V
vlc
Commit 5172eb8d authored by Thomas Guillem's avatar Thomas Guillem Committed by Jean-Baptiste Kempf
Browse files
Options

nativewindowpriv: cosmetics 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent f04fe95f
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
modules/video_output/android/nativewindowpriv.c
View file @ 5172eb8d
...@@ -259,71 +259,71 @@ int ANativeWindowPriv_lock( native_window_priv *priv, void *p_handle ) ...@@ -259,71 +259,71 @@ int ANativeWindowPriv_lock( native_window_priv *priv, void *p_handle )
return 0; return 0;
} }
int ANativeWindowPriv_lockData( native_window_priv *priv, void *p_handle, int ANativeWindowPriv_queue( native_window_priv *priv, void *p_handle )
ANativeWindow_Buffer *p_out_anb )
{ {
ANativeWindowBuffer_t *anb = (ANativeWindowBuffer_t *)p_handle; ANativeWindowBuffer_t *anb = (ANativeWindowBuffer_t *)p_handle;
status_t err = NO_ERROR; status_t err = NO_ERROR;
void *p_data;
CHECK_ANB(); CHECK_ANB();
err = priv->gralloc->lock( priv->gralloc, anb->handle, priv->usage, #if ANDROID_JBMR2_OR_LATER
0, 0, anb->width, anb->height, &p_data ); err = priv->anw->queueBuffer_DEPRECATED( priv->anw, anb );
#else
err = priv->anw->queueBuffer( priv->anw, anb );
#endif
CHECK_ERR(); CHECK_ERR();
if( p_out_anb ) {
p_out_anb->bits = p_data;
p_out_anb->width = anb->width;
p_out_anb->height = anb->height;
p_out_anb->stride = anb->stride;
p_out_anb->format = anb->format;
}
return 0; return 0;
} }
int ANativeWindowPriv_unlockData( native_window_priv *priv, void *p_handle ) int ANativeWindowPriv_cancel( native_window_priv *priv, void *p_handle )
{ {
ANativeWindowBuffer_t *anb = (ANativeWindowBuffer_t *)p_handle; ANativeWindowBuffer_t *anb = (ANativeWindowBuffer_t *)p_handle;
status_t err = NO_ERROR; status_t err = NO_ERROR;
CHECK_ANB(); CHECK_ANB();
err = priv->gralloc->unlock(priv->gralloc, anb->handle); #if ANDROID_JBMR2_OR_LATER
err = priv->anw->cancelBuffer_DEPRECATED( priv->anw, anb );
#else
err = priv->anw->cancelBuffer( priv->anw, anb );
#endif
CHECK_ERR(); CHECK_ERR();
return 0; return 0;
} }
int ANativeWindowPriv_queue( native_window_priv *priv, void *p_handle ) int ANativeWindowPriv_lockData( native_window_priv *priv, void *p_handle,
ANativeWindow_Buffer *p_out_anb )
{ {
ANativeWindowBuffer_t *anb = (ANativeWindowBuffer_t *)p_handle; ANativeWindowBuffer_t *anb = (ANativeWindowBuffer_t *)p_handle;
status_t err = NO_ERROR; status_t err = NO_ERROR;
void *p_data;
CHECK_ANB(); CHECK_ANB();
#if ANDROID_JBMR2_OR_LATER err = priv->gralloc->lock( priv->gralloc, anb->handle, priv->usage,
err = priv->anw->queueBuffer_DEPRECATED( priv->anw, anb ); 0, 0, anb->width, anb->height, &p_data );
#else
err = priv->anw->queueBuffer( priv->anw, anb );
#endif
CHECK_ERR(); CHECK_ERR();
if( p_out_anb ) {
p_out_anb->bits = p_data;
p_out_anb->width = anb->width;
p_out_anb->height = anb->height;
p_out_anb->stride = anb->stride;
p_out_anb->format = anb->format;
}
return 0; return 0;
} }
int ANativeWindowPriv_cancel( native_window_priv *priv, void *p_handle ) int ANativeWindowPriv_unlockData( native_window_priv *priv, void *p_handle )
{ {
ANativeWindowBuffer_t *anb = (ANativeWindowBuffer_t *)p_handle; ANativeWindowBuffer_t *anb = (ANativeWindowBuffer_t *)p_handle;
status_t err = NO_ERROR; status_t err = NO_ERROR;
CHECK_ANB(); CHECK_ANB();
#if ANDROID_JBMR2_OR_LATER err = priv->gralloc->unlock(priv->gralloc, anb->handle);
err = priv->anw->cancelBuffer_DEPRECATED( priv->anw, anb );
#else
err = priv->anw->cancelBuffer( priv->anw, anb );
#endif
CHECK_ERR(); CHECK_ERR();
return 0; return 0;
......
modules/video_output/android/utils.h
View file @ 5172eb8d
...@@ -80,10 +80,10 @@ typedef int (*ptr_ANativeWindowPriv_setBufferCount) (native_window_priv *, unsig ...@@ -80,10 +80,10 @@ typedef int (*ptr_ANativeWindowPriv_setBufferCount) (native_window_priv *, unsig
typedef int (*ptr_ANativeWindowPriv_setCrop) (native_window_priv *, int, int, int, int); typedef int (*ptr_ANativeWindowPriv_setCrop) (native_window_priv *, int, int, int, int);
typedef int (*ptr_ANativeWindowPriv_dequeue) (native_window_priv *, void **); typedef int (*ptr_ANativeWindowPriv_dequeue) (native_window_priv *, void **);
typedef int (*ptr_ANativeWindowPriv_lock) (native_window_priv *, void *); typedef int (*ptr_ANativeWindowPriv_lock) (native_window_priv *, void *);
typedef int (*ptr_ANativeWindowPriv_lockData) (native_window_priv *, void *, ANativeWindow_Buffer *);
typedef int (*ptr_ANativeWindowPriv_unlockData) (native_window_priv *, void *);
typedef int (*ptr_ANativeWindowPriv_queue) (native_window_priv *, void *); typedef int (*ptr_ANativeWindowPriv_queue) (native_window_priv *, void *);
typedef int (*ptr_ANativeWindowPriv_cancel) (native_window_priv *, void *); typedef int (*ptr_ANativeWindowPriv_cancel) (native_window_priv *, void *);
typedef int (*ptr_ANativeWindowPriv_lockData) (native_window_priv *, void *, ANativeWindow_Buffer *);
typedef int (*ptr_ANativeWindowPriv_unlockData) (native_window_priv *, void *);
typedef int (*ptr_ANativeWindowPriv_setOrientation) (native_window_priv *, int); typedef int (*ptr_ANativeWindowPriv_setOrientation) (native_window_priv *, int);
typedef struct typedef struct
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment