highperfocused/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2025-03-17 13:22:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

revert initialization change, configure openpnp debug logging

Browse Source
This commit is contained in:
Craig Raw 2025-03-14 11:27:25 +02:00
parent d8877a259c
commit 520c5f2cfa
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/sparrowwallet/sparrow/control/WebcamService.java
View File

@ -45,7 +45,7 @@ public class WebcamService extends ScheduledService<Image> {
private static final int QR_SAMPLE_PERIOD_MILLIS = 200; private static final int QR_SAMPLE_PERIOD_MILLIS = 200;
private OpenPnpCapture capture; private final OpenPnpCapture capture;
private CaptureStream stream; private CaptureStream stream;
private PropertyLimits zoomLimits; private PropertyLimits zoomLimits;
private long lastQrSampleTime; private long lastQrSampleTime;
@ -53,6 +53,14 @@ public class WebcamService extends ScheduledService<Image> {
private final Bokmakierie bokmakierie; private final Bokmakierie bokmakierie;
static { static {
if(log.isTraceEnabled()) {
OpenpnpCaptureLibrary.INSTANCE.Cap_setLogLevel(8);
} else if(log.isDebugEnabled()) {
OpenpnpCaptureLibrary.INSTANCE.Cap_setLogLevel(7);
} else if(log.isInfoEnabled()) {
OpenpnpCaptureLibrary.INSTANCE.Cap_setLogLevel(6);
}
OpenpnpCaptureLibrary.INSTANCE.Cap_installCustomLogFunction((level, ptr) -> { OpenpnpCaptureLibrary.INSTANCE.Cap_installCustomLogFunction((level, ptr) -> {
switch(level) { switch(level) {
case 0: case 0:
@ -75,6 +83,7 @@ public class WebcamService extends ScheduledService<Image> {
log.debug(ptr.getString(0).trim()); log.debug(ptr.getString(0).trim());
break; break;
case 8: case 8:
default:
log.trace(ptr.getString(0).trim()); log.trace(ptr.getString(0).trim());
break; break;
} }
@ -82,6 +91,7 @@ public class WebcamService extends ScheduledService<Image> {
} }
public WebcamService(WebcamResolution requestedResolution, CaptureDevice requestedDevice) { public WebcamService(WebcamResolution requestedResolution, CaptureDevice requestedDevice) {
this.capture = new OpenPnpCapture();
this.resolution = requestedResolution; this.resolution = requestedResolution;
this.device = requestedDevice; this.device = requestedDevice;
this.lastQrSampleTime = System.currentTimeMillis(); this.lastQrSampleTime = System.currentTimeMillis();
@ -95,8 +105,6 @@ public class WebcamService extends ScheduledService<Image> {
@Override @Override
protected Image call() throws Exception { protected Image call() throws Exception {
try { try {
createCapture();
if(stream == null) { if(stream == null) {
devices = capture.getDevices(); devices = capture.getDevices();
@ -143,7 +151,7 @@ public class WebcamService extends ScheduledService<Image> {
} }
if(log.isDebugEnabled()) { if(log.isDebugEnabled()) {
log.debug("Opening capture stream with format " + format.getFormatInfo().width + "x" + format.getFormatInfo().height + " (" + fourCCToString(format.getFormatInfo().fourcc) + ")"); log.debug("Opening capture stream on " + device + " with format " + format.getFormatInfo().width + "x" + format.getFormatInfo().height + " (" + fourCCToString(format.getFormatInfo().fourcc) + ")");
} }
opening.set(true); opening.set(true);
@ -179,12 +187,6 @@ public class WebcamService extends ScheduledService<Image> {
}; };
} }
private synchronized void createCapture() {
if(capture == null) {
capture = new OpenPnpCapture();
}
}
@Override @Override
public void reset() { public void reset() {
stream = null; stream = null;