Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Camera initialization crash fix #13094

Merged
merged 3 commits into from
Jul 4, 2020
Merged

Camera initialization crash fix #13094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5053b9
CameraHelper: Do a better job of choosing an appropriate preview size.
hrydgard Jul 4, 2020
7bb5248
Check that we actually got a preview size.
hrydgard Jul 4, 2020
3cc20e5
Sneak in some paranoia in InstallZipScreen.cpp (another one from #13057)
hrydgard Jul 4, 2020
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
7 changes: 6 additions & 1 deletion UI/InstallZipScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ void InstallZipScreen::CreateViews() {
returnToHomebrew_ = false;
} else {
leftColumn->Add(new TextView(iz->T("Zip file does not contain PSP software"), ALIGN_LEFT, false, new AnchorLayoutParams(10, 10, NONE, NONE)));
doneView_ = nullptr;
progressBar_ = nullptr;
installChoice_ = nullptr;
backChoice_ = rightColumnItems->Add(new Choice(di->T("Back")));
}

Expand All @@ -99,7 +102,9 @@ bool InstallZipScreen::key(const KeyInput &key) {
UI::EventReturn InstallZipScreen::OnInstall(UI::EventParams &params) {
if (g_GameManager.InstallGameOnThread(zipPath_, zipPath_, deleteZipFile_)) {
installStarted_ = true;
installChoice_->SetEnabled(false);
if (installChoice_) {
installChoice_->SetEnabled(false);
}
}
return UI::EVENT_DONE;
}
Expand Down
60 changes: 53 additions & 7 deletions android/src/org/ppsspp/ppsspp/CameraHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ class CameraHelper {
private long mLastFrameTime = 0;
private SurfaceTexture mSurfaceTexture;

private static boolean firstRotation = true;

private int getCameraRotation() {
int displayRotation = mDisplay.getRotation();
int displayDegrees = 0;
Expand All @@ -49,8 +51,13 @@ private int getCameraRotation() {
}
}

// Does not work if the source is smaller than the destination!
static byte[] rotateNV21(final byte[] input, final int inWidth, final int inHeight,
final int outWidth, final int outHeight, final int rotation) {
if (firstRotation) {
Log.i(TAG, "rotateNV21: in: " + inWidth + "x" + inHeight + " out: " + outWidth + "x" + outHeight + " rotation: " + rotation);
firstRotation = false;
}

final int inFrameSize = inWidth * inHeight;
final int outFrameSize = outWidth * outHeight;
Expand All @@ -59,6 +66,12 @@ static byte[] rotateNV21(final byte[] input, final int inWidth, final int inHeig
if (rotation == 0 || rotation == 180) {
final int crop_left = (inWidth - outWidth) / 2;
final int crop_top = (inHeight - outHeight) / 2;

if (crop_left < 0 || crop_top < 0) {
// Math will fail. Return a black image.
return output;
}

for (int j = 0; j < outHeight; j++) {
final int yInCol = (crop_top + j) * inWidth + crop_left;
final int uvInCol = inFrameSize + ((crop_top + j) >> 1) * inWidth + crop_left;
Expand All @@ -79,8 +92,14 @@ static byte[] rotateNV21(final byte[] input, final int inWidth, final int inHeig
}
}
} else if (rotation == 90 || rotation == 270) {
int crop_left = (inWidth - outHeight) / 2;
int crop_top = (inHeight - outWidth) / 2;
final int crop_left = (inWidth - outHeight) / 2;
final int crop_top = (inHeight - outWidth) / 2;

if (crop_left < 0 || crop_top < 0) {
// Math will fail. Return a black image.
return output;
}

for (int j = 0; j < outWidth; j++) {
final int yInCol = (crop_top + j) * inWidth + crop_left;
final int uvInCol = inFrameSize + ((crop_top + j) >> 1) * inWidth + crop_left;
Expand All @@ -98,6 +117,8 @@ static byte[] rotateNV21(final byte[] input, final int inWidth, final int inHeig
output[vOut] = input[vIn];
}
}
} else {
Log.e(TAG, "Unknown rotation " + rotation);
}
return output;
}
Expand Down Expand Up @@ -166,16 +187,41 @@ void startCamera() {
mCamera = Camera.open(cameraId);
Camera.Parameters param = mCamera.getParameters();

List<Integer> supportedPreviewFormats = param.getSupportedPreviewFormats();
for (int i = 0; i < supportedPreviewFormats.size(); i++) {
Log.i(TAG, "Supported preview format: " + i);
hrydgard marked this conversation as resolved.
Show resolved Hide resolved
}

// Set preview size
List<Camera.Size> previewSizes = param.getSupportedPreviewSizes();
mPreviewSize = previewSizes.get(0);
mPreviewSize = null;

// Find the preview size that's the closest above or equal the requested size.
// We can not depend on the ordering of the incoming sizes.
for (int i = 0; i < previewSizes.size(); i++) {
Log.d(TAG, "getSupportedPreviewSizes[" + i + "]: " + previewSizes.get(i).height + " " + previewSizes.get(i).width);
if (previewSizes.get(i).width <= 640 && previewSizes.get(i).height <= 480) {
int width = previewSizes.get(i).width;
int height = previewSizes.get(i).height;
Log.d(TAG, "getSupportedPreviewSizes[" + i + "]: " + width + "x" + height);

// Reject too small preview sizes.
if (width < mTargetWidth || height < mTargetHeight) {
continue;
}

if (mPreviewSize == null) {
Log.i(TAG, "Selected first viable preview size: " + width + "x" + height);
mPreviewSize = previewSizes.get(i);
} else if (width < mPreviewSize.width || height < mPreviewSize.height) {
// Only select the new size if it's smaller.
Log.i(TAG, "Selected better viable preview size: " + width + "x" + height);
mPreviewSize = previewSizes.get(i);
break;
}
}

if (mPreviewSize == null) {
throw new Exception("Couldn't find a viable preview size");
}

Log.d(TAG, "setPreviewSize(" + mPreviewSize.width + ", " + mPreviewSize.height + ")");
param.setPreviewSize(mPreviewSize.width, mPreviewSize.height);

Expand All @@ -197,7 +243,7 @@ void startCamera() {
mCamera.setPreviewCallback(mPreviewCallback);
mCamera.startPreview();
mIsCameraRunning = true;
} catch (IOException e) {
} catch (Exception e) {
Log.e(TAG, "Cannot start camera: " + e.toString());
}
}
Expand Down