From b68a66b4cec965224e156e04250ef32b3442621f Mon Sep 17 00:00:00 2001 From: Ahmet Inan Date: Fri, 19 Apr 2024 18:34:16 +0200 Subject: [PATCH] added decoder for Martin --- app/src/main/java/xdsopl/robot36/Martin.java | 31 ++++++++++++++++---- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/xdsopl/robot36/Martin.java b/app/src/main/java/xdsopl/robot36/Martin.java index 6b062e5..b8de05e 100644 --- a/app/src/main/java/xdsopl/robot36/Martin.java +++ b/app/src/main/java/xdsopl/robot36/Martin.java @@ -8,6 +8,11 @@ package xdsopl.robot36; public class Martin implements Mode { private final int scanLineSamples; + private final int channelSamples; + private final int greenBeginSamples; + private final int blueBeginSamples; + private final int redBeginSamples; + private final int redEndSamples; private final String name; Martin(String name, double channelSeconds, int sampleRate) { @@ -16,6 +21,17 @@ public class Martin implements Mode { double separatorSeconds = 0.000572; double scanLineSeconds = syncPulseSeconds + separatorSeconds + 3 * (channelSeconds + separatorSeconds); scanLineSamples = (int) Math.round(scanLineSeconds * sampleRate); + channelSamples = (int) Math.round(channelSeconds * sampleRate); + double greenBeginSeconds = syncPulseSeconds / 2 + separatorSeconds; + greenBeginSamples = (int) Math.round(greenBeginSeconds * sampleRate); + double greenEndSeconds = greenBeginSeconds + channelSeconds; + double blueBeginSeconds = greenEndSeconds + separatorSeconds; + blueBeginSamples = (int) Math.round(blueBeginSeconds * sampleRate); + double blueEndSeconds = blueBeginSeconds + channelSeconds; + double redBeginSeconds = blueEndSeconds + separatorSeconds; + redBeginSamples = (int) Math.round(redBeginSeconds * sampleRate); + double redEndSeconds = redBeginSeconds + channelSeconds; + redEndSamples = (int) Math.round(redEndSeconds * sampleRate); } @Override @@ -29,13 +45,18 @@ public class Martin implements Mode { } @Override - public boolean decodeScanLine(int[] pixelBuffer, float[] scanLineBuffer, int prevPulseIndex, int scanLineSamples) { - if (prevPulseIndex < 0 || prevPulseIndex + scanLineSamples >= scanLineBuffer.length) + public boolean decodeScanLine(int[] pixelBuffer, float[] scanLineBuffer, int prevPulseIndex, int ignore) { + if (prevPulseIndex + greenBeginSamples < 0 || prevPulseIndex + redEndSamples > scanLineBuffer.length) return false; for (int i = 0; i < pixelBuffer.length; ++i) { - int position = (i * scanLineSamples) / pixelBuffer.length + prevPulseIndex; - int intensity = (int) Math.round(255 * Math.sqrt(scanLineBuffer[position])); - int pixelColor = 0xff000000 | 0x00010101 * intensity; + int position = (i * channelSamples) / pixelBuffer.length + prevPulseIndex; + int greenPos = position + greenBeginSamples; + int bluePos = position + blueBeginSamples; + int redPos = position + redBeginSamples; + int green = Math.round(255 * scanLineBuffer[greenPos]); + int blue = Math.round(255 * scanLineBuffer[bluePos]); + int red = Math.round(255 * scanLineBuffer[redPos]); + int pixelColor = 0xff000000 | (red << 16) | (green << 8) | blue; pixelBuffer[i] = pixelColor; } return true;