Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
618cdec
[Android] Add CxxBuffer to native PaddleSegModel
DefTruth Nov 23, 2022
e8a81ca
Merge branch 'android_seg_example_docs' of https://github.com/DefTrut…
DefTruth Nov 23, 2022
9941082
Merge branch 'PaddlePaddle:develop' into android_seg_example_docs
DefTruth Nov 23, 2022
eea0f52
[Android] Add PaddleSeg android app example
DefTruth Nov 23, 2022
653d4e5
[Android] Add SCRFD android app example
DefTruth Nov 23, 2022
8854ff9
Merge branch 'PaddlePaddle:develop' into android_seg_example_docs
DefTruth Nov 23, 2022
08a23cc
Merge branch 'android_seg_example_docs' of https://github.com/DefTrut…
DefTruth Nov 23, 2022
4f1036f
[Doc] fix typos
DefTruth Nov 23, 2022
dd8432a
[Android] revert camera setting changes
DefTruth Nov 23, 2022
a9b4947
Merge branch 'PaddlePaddle:develop' into android_seg_example_docs
DefTruth Nov 23, 2022
cd23ab6
Merge branch 'PaddlePaddle:develop' into android_seg_example_docs
DefTruth Nov 24, 2022
3bb5c0d
[Bug Fix] fixed ppdet postprocess empty result error
DefTruth Nov 24, 2022
41b5bb3
Merge branch 'PaddlePaddle:develop' into android_seg_example_docs
DefTruth Nov 24, 2022
7c77731
Merge branch 'android_seg_example_docs' of https://github.com/DefTrut…
DefTruth Nov 24, 2022
0438a21
Merge branch 'PaddlePaddle:develop' into android_seg_example_docs
DefTruth Nov 24, 2022
60a4be5
[Android] add enableCamera method to fix app crash
DefTruth Nov 24, 2022
08f8c5a
Merge branch 'android_seg_example_docs' of https://github.com/DefTrut…
DefTruth Nov 24, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/paddlelite.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ endif()
if(WIN32 OR APPLE OR IOS)
message(FATAL_ERROR "Doesn't support windows/mac/ios platform with backend Paddle Lite now.")
elseif(ANDROID AND WITH_LITE_STATIC)
set(PADDLELITE_LIB "${PADDLELITE_LIB_DIR}/libpaddle_api_full_bundled..a")
set(PADDLELITE_LIB "${PADDLELITE_LIB_DIR}/libpaddle_api_full_bundled.a")
set(PADDLELITE_REMOVE_LIB "${PADDLELITE_LIB_DIR}/libpaddle_api_light_bundled.a")
else()
set(PADDLELITE_LIB "${PADDLELITE_LIB_DIR}/libpaddle_full_api_shared.so")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,8 @@ protected void onResume() {
// Open camera until the permissions have been granted
if (!checkAllPermissions()) {
svPreview.disableCamera();
} else {
svPreview.enableCamera();
}
svPreview.onResume();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,8 @@ protected void onResume() {
// Open camera until the permissions have been granted
if (!checkAllPermissions()) {
svPreview.disableCamera();
} else {
svPreview.enableCamera();
}
svPreview.onResume();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,8 @@ protected void onResume() {
// Open camera until the permissions have been granted
if (!checkAllPermissions()) {
svPreview.disableCamera();
} else {
svPreview.enableCamera();
}
svPreview.onResume();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,8 @@ protected void onResume() {
// Open camera until the permissions have been granted
if (!checkAllPermissions()) {
svPreview.disableCamera();
} else {
svPreview.enableCamera();
}
svPreview.onResume();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,8 @@ protected void onResume() {
// Open camera until the permissions have been granted
if (!checkAllPermissions()) {
svPreview.disableCamera();
} else {
svPreview.enableCamera();
}
svPreview.onResume();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,10 @@ public void disableCamera() {
disableCamera = true;
}

public void enableCamera() {
disableCamera = false;
}

public void switchCamera() {
releaseCamera();
selectedCameraId = (selectedCameraId + 1) % numberOfCameras;
Expand Down