Real time buffer (?)

stranck · stranck · commit 2f9f45592bcc · 2020-05-05T18:14:55.000+02:00
diff --git a/README.md b/README.md
@@ -12,7 +12,6 @@ MTC and LTC timecode generator library in Java
 ## TODO list:
 - ALL of the MTC part
 - Write a timecode reader for both MTC and LTC
-- Changing audio output method to something more real time (now "real time" is garanted by just reducing the buffer size lmao)
 - 44.1khz support (But I think this will be done together with the previous point)
 - Writing docs (sigh)
 - Writing an example/test
diff --git a/src/main/java/ovh/stranck/javaTimecode/App.java b/src/main/java/ovh/stranck/javaTimecode/App.java
@@ -7,14 +7,14 @@
 
 public class App {
 	public static void main(String[] args) throws LineUnavailableException {
-		Mixer m = Utils.getMixer("*Realtek*");
+		Mixer m = Utils.getMixer("*PnP*");
 		System.out.println(m.getMixerInfo());
 		LTCGenerator ltc = new LTCGenerator(m, 48000);
 		TimecodePlayer tp = ltc.getTimecodePlayer();
 		Timecode tc = ltc.getPacket();
 		System.out.println("starting");
 		ltc.start();
-		Wait.wait(1000);
+		//Wait.wait(1000);
 		//tc.setHours(1);
 		//Wait.wait(5000);
 		tp.setSpeed(1);
diff --git a/src/main/java/ovh/stranck/javaTimecode/Timecode.java b/src/main/java/ovh/stranck/javaTimecode/Timecode.java
@@ -10,6 +10,7 @@ public abstract class Timecode {
 	
 	public abstract byte[] asByteArray();
 	public abstract String asBitsString();
+	public abstract int getPacketSize(Object o);
 	
 	public Timecode(int hour, int min, int sec, int frame, Framerates framerate){
 		this.framerate = framerate;
@@ -145,6 +146,11 @@ public Timecode previousFrame(){
 		sanityzeTime(true);
 		return this;
 	}
+	public Timecode addFrames(int frames){
+		this.frames += frames;
+		sanityzeTime(true);
+		return this;
+	}
 	public Framerates getFramerate() {
 		return framerate;
 	}
diff --git a/src/main/java/ovh/stranck/javaTimecode/TimecodePlayer.java b/src/main/java/ovh/stranck/javaTimecode/TimecodePlayer.java
@@ -16,11 +16,13 @@ public TimecodePlayer(Timecode t, double speed){
 		setSpeed(speed);
 	}
 	
-	public synchronized TimecodePlayer updateTimecodeTime(){
+	public int convertToFrames(int value){
+		return (int) (value * speed * t.getFramerate().getIntegerFramerate() / 1000 + zFrame + offset);
+	}
+	public synchronized TimecodePlayer updateTimecodeTime(int msOffset){
 		if(playing){
 			//System.out.println((System.currentTimeMillis() - zMs) + " ");
-			t.setTimeWithoutUpdatingStartPoint((int) ((System.currentTimeMillis() - zMs)
-				* speed * t.getFramerate().getIntegerFramerate() / 1000 + zFrame + offset));
+			t.setTimeWithoutUpdatingStartPoint(convertToFrames((int) (System.currentTimeMillis() - zMs + msOffset)));
 		}
 		return this;
 	}
diff --git a/src/main/java/ovh/stranck/javaTimecode/ltc/LTCGenerator.java b/src/main/java/ovh/stranck/javaTimecode/ltc/LTCGenerator.java
@@ -2,6 +2,8 @@
 
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.DataLine;
+import javax.sound.sampled.LineEvent;
+import javax.sound.sampled.LineListener;
 import javax.sound.sampled.LineUnavailableException;
 import javax.sound.sampled.Mixer;
 import javax.sound.sampled.SourceDataLine;
@@ -10,37 +12,49 @@
 import ovh.stranck.javaTimecode.Wait;
 
 public class LTCGenerator implements Runnable {
-    private volatile float bufferCapacity = 0.5f;
+    private volatile float bufferCapacity = 0.01f;
 	private volatile TimecodePlayer tcPlayer;
     private volatile LTCPacket packet;
 	
     private SourceDataLine dataLine;
     private Thread runThread;
 	private Mixer mixer;
 	private int sampleRate;
+	private int packetSize;
     
 	public LTCGenerator(Mixer output, int sampleRate) throws LineUnavailableException{
 		this.mixer = output;
 		this.sampleRate = sampleRate;
 		setPacket(new LTCPacket());
+		packetSize = packet.getPacketSize(sampleRate);
 		
 		AudioFormat format = new AudioFormat(sampleRate, 8, 1, true, true);
         SourceDataLine.Info info = new DataLine.Info(SourceDataLine.class, format);
         dataLine = (SourceDataLine) mixer.getLine(info);
         dataLine.open();
         dataLine.start();
+		dataLine.addLineListener(new LineListener() {
+			
+			public void update(LineEvent event) {
+				System.out.println("ev " + event.getType());
+			}
+		});
 	}
 
 	public void run() {
 		byte[] content;
+		int bufferUsed;
 		tcPlayer.updateStartPoint();
 		while(!Thread.interrupted()){
-			if(dataLine.getBufferSize() * bufferCapacity < dataLine.available()){
-				tcPlayer.updateTimecodeTime();
+			bufferUsed = dataLine.getBufferSize() - dataLine.available();
+			//System.out.println(bufferUsed);
+			if(bufferUsed < packetSize * bufferCapacity){
+				tcPlayer.updateTimecodeTime(bufferUsed * 1000 / sampleRate);
 				content = packet.asAudioSample(sampleRate);
 				dataLine.write(content, 0, content.length);
 				System.out.println(packet);
 			}
+			//System.out.println(dataLine.getBufferSize() - dataLine.available() + " " + packetSize * bufferCapacity);
 			Wait.wait(1);
 		}
 		dataLine.drain();
diff --git a/src/main/java/ovh/stranck/javaTimecode/ltc/LTCPacket.java b/src/main/java/ovh/stranck/javaTimecode/ltc/LTCPacket.java
@@ -70,8 +70,7 @@ public boolean[] asBooleanArray(){
 		return data;
 	}
 	public byte[] asAudioSample(int sampleRate){
-		int repeat = (int) (sampleRate / (160 * framerate.getFps()));
-		return manchesterEncode(asBooleanArray(), repeat);
+		return manchesterEncode(asBooleanArray(), getBitExpansion(sampleRate));
 	}
 	@Override
 	public byte[] asByteArray() {
@@ -86,6 +85,14 @@ public String asBitsString(){
 
 		return sb.toString();
 	}
+	@Override
+	public int getPacketSize(Object o){
+		return 160 * getBitExpansion((Integer) o);
+	}
+	
+	private int getBitExpansion(int sampleRate){
+		return (int) (sampleRate / (160 * framerate.getFps()));
+	}
 	
 	private byte[] manchesterEncode(boolean value[], int repeatBytes) {
 		byte[] result = new byte[value.length * 2 * repeatBytes];

Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,13 @@ public TimecodePlayer(Timecode t, double speed){`
`16`	`16`	`setSpeed(speed);`
`17`	`17`	`}`
`18`	`18`
`19`		`- public synchronized TimecodePlayer updateTimecodeTime(){`
	`19`	`+ public int convertToFrames(int value){`
	`20`	`+ return (int) (value * speed * t.getFramerate().getIntegerFramerate() / 1000 + zFrame + offset);`
	`21`	`+ }`
	`22`	`+ public synchronized TimecodePlayer updateTimecodeTime(int msOffset){`
`20`	`23`	`if(playing){`
`21`	`24`	`//System.out.println((System.currentTimeMillis() - zMs) + " ");`
`22`		`- t.setTimeWithoutUpdatingStartPoint((int) ((System.currentTimeMillis() - zMs)`
`23`		`- * speed * t.getFramerate().getIntegerFramerate() / 1000 + zFrame + offset));`
	`25`	`+ t.setTimeWithoutUpdatingStartPoint(convertToFrames((int) (System.currentTimeMillis() - zMs + msOffset)));`
`24`	`26`	`}`
`25`	`27`	`return this;`
`26`	`28`	`}`