diff options
| author | Christian Strømme <christian.stromme@theqtcompany.com> | 2016-01-15 17:27:32 +0100 |
|---|---|---|
| committer | Christian Strømme <christian.stromme@theqtcompany.com> | 2016-01-15 17:28:17 +0100 |
| commit | 84e426c3af2a3bb1b7f916e54263aea758db38d0 (patch) | |
| tree | 4fe09a8da5b15ba466e5771239d06f29a6c123da /src/plugins/android/src/wrappers/jni/androidmediarecorder.h | |
| parent | 84aaa48fdfc1f35c9870518a3d4b6f08a1f99449 (diff) | |
| parent | 924dc7f48c7003b46079623738ae531f34aed903 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/plugins/android/src/mediacapture/qandroidcamerasession.cpp
src/plugins/wmf/mftvideo.cpp
Change-Id: I78868b416ea4baec89ca3e2dc9eb4712db16d5fc
Diffstat (limited to 'src/plugins/android/src/wrappers/jni/androidmediarecorder.h')
| -rw-r--r-- | src/plugins/android/src/wrappers/jni/androidmediarecorder.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/android/src/wrappers/jni/androidmediarecorder.h b/src/plugins/android/src/wrappers/jni/androidmediarecorder.h index 1aa83a201..95b48ed47 100644 --- a/src/plugins/android/src/wrappers/jni/androidmediarecorder.h +++ b/src/plugins/android/src/wrappers/jni/androidmediarecorder.h @@ -41,6 +41,8 @@ QT_BEGIN_NAMESPACE class AndroidCamera; +class AndroidSurfaceTexture; +class AndroidSurfaceHolder; class AndroidCamcorderProfile { @@ -149,6 +151,9 @@ public: void setOutputFormat(OutputFormat format); void setOutputFile(const QString &path); + void setSurfaceTexture(AndroidSurfaceTexture *texture); + void setSurfaceHolder(AndroidSurfaceHolder *holder); + static bool initJNI(JNIEnv *env); Q_SIGNALS: |