diff options
Diffstat (limited to 'src/plugins/android/src/mediacapture')
| -rw-r--r-- | src/plugins/android/src/mediacapture/qandroidcapturesession.cpp | 16 | ||||
| -rw-r--r-- | src/plugins/android/src/mediacapture/qandroidvideodeviceselectorcontrol.cpp | 7 |
2 files changed, 10 insertions, 13 deletions
diff --git a/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp b/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp index 1927aeb8e..ec458eddb 100644 --- a/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp +++ b/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp @@ -45,7 +45,7 @@ #include "qandroidcamerasession.h" #include "jmultimediautils.h" #include "qandroidmultimediautils.h" -#include <QtPlatformSupport/private/qjnihelpers_p.h> +#include <QtCore/private/qjni_p.h> QT_BEGIN_NAMESPACE @@ -466,22 +466,20 @@ void QAndroidCaptureSession::onCameraOpened() QAndroidCaptureSession::CaptureProfile QAndroidCaptureSession::getProfile(int id) { CaptureProfile profile; - bool hasProfile = QJNIObject::callStaticMethod<jboolean>("android/media/CamcorderProfile", + bool hasProfile = QJNIObjectPrivate::callStaticMethod<jboolean>("android/media/CamcorderProfile", "hasProfile", "(II)Z", m_cameraSession->camera()->cameraId(), id); if (hasProfile) { - QJNILocalRef<jobject> ref = QJNIObject::callStaticObjectMethod<jobject>("android/media/CamcorderProfile", - "get", - "(II)Landroid/media/CamcorderProfile;", - m_cameraSession->camera()->cameraId(), - id); + QJNIObjectPrivate obj = QJNIObjectPrivate::callStaticObjectMethod("android/media/CamcorderProfile", + "get", + "(II)Landroid/media/CamcorderProfile;", + m_cameraSession->camera()->cameraId(), + id); - QJNIObject obj(ref.object()); - profile.outputFormat = JMediaRecorder::OutputFormat(obj.getField<jint>("fileFormat")); profile.audioEncoder = JMediaRecorder::AudioEncoder(obj.getField<jint>("audioCodec")); profile.audioBitRate = obj.getField<jint>("audioBitRate"); diff --git a/src/plugins/android/src/mediacapture/qandroidvideodeviceselectorcontrol.cpp b/src/plugins/android/src/mediacapture/qandroidvideodeviceselectorcontrol.cpp index 26dce565e..04af61085 100644 --- a/src/plugins/android/src/mediacapture/qandroidvideodeviceselectorcontrol.cpp +++ b/src/plugins/android/src/mediacapture/qandroidvideodeviceselectorcontrol.cpp @@ -43,7 +43,6 @@ #include "qandroidcamerasession.h" #include "jcamera.h" -#include <QtPlatformSupport/private/qjnihelpers_p.h> QT_BEGIN_NAMESPACE @@ -103,12 +102,12 @@ void QAndroidVideoDeviceSelectorControl::update() m_names.clear(); m_descriptions.clear(); - QJNIObject cameraInfo("android/hardware/Camera$CameraInfo"); - int numCameras = QJNIObject::callStaticMethod<jint>("android/hardware/Camera", + QJNIObjectPrivate cameraInfo("android/hardware/Camera$CameraInfo"); + int numCameras = QJNIObjectPrivate::callStaticMethod<jint>("android/hardware/Camera", "getNumberOfCameras"); for (int i = 0; i < numCameras; ++i) { - QJNIObject::callStaticMethod<void>("android/hardware/Camera", + QJNIObjectPrivate::callStaticMethod<void>("android/hardware/Camera", "getCameraInfo", "(ILandroid/hardware/Camera$CameraInfo;)V", i, cameraInfo.object()); |