Commit 094c2f22 authored by Tanisha Mandre's avatar Tanisha Mandre Committed by Commit Bot

Fix QR scanner viewport

A change, cropping the QR Scanner preview layer was uploaded by mistake in CL: https://chromium-review.googlesource.com/c/chromium/src/+/1730906

This CL reverts this change.

Bug:996638

Change-Id: I4a9c462aa4fe6de81951dbf3473ac663b2e5cde1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1758240
Commit-Queue: Tanisha Mandre <tanishamandre@google.com>
Reviewed-by: default avatarGauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#689406}
parent a3b26bf2
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
} }
strongSelf.viewportRect = viewportRect; strongSelf.viewportRect = viewportRect;
if (strongSelf.metadataOutput) { if (strongSelf.metadataOutput) {
//[strongSelf.metadataOutput setRectOfInterest:_viewportRect]; [strongSelf.metadataOutput setRectOfInterest:_viewportRect];
} }
}); });
} }
......
...@@ -80,10 +80,6 @@ using base::UserMetricsAction; ...@@ -80,10 +80,6 @@ using base::UserMetricsAction;
]]; ]];
AVCaptureVideoPreviewLayer* previewLayer = [self.scannerView getPreviewLayer]; AVCaptureVideoPreviewLayer* previewLayer = [self.scannerView getPreviewLayer];
// CGRect rect = [self.scannerView frame];
// NSLog(@"%@", NSStringFromCGRect(rect));
previewLayer.frame = CGRectMakeCenteredRectInFrame(
[self.scannerView frame].size, [self.scannerView viewportSize]);
switch ([self.cameraController getAuthorizationStatus]) { switch ([self.cameraController getAuthorizationStatus]) {
case AVAuthorizationStatusNotDetermined: case AVAuthorizationStatusNotDetermined:
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
} }
- (CGRect)viewportRectOfInterest { - (CGRect)viewportRectOfInterest {
// DCHECK(CGPointEqualToPoint(self.frame.origin, CGPointZero)); DCHECK(CGPointEqualToPoint(self.frame.origin, CGPointZero));
CGRect viewportRect = CGRect viewportRect =
CGRectMakeCenteredRectInFrame(self.frame.size, _viewportSize); CGRectMakeCenteredRectInFrame(self.frame.size, _viewportSize);
AVCaptureVideoPreviewLayer* layer = [self previewLayer]; AVCaptureVideoPreviewLayer* layer = [self previewLayer];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment