Android: Move SurfaceTextureListener.java into main source tree

- from packaging
MythTV · Jul 4, 2019 · 1e57c62 · 1e57c62
1 parent 8a9f4a8
commit 1e57c62
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/mythtv/android-package-source/src/org/mythtv/video/SurfaceTextureListener.java b/mythtv/android-package-source/src/org/mythtv/video/SurfaceTextureListener.java
@@ -0,0 +1,19 @@
+package org.mythtv.video;
+
+import android.graphics.SurfaceTexture;
+
+public class SurfaceTextureListener implements SurfaceTexture.OnFrameAvailableListener {
+
+  private long m_callbackData = 0;
+
+  public SurfaceTextureListener(long callbackData) {
+    m_callbackData = callbackData;
+  }
+
+  @Override
+  public void onFrameAvailable (SurfaceTexture surfaceTexture) {
+    frameAvailable(m_callbackData, surfaceTexture);
+  }
+
+  public native void frameAvailable(long nativeCallbackData, SurfaceTexture surfaceTexture);
+}
diff --git a/mythtv/libs/libmythtv/mythmediacodecinterop.cpp b/mythtv/libs/libmythtv/mythmediacodecinterop.cpp
@@ -90,7 +90,7 @@ bool MythMediaCodecInterop::Initialise(QSize Size)
     // Create surface
     m_surfaceTexture = QAndroidJniObject("android/graphics/SurfaceTexture", "(I)V", texture->m_textureId);
     //N.B. org/mythtv/android/SurfaceTextureListener is found in the packaging repo
-    m_surfaceListener = QAndroidJniObject("org/mythtv/android/SurfaceTextureListener", "(J)V", jlong(&m_frameWait));
+    m_surfaceListener = QAndroidJniObject("org/mythtv/video/SurfaceTextureListener", "(J)V", jlong(&m_frameWait));
     if (m_surfaceTexture.isValid() && m_surfaceListener.isValid())
     {
         m_surfaceTexture.callMethod<void>("setOnFrameAvailableListener",