jianguo
/
webcam-capture-driver-native
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix prefered media type selection in Windows

This commit is contained in:
Eduardo Ramos Ibáñez 2023-07-05 22:39:14 +02:00
parent 5d8bf86ea5
commit d3f090c408
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/main/java/com/github/eduramiba/webcamcapture/drivers/capturemanager/CaptureManagerVideoDevice.java
View File

@ -9,10 +9,10 @@ import com.github.eduramiba.webcamcapture.utils.Pair;
import java.awt.*; import java.awt.*;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.*;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Objects;
import com.github.eduramiba.webcamcapture.utils.Utils;
import javafx.scene.image.WritableImage; import javafx.scene.image.WritableImage;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -185,31 +185,47 @@ public class CaptureManagerVideoDevice implements WebcamDeviceExtended {
} }
private static CaptureManagerMediaType findBestMediaTypeInList(final Collection<CaptureManagerMediaType> mediaTypes, final Dimension resolution) { private static CaptureManagerMediaType findBestMediaTypeInList(final Collection<CaptureManagerMediaType> mediaTypes, final Dimension resolution) {
int maxPixels = 0; if (resolution == null) {
CaptureManagerMediaType bestMediaType = null; return null;
}
final List<CaptureManagerMediaType> mediaTypesForResolution = new ArrayList<>();
for (CaptureManagerMediaType mediaType : mediaTypes) { for (CaptureManagerMediaType mediaType : mediaTypes) {
if (mediaType == null) { if (mediaType == null) {
continue; continue;
} }
if (resolution != null && (resolution.width != mediaType.getWidth() || resolution.height != mediaType.getHeight())) { if (resolution.width != mediaType.getWidth() || resolution.height != mediaType.getHeight()) {
continue; continue;
} }
final int pixels = mediaType.getWidth() * mediaType.getHeight(); mediaTypesForResolution.add(mediaType);
}
if (pixels > maxPixels) { LOG.info("Media types for resolution {}x{} = {}", resolution.width, resolution.height, mediaTypesForResolution);
maxPixels = pixels;
bestMediaType = mediaType; if (mediaTypesForResolution.isEmpty()) {
} else if (pixels == maxPixels && mediaType.getSubType().contains("NV12")) {//Prefer NV12 return null;
bestMediaType = mediaType; }
} else if (pixels == maxPixels && (mediaType.getSubType().contains("YUV") || mediaType.getSubType().contains("YUY"))) {//Prefer YUV/YUY if no NV12
bestMediaType = mediaType; //Prefer NV12 (decodes faster with GPU support), then YUV and MJPG:
return Utils.coalesce(
findMediaTypeContaining(mediaTypesForResolution, "NV12"),
findMediaTypeContaining(mediaTypesForResolution, "YUV"),
findMediaTypeContaining(mediaTypesForResolution, "MJPG"),
mediaTypesForResolution.get(0)
);
}
private static CaptureManagerMediaType findMediaTypeContaining(final Collection<CaptureManagerMediaType> mediaTypes, final String subType) {
for (CaptureManagerMediaType mediaType : mediaTypes) {
if(mediaType.getSubType().contains(subType)) {
return mediaType;
} }
} }
return bestMediaType; return null;
} }
public static final int MAX_FPS = 30; public static final int MAX_FPS = 30;