Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Fix for CameraView blacks outs and Aspect ratio iteration issue #125

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix for CameraView blacks outs and Aspect ratio iteration issue #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f892dcb
Merge pull request #1 from google/master
FabinPaul Mar 24, 2017
a5c04b2
fix: get Supported AspectRatio depends on supported picture size
FabinPaul Mar 24, 2017
9194d6f
Merge pull request #2 from google/master
FabinPaul Mar 24, 2017
4640ec6
fix: Removed blank screen after changing aspect ratio
FabinPaul Mar 24, 2017
93611ff
fix: added Set of ratios to avoid `ConcurrentModificationException`
FabinPaul Mar 28, 2017
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
5 changes: 4 additions & 1 deletion library/src/main/api14/com/google/android/cameraview/Camera1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.util.List;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.concurrent.atomic.AtomicBoolean;


Expand Down Expand Up @@ -151,7 +152,9 @@ int getFacing() {
@Override
Set<AspectRatio> getSupportedAspectRatios() {
SizeMap idealAspectRatios = mPreviewSizes;
for (AspectRatio aspectRatio : idealAspectRatios.ratios()) {

Set<AspectRatio> ratios = new TreeSet<>(idealAspectRatios.ratios());
for (AspectRatio aspectRatio : ratios) {
if (mPictureSizes.sizes(aspectRatio) == null) {
idealAspectRatios.remove(aspectRatio);
}
Expand Down
3 changes: 3 additions & 0 deletions library/src/main/java/com/google/android/cameraview/CameraView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,9 @@ protected void onRestoreInstanceState(Parcelable state) {
*/
public void start() {
if (!mImpl.start()) {
if (mImpl.getView() != null) {
this.removeView(mImpl.getView());
}
//store the state ,and restore this state after fall back o Camera1
Parcelable state=onSaveInstanceState();
// Camera2 uses legacy hardware layer; fall back to Camera1
Expand Down