Commit 706e6bd2 authored by Thomas Guillem's avatar Thomas Guillem Committed by Jean-Baptiste Kempf

omx-dr: remove jni_SetAndroidSurfaceSize call

It's now handled in android_window
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 9fefcd39
...@@ -72,7 +72,6 @@ extern int jni_attach_thread(JNIEnv **env, const char *thread_name); ...@@ -72,7 +72,6 @@ extern int jni_attach_thread(JNIEnv **env, const char *thread_name);
extern void jni_detach_thread(); extern void jni_detach_thread();
extern jobject jni_LockAndGetAndroidJavaSurface(); extern jobject jni_LockAndGetAndroidJavaSurface();
extern void jni_UnlockAndroidSurface(); extern void jni_UnlockAndroidSurface();
extern void jni_SetAndroidSurfaceSize(int width, int height, int visible_width, int visible_height, int sar_num, int sar_den);
extern bool jni_IsVideoPlayerActivityCreated(); extern bool jni_IsVideoPlayerActivityCreated();
#endif #endif
...@@ -2214,10 +2213,7 @@ static int HwBuffer_AllocateBuffers( decoder_t *p_dec, OmxPort *p_port ) ...@@ -2214,10 +2213,7 @@ static int HwBuffer_AllocateBuffers( decoder_t *p_dec, OmxPort *p_port )
} }
p_port->p_hwbuf->anwpriv.setOrientation( p_port->p_hwbuf->window_priv, p_port->p_hwbuf->anwpriv.setOrientation( p_port->p_hwbuf->window_priv,
i_angle ); i_angle );
video_format_ApplyRotation( &p_port->p_hwbuf->fmt_out, }
&p_port->p_fmt->video );
} else
p_port->p_hwbuf->fmt_out = p_port->p_fmt->video;
if( p_port->p_hwbuf->anwpriv.setup( p_port->p_hwbuf->window_priv, if( p_port->p_hwbuf->anwpriv.setup( p_port->p_hwbuf->window_priv,
def->format.video.nFrameWidth, def->format.video.nFrameWidth,
...@@ -2259,13 +2255,6 @@ static int HwBuffer_AllocateBuffers( decoder_t *p_dec, OmxPort *p_port ) ...@@ -2259,13 +2255,6 @@ static int HwBuffer_AllocateBuffers( decoder_t *p_dec, OmxPort *p_port )
goto error; goto error;
} }
jni_SetAndroidSurfaceSize( p_port->p_hwbuf->fmt_out.i_width,
p_port->p_hwbuf->fmt_out.i_height,
p_port->p_hwbuf->fmt_out.i_visible_width,
p_port->p_hwbuf->fmt_out.i_visible_height,
p_port->p_hwbuf->fmt_out.i_sar_num,
p_port->p_hwbuf->fmt_out.i_sar_den );
p_port->p_hwbuf->i_buffers = p_port->definition.nBufferCountActual; p_port->p_hwbuf->i_buffers = p_port->definition.nBufferCountActual;
p_port->p_hwbuf->i_max_owned = p_port->p_hwbuf->i_buffers - min_undequeued; p_port->p_hwbuf->i_max_owned = p_port->p_hwbuf->i_buffers - min_undequeued;
......
...@@ -76,7 +76,6 @@ typedef struct HwBuffer ...@@ -76,7 +76,6 @@ typedef struct HwBuffer
void *p_library; void *p_library;
void *window; void *window;
video_format_t fmt_out;
#if defined(USE_IOMX) #if defined(USE_IOMX)
native_window_api_t native_window; native_window_api_t native_window;
native_window_priv_api_t anwpriv; native_window_priv_api_t anwpriv;
......
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