[vlc-devel] [PATCH 12/14] android: utils: remove AWindow SurfaceTexture functions

[Thomas Guillem]

On Tue, Jun 16, 2020, at 11:51, Alexandre Janniaux wrote:
> Hi,
> 
> On Mon, Jun 15, 2020 at 01:30:42PM +0200, Thomas Guillem wrote:
> > Could you also propose a patch, removing the SurfaceTexture_* foo, in vlc-android ?
> 
> Thank you for the detailed review. :)
> 
> I can remove the SurfaceTexture_* in vlc-android but it
> raises the question of how how to handle the differences
> between vlc-android and libvlc4 that are increasing. This
> patchset was made to be compatible with libvlcjni 3 and
> libvlcjni 4, as libvlcjni version is tied to vlc-android
> version.

You're right, we will remove it when vlc-android switch for good to vlc 4.0.
For now, vlc-android can work with both versions.

> 
> Maybe a repository split between both could be considered?
> 
> Regards,
> --
> Alexandre Janniaux
> Videolabs
> 
> >
> > On Fri, Jun 12, 2020, at 11:40, Alexandre Janniaux wrote:
> > > They are not used anymore since we create the SurfaceTexture ourselves.
> > > ---
> > >  modules/video_output/android/utils.c | 14 --------------
> > >  1 file changed, 14 deletions(-)
> > >
> > > diff --git a/modules/video_output/android/utils.c
> > > b/modules/video_output/android/utils.c
> > > index d458e275772..4272883a18d 100644
> > > --- a/modules/video_output/android/utils.c
> > > +++ b/modules/video_output/android/utils.c
> > > @@ -126,10 +126,6 @@ static struct
> > >          jmethodID registerNative;
> > >          jmethodID unregisterNative;
> > >          jmethodID setVideoLayout;
> > > -        jmethodID attachToGLContext;
> > > -        jmethodID detachFromGLContext;
> > > -        jmethodID waitAndUpdateTexImage;
> > > -        jmethodID getSurface;
> > >      } AWindow;
> > >      struct {
> > >            jclass clazz;
> > > @@ -754,16 +750,6 @@ InitJNIFields(JNIEnv *env, vlc_object_t *p_obj,
> > > jobject *jobj)
> > >      GET_METHOD(AWindow.setVideoLayout,
> > >                 "setVideoLayout", "(IIIIII)V", true);
> > >
> > > -    GET_METHOD(AWindow.attachToGLContext,
> > > -               "SurfaceTexture_attachToGLContext", "(I)Z", true);
> > > -    GET_METHOD(AWindow.detachFromGLContext,
> > > -               "SurfaceTexture_detachFromGLContext", "()V", true);
> > > -    GET_METHOD(AWindow.waitAndUpdateTexImage,
> > > -               "SurfaceTexture_waitAndUpdateTexImage", "([F)Z",
> > > -               true);
> > > -    GET_METHOD(AWindow.getSurface,
> > > -               "SurfaceTexture_getSurface", "()Landroid/view/Surface;", true);
> > > -
> > >      if ((*env)->RegisterNatives(env, clazz, jni_callbacks, 2) < 0)
> > >      {
> > >          msg_Err(p_obj, "RegisterNatives failed");
> > > --
> > > 2.27.0
> > >
> > > _______________________________________________
> > > vlc-devel mailing list
> > > To unsubscribe or modify your subscription options:
> > > https://mailman.videolan.org/listinfo/vlc-devel
> > _______________________________________________
> > vlc-devel mailing list
> > To unsubscribe or modify your subscription options:
> > https://mailman.videolan.org/listinfo/vlc-devel
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel