Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
msandroidcamera2
Commits
40b05eb3
Commit
40b05eb3
authored
Oct 04, 2019
by
Sylvain Berfini
🎩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed build with NDK API level 24 + removed unusued header
parent
89af5eea
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
7 deletions
+2
-7
CMakeLists.txt
CMakeLists.txt
+1
-1
android-camera2-capture.cpp
android-camera2-capture.cpp
+1
-6
No files found.
CMakeLists.txt
View file @
40b05eb3
...
...
@@ -46,7 +46,7 @@ include_directories(
${
MEDIASTREAMER2_INCLUDE_DIRS
}
)
set
(
LIBS
${
MEDIASTREAMER2_LIBRARIES
}
android camera2ndk mediandk
nativewindow
${
ORTP_LIBRARIES
}
${
BCTOOLBOX_CORE_LIBRARIES
}
)
set
(
LIBS
${
MEDIASTREAMER2_LIBRARIES
}
android camera2ndk mediandk
${
ORTP_LIBRARIES
}
${
BCTOOLBOX_CORE_LIBRARIES
}
)
set
(
SOURCE_FILES android-camera2-capture.cpp
)
...
...
android-camera2-capture.cpp
View file @
40b05eb3
...
...
@@ -25,6 +25,7 @@
#include <mediastreamer2/mswebcam.h>
#include <mediastreamer2/android_utils.h>
#include <android/native_window_jni.h>
#include <camera/NdkCameraCaptureSession.h>
#include <camera/NdkCameraDevice.h>
#include <camera/NdkCameraError.h>
...
...
@@ -36,12 +37,6 @@
#include <jni.h>
#include <math.h>
#include <android/hardware_buffer.h>
#include <android/native_activity.h>
#include <android/native_window.h>
#include <android/native_window_jni.h>
#include <android/rect.h>
#include <android/window.h>
struct
AndroidCamera2Device
{
AndroidCamera2Device
(
char
*
id
)
:
camId
(
id
),
orientation
(
0
),
back_facing
(
false
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment