aboutsummaryrefslogtreecommitdiff
path: root/usbtuner/jni
diff options
context:
space:
mode:
Diffstat (limited to 'usbtuner/jni')
-rw-r--r--usbtuner/jni/Android.mk4
-rw-r--r--usbtuner/jni/DvbManager.cpp4
-rw-r--r--usbtuner/jni/DvbManager.h12
-rwxr-xr-xusbtuner/jni/gen_jni.sh2
-rw-r--r--usbtuner/jni/tunertvinput_jni.cpp (renamed from usbtuner/jni/usbtuner_jni.cpp)34
-rw-r--r--usbtuner/jni/tunertvinput_jni.h90
-rw-r--r--usbtuner/jni/usbtuner_jni.h79
7 files changed, 118 insertions, 107 deletions
diff --git a/usbtuner/jni/Android.mk b/usbtuner/jni/Android.mk
index 5bf829b4..684830c9 100644
--- a/usbtuner/jni/Android.mk
+++ b/usbtuner/jni/Android.mk
@@ -3,8 +3,8 @@ LOCAL_PATH := $(call my-dir)
# --------------------------------------------------------------
include $(CLEAR_VARS)
-LOCAL_MODULE := libusbtuner_jni
-LOCAL_SRC_FILES += usbtuner_jni.cpp DvbManager.cpp
+LOCAL_MODULE := libtunertvinput_jni
+LOCAL_SRC_FILES += tunertvinput_jni.cpp DvbManager.cpp
LOCAL_SDK_VERSION := 21
LOCAL_NDK_STL_VARIANT := stlport_static
LOCAL_LDLIBS := -llog
diff --git a/usbtuner/jni/DvbManager.cpp b/usbtuner/jni/DvbManager.cpp
index 64c6bc32..fef756e3 100644
--- a/usbtuner/jni/DvbManager.cpp
+++ b/usbtuner/jni/DvbManager.cpp
@@ -44,7 +44,7 @@ DvbManager::DvbManager(JNIEnv *env, jobject)
mPatFilterFd(-1),
mFeHasLock(false) {
jclass clazz = env->FindClass(
- "com/android/usbtuner/UsbTunerInterface");
+ "com/android/usbtuner/TunerHal");
mOpenDvbFrontEndMethodID = env->GetMethodID(
clazz, "openDvbFrontEndFd", "()I");
mOpenDvbDemuxMethodID = env->GetMethodID(
@@ -66,7 +66,7 @@ bool DvbManager::isFeLocked() {
return false;
}
-int DvbManager::tuneAtsc(JNIEnv *env, jobject thiz,
+int DvbManager::tune(JNIEnv *env, jobject thiz,
const int frequency, const char *modulationStr, int timeout_ms) {
resetExceptFe();
diff --git a/usbtuner/jni/DvbManager.h b/usbtuner/jni/DvbManager.h
index 2bf46aba..c626335a 100644
--- a/usbtuner/jni/DvbManager.h
+++ b/usbtuner/jni/DvbManager.h
@@ -21,7 +21,7 @@
#include <map>
#include "mutex.h"
-#include "usbtuner_jni.h"
+#include "tunertvinput_jni.h"
class DvbManager {
static const int NUM_POLLFDS = 1;
@@ -32,13 +32,13 @@ class DvbManager {
static const int PAT_PID = 0;
static const int FILTER_TYPE_OTHER =
- com_android_usbtuner_UsbTunerInterface_FILTER_TYPE_OTHER;
+ com_android_usbtuner_TunerHal_FILTER_TYPE_OTHER;
static const int FILTER_TYPE_AUDIO =
- com_android_usbtuner_UsbTunerInterface_FILTER_TYPE_AUDIO;
+ com_android_usbtuner_TunerHal_FILTER_TYPE_AUDIO;
static const int FILTER_TYPE_VIDEO =
- com_android_usbtuner_UsbTunerInterface_FILTER_TYPE_VIDEO;
+ com_android_usbtuner_TunerHal_FILTER_TYPE_VIDEO;
static const int FILTER_TYPE_PCR =
- com_android_usbtuner_UsbTunerInterface_FILTER_TYPE_PCR;
+ com_android_usbtuner_TunerHal_FILTER_TYPE_PCR;
int mFeFd;
int mDemuxFd;
@@ -54,7 +54,7 @@ class DvbManager {
public:
DvbManager(JNIEnv *env, jobject thiz);
~DvbManager();
- int tuneAtsc(JNIEnv *env, jobject thiz,
+ int tune(JNIEnv *env, jobject thiz,
const int frequency, const char *modulationStr, int timeout_ms);
int stopTune();
int readTsStream(JNIEnv *env, jobject thiz,
diff --git a/usbtuner/jni/gen_jni.sh b/usbtuner/jni/gen_jni.sh
index 612bcf58..e81f9cb8 100755
--- a/usbtuner/jni/gen_jni.sh
+++ b/usbtuner/jni/gen_jni.sh
@@ -1,3 +1,3 @@
#!/bin/bash
-javah -jni -classpath ../bin:../../../../../prebuilts/sdk/current/android.jar -o usbtuner_jni.h com.android.usbtuner.UsbTunerInterface
+javah -jni -classpath ../../bin/classes:../../../../../../prebuilts/sdk/current/android.jar -o tunertvinput_jni.h com.android.usbtuner.TunerHal
diff --git a/usbtuner/jni/usbtuner_jni.cpp b/usbtuner/jni/tunertvinput_jni.cpp
index cbbe8707..b72afbdb 100644
--- a/usbtuner/jni/usbtuner_jni.cpp
+++ b/usbtuner/jni/tunertvinput_jni.cpp
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#include "usbtuner_jni.h"
+#include "tunertvinput_jni.h"
#include <map>
#include "DvbManager.h"
-#define LOG_TAG "usbtuner_jni"
+#define LOG_TAG "tunertvinput_jni"
#include "logging.h"
//-------------------------------------------------------------------------------
@@ -33,12 +33,12 @@ static int sTotalBytesFetched = 0;
static std::map<jlong, DvbManager *> sDvbManagers;
/*
- * Class: com_android_usbtuner_UsbTunerInterface
+ * Class: com_android_usbtuner_TunerHal
* Method: nativeFinalize
- * Signature: ()V
+ * Signature: (J)V
*/
JNIEXPORT void JNICALL
-Java_com_android_usbtuner_UsbTunerInterface_nativeFinalize
+Java_com_android_usbtuner_TunerHal_nativeFinalize
(JNIEnv *, jobject, jlong deviceId) {
std::map<jlong, DvbManager *>::iterator it = sDvbManagers.find(deviceId);
if (it != sDvbManagers.end()) {
@@ -48,12 +48,12 @@ Java_com_android_usbtuner_UsbTunerInterface_nativeFinalize
}
/*
- * Class: com_android_usbtuner_UsbTunerInterface
- * Method: nativeTuneAtsc
+ * Class: com_android_usbtuner_TunerHal
+ * Method: nativeTune
* Signature: (JILjava/lang/String;)Z
*/
JNIEXPORT jboolean JNICALL
-Java_com_android_usbtuner_UsbTunerInterface_nativeTuneAtsc
+Java_com_android_usbtuner_TunerHal_nativeTune
(JNIEnv *env, jobject thiz, jlong deviceId, jint frequency, jstring modulation, jint timeout_ms) {
std::map<jlong, DvbManager *>::iterator it = sDvbManagers.find(deviceId);
DvbManager *dvbManager;
@@ -63,17 +63,17 @@ Java_com_android_usbtuner_UsbTunerInterface_nativeTuneAtsc
} else {
dvbManager = it->second;
}
- int res = dvbManager->tuneAtsc(env, thiz,
+ int res = dvbManager->tune(env, thiz,
frequency, env->GetStringUTFChars(modulation, 0), timeout_ms);
return (res == 0);
}
/*
- * Class: com_android_usbtuner_UsbTunerInterface
+ * Class: com_android_usbtuner_TunerHal
* Method: nativeCloseAllPidFilters
* Signature: (J)V
*/
-JNIEXPORT void JNICALL Java_com_android_usbtuner_UsbTunerInterface_nativeCloseAllPidFilters
+JNIEXPORT void JNICALL Java_com_android_usbtuner_TunerHal_nativeCloseAllPidFilters
(JNIEnv *, jobject, jlong deviceId) {
std::map<jlong, DvbManager *>::iterator it = sDvbManagers.find(deviceId);
if (it != sDvbManagers.end()) {
@@ -82,12 +82,12 @@ JNIEXPORT void JNICALL Java_com_android_usbtuner_UsbTunerInterface_nativeCloseAl
}
/*
- * Class: com_android_usbtuner_UsbTunerInterface
+ * Class: com_android_usbtuner_TunerHal
* Method: nativeStopTune
* Signature: (J)V
*/
JNIEXPORT void JNICALL
-Java_com_android_usbtuner_UsbTunerInterface_nativeStopTune
+Java_com_android_usbtuner_TunerHal_nativeStopTune
(JNIEnv *, jobject, jlong deviceId) {
std::map<jlong, DvbManager *>::iterator it = sDvbManagers.find(deviceId);
if (it != sDvbManagers.end()) {
@@ -96,12 +96,12 @@ Java_com_android_usbtuner_UsbTunerInterface_nativeStopTune
}
/*
- * Class: com_android_usbtuner_UsbTunerInterface
+ * Class: com_android_usbtuner_TunerHal
* Method: nativeAddPidFilter
* Signature: (JII)V
*/
JNIEXPORT void JNICALL
-Java_com_android_usbtuner_UsbTunerInterface_nativeAddPidFilter
+Java_com_android_usbtuner_TunerHal_nativeAddPidFilter
(JNIEnv *env, jobject thiz, jlong deviceId, jint pid, jint filterType) {
std::map<jlong, DvbManager *>::iterator it = sDvbManagers.find(deviceId);
if (it != sDvbManagers.end()) {
@@ -110,12 +110,12 @@ Java_com_android_usbtuner_UsbTunerInterface_nativeAddPidFilter
}
/*
- * Class: com_android_usbtuner_UsbTunerInterface
+ * Class: com_android_usbtuner_TunerHal
* Method: nativeWriteInBuffer
* Signature: (J[BI)I
*/
JNIEXPORT jint JNICALL
-Java_com_android_usbtuner_UsbTunerInterface_nativeWriteInBuffer
+Java_com_android_usbtuner_TunerHal_nativeWriteInBuffer
(JNIEnv *env, jobject thiz, jlong deviceId, jbyteArray javaBuffer, jint javaBufferSize) {
uint8_t tsBuffer[TS_PAYLOAD_SIZE];
std::map<jlong, DvbManager *>::iterator it = sDvbManagers.find(deviceId);
diff --git a/usbtuner/jni/tunertvinput_jni.h b/usbtuner/jni/tunertvinput_jni.h
new file mode 100644
index 00000000..5878740e
--- /dev/null
+++ b/usbtuner/jni/tunertvinput_jni.h
@@ -0,0 +1,90 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class com_android_usbtuner_TunerHal */
+
+#ifndef _Included_com_android_usbtuner_TunerHal
+#define _Included_com_android_usbtuner_TunerHal
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef com_android_usbtuner_TunerHal_DEBUG
+#define com_android_usbtuner_TunerHal_DEBUG 0L
+#undef com_android_usbtuner_TunerHal_FILTER_TYPE_OTHER
+#define com_android_usbtuner_TunerHal_FILTER_TYPE_OTHER 0L
+#undef com_android_usbtuner_TunerHal_FILTER_TYPE_AUDIO
+#define com_android_usbtuner_TunerHal_FILTER_TYPE_AUDIO 1L
+#undef com_android_usbtuner_TunerHal_FILTER_TYPE_VIDEO
+#define com_android_usbtuner_TunerHal_FILTER_TYPE_VIDEO 2L
+#undef com_android_usbtuner_TunerHal_FILTER_TYPE_PCR
+#define com_android_usbtuner_TunerHal_FILTER_TYPE_PCR 3L
+#undef com_android_usbtuner_TunerHal_PID_PAT
+#define com_android_usbtuner_TunerHal_PID_PAT 0L
+#undef com_android_usbtuner_TunerHal_PID_ATSC_SI_BASE
+#define com_android_usbtuner_TunerHal_PID_ATSC_SI_BASE 8187L
+#undef com_android_usbtuner_TunerHal_DEFAULT_VSB_TUNE_TIMEOUT_MS
+#define com_android_usbtuner_TunerHal_DEFAULT_VSB_TUNE_TIMEOUT_MS 2000L
+#undef com_android_usbtuner_TunerHal_DEFAULT_QAM_TUNE_TIMEOUT_MS
+#define com_android_usbtuner_TunerHal_DEFAULT_QAM_TUNE_TIMEOUT_MS 4000L
+/*
+ * Class: com_android_usbtuner_TunerHal
+ * Method: nativeFinalize
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_android_usbtuner_TunerHal_nativeFinalize
+ (JNIEnv *, jobject, jlong);
+
+/*
+ * Class: com_android_usbtuner_TunerHal
+ * Method: nativeTune
+ * Signature: (JILjava/lang/String;I)Z
+ */
+JNIEXPORT jboolean JNICALL Java_com_android_usbtuner_TunerHal_nativeTune
+ (JNIEnv *, jobject, jlong, jint, jstring, jint);
+
+/*
+ * Class: com_android_usbtuner_TunerHal
+ * Method: nativeAddPidFilter
+ * Signature: (JII)V
+ */
+JNIEXPORT void JNICALL Java_com_android_usbtuner_TunerHal_nativeAddPidFilter
+ (JNIEnv *, jobject, jlong, jint, jint);
+
+/*
+ * Class: com_android_usbtuner_TunerHal
+ * Method: nativeCloseAllPidFilters
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_android_usbtuner_TunerHal_nativeCloseAllPidFilters
+ (JNIEnv *, jobject, jlong);
+
+/*
+ * Class: com_android_usbtuner_TunerHal
+ * Method: nativeStopTune
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_com_android_usbtuner_TunerHal_nativeStopTune
+ (JNIEnv *, jobject, jlong);
+
+/*
+ * Class: com_android_usbtuner_TunerHal
+ * Method: nativeWriteInBuffer
+ * Signature: (J[BI)I
+ */
+JNIEXPORT jint JNICALL Java_com_android_usbtuner_TunerHal_nativeWriteInBuffer
+ (JNIEnv *, jobject, jlong, jbyteArray, jint);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
+/* Header for class com_android_usbtuner_TunerHal_FilterType */
+
+#ifndef _Included_com_android_usbtuner_TunerHal_FilterType
+#define _Included_com_android_usbtuner_TunerHal_FilterType
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/usbtuner/jni/usbtuner_jni.h b/usbtuner/jni/usbtuner_jni.h
deleted file mode 100644
index ba16b667..00000000
--- a/usbtuner/jni/usbtuner_jni.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_android_usbtuner_UsbTunerInterface */
-
-#ifndef _Included_com_android_usbtuner_UsbTunerInterface
-#define _Included_com_android_usbtuner_UsbTunerInterface
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef com_android_usbtuner_UsbTunerInterface_DEBUG
-#define com_android_usbtuner_UsbTunerInterface_DEBUG 0L
-#undef com_android_usbtuner_UsbTunerInterface_PROGRAM_NO_UNDEFINED
-#define com_android_usbtuner_UsbTunerInterface_PROGRAM_NO_UNDEFINED -1L
-#undef com_android_usbtuner_UsbTunerInterface_FILTER_TYPE_OTHER
-#define com_android_usbtuner_UsbTunerInterface_FILTER_TYPE_OTHER 0L
-#undef com_android_usbtuner_UsbTunerInterface_FILTER_TYPE_AUDIO
-#define com_android_usbtuner_UsbTunerInterface_FILTER_TYPE_AUDIO 1L
-#undef com_android_usbtuner_UsbTunerInterface_FILTER_TYPE_VIDEO
-#define com_android_usbtuner_UsbTunerInterface_FILTER_TYPE_VIDEO 2L
-#undef com_android_usbtuner_UsbTunerInterface_FILTER_TYPE_PCR
-#define com_android_usbtuner_UsbTunerInterface_FILTER_TYPE_PCR 3L
-#undef com_android_usbtuner_UsbTunerInterface_PID_PAT
-#define com_android_usbtuner_UsbTunerInterface_PID_PAT 0L
-#undef com_android_usbtuner_UsbTunerInterface_PID_ATSC_SI_BASE
-#define com_android_usbtuner_UsbTunerInterface_PID_ATSC_SI_BASE 8187L
-#undef com_android_usbtuner_UsbTunerInterface_DEFAULT_TUNE_TIMEOUT_MS
-#define com_android_usbtuner_UsbTunerInterface_DEFAULT_TUNE_TIMEOUT_MS 4000L
-/*
- * Class: com_android_usbtuner_UsbTunerInterface
- * Method: nativeFinalize
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_com_android_usbtuner_UsbTunerInterface_nativeFinalize
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: com_android_usbtuner_UsbTunerInterface
- * Method: nativeTuneAtsc
- * Signature: (JILjava/lang/String;I)Z
- */
-JNIEXPORT jboolean JNICALL Java_com_android_usbtuner_UsbTunerInterface_nativeTuneAtsc
- (JNIEnv *, jobject, jlong, jint, jstring, jint);
-
-/*
- * Class: com_android_usbtuner_UsbTunerInterface
- * Method: nativeAddPidFilter
- * Signature: (JII)V
- */
-JNIEXPORT void JNICALL Java_com_android_usbtuner_UsbTunerInterface_nativeAddPidFilter
- (JNIEnv *, jobject, jlong, jint, jint);
-
-/*
- * Class: com_android_usbtuner_UsbTunerInterface
- * Method: nativeCloseAllPidFilters
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_com_android_usbtuner_UsbTunerInterface_nativeCloseAllPidFilters
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: com_android_usbtuner_UsbTunerInterface
- * Method: nativeStopTune
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_com_android_usbtuner_UsbTunerInterface_nativeStopTune
- (JNIEnv *, jobject, jlong);
-
-/*
- * Class: com_android_usbtuner_UsbTunerInterface
- * Method: nativeWriteInBuffer
- * Signature: (J[BI)I
- */
-JNIEXPORT jint JNICALL Java_com_android_usbtuner_UsbTunerInterface_nativeWriteInBuffer
- (JNIEnv *, jobject, jlong, jbyteArray, jint);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 16:47:57 +0000