Remove performance logging code

pull/506/head
Mattia Iavarone 6 years ago
parent 0fd0fad4b4
commit 0fe7c9235a
  1. 35
      cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/AudioMediaEncoder.java

@ -19,8 +19,6 @@ import androidx.annotation.RequiresApi;
import java.io.IOException; import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
/** /**
@ -254,14 +252,14 @@ public class AudioMediaEncoder extends MediaEncoder {
} }
// Just to debug performance. // Just to debug performance.
private int mSendCount = 0; // private int mSendCount = 0;
private int mExecuteCount = 0; // private int mExecuteCount = 0;
private long mAvgSendDelay = 0; // private long mAvgSendDelay = 0;
private long mAvgExecuteDelay = 0; // private long mAvgExecuteDelay = 0;
private Map<Long, Long> mSendStartMap = new HashMap<>(); // private Map<Long, Long> mSendStartMap = new HashMap<>();
private void sendInputBuffer(ByteBuffer buffer, long presentationTimeUs, boolean endOfStream) { private void sendInputBuffer(ByteBuffer buffer, long presentationTimeUs, boolean endOfStream) {
mSendStartMap.put(presentationTimeUs, System.nanoTime() / 1000000); // mSendStartMap.put(presentationTimeUs, System.nanoTime() / 1000000);
sendMessage(obtainMessage( sendMessage(obtainMessage(
endOfStream ? 1 : 0, endOfStream ? 1 : 0,
(int) (presentationTimeUs >> 32), (int) (presentationTimeUs >> 32),
@ -277,12 +275,11 @@ public class AudioMediaEncoder extends MediaEncoder {
LOG.i("encoding thread - got buffer. timestamp:", timestamp, "eos:", endOfStream); LOG.i("encoding thread - got buffer. timestamp:", timestamp, "eos:", endOfStream);
// Performance logging // Performance logging
long sendEnd = System.nanoTime() / 1000000; // long sendEnd = System.nanoTime() / 1000000;
//noinspection ConstantConditions // long sendStart = mSendStartMap.remove(timestamp);
long sendStart = mSendStartMap.remove(timestamp); // mAvgSendDelay = ((mAvgSendDelay * mSendCount) + (sendEnd - sendStart)) / (++mSendCount);
mAvgSendDelay = ((mAvgSendDelay * mSendCount) + (sendEnd - sendStart)) / (++mSendCount); // LOG.v("send delay millis:", sendEnd - sendStart, "average:", mAvgSendDelay);
LOG.v("send delay millis:", sendEnd - sendStart, "average:", mAvgSendDelay); // long executeStart = System.nanoTime() / 1000000;
long executeStart = System.nanoTime() / 1000000;
// Actual work // Actual work
ByteBuffer buffer = (ByteBuffer) msg.obj; ByteBuffer buffer = (ByteBuffer) msg.obj;
@ -307,9 +304,9 @@ public class AudioMediaEncoder extends MediaEncoder {
} }
} }
long executeEnd = System.nanoTime() / 1000000; // long executeEnd = System.nanoTime() / 1000000;
mAvgExecuteDelay = ((mAvgExecuteDelay * mExecuteCount) + (executeEnd - executeStart)) / (++mExecuteCount); // mAvgExecuteDelay = ((mAvgExecuteDelay * mExecuteCount) + (executeEnd - executeStart)) / (++mExecuteCount);
LOG.v("execute delay millis:", executeEnd - executeStart, "average:", mAvgExecuteDelay); // LOG.v("execute delay millis:", executeEnd - executeStart, "average:", mAvgExecuteDelay);
} }
private void performPendingOp(InputBuffer buffer) { private void performPendingOp(InputBuffer buffer) {
@ -328,8 +325,8 @@ public class AudioMediaEncoder extends MediaEncoder {
drainOutput(eos); drainOutput(eos);
if (eos) { if (eos) {
// Not sure we want this: WorkerHandler.get("AudioEncodingHandler").getThread().interrupt(); // Not sure we want this: WorkerHandler.get("AudioEncodingHandler").getThread().interrupt();
LOG.e("EXECUTE DELAY MILLIS:", mAvgExecuteDelay); // LOG.e("EXECUTE DELAY MILLIS:", mAvgExecuteDelay);
LOG.e("SEND DELAY MILLIS:", mAvgSendDelay); // LOG.e("SEND DELAY MILLIS:", mAvgSendDelay);
} }
} }
} }

Loading…
Cancel
Save