diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/overlay/OverlayLayout.java b/cameraview/src/main/java/com/otaliastudios/cameraview/overlay/OverlayLayout.java index bed667da..3b2bd782 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/overlay/OverlayLayout.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/overlay/OverlayLayout.java @@ -127,7 +127,7 @@ public class OverlayLayout extends FrameLayout implements Overlay { // to apply some scale (typically > 1). float widthScale = canvas.getWidth() / (float) getWidth(); float heightScale = canvas.getHeight() / (float) getHeight(); - LOG.i("draw", + LOG.v("draw", "target:", target, "canvas:", canvas.getWidth() + "x" + canvas.getHeight(), "view:", getWidth() + "x" + getHeight(), diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/AudioMediaEncoder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/AudioMediaEncoder.java index 2348a427..c6f7d6fb 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/AudioMediaEncoder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/AudioMediaEncoder.java @@ -231,11 +231,11 @@ public class AudioMediaEncoder extends MediaEncoder { } else { mCurrentReadBytes = mAudioRecord.read(mCurrentBuffer, mConfig.frameSize()); } - LOG.i("read thread - eos:", endOfStream, "- Read new audio frame. Bytes:", + LOG.v("read thread - eos:", endOfStream, "- Read new audio frame. Bytes:", mCurrentReadBytes); if (mCurrentReadBytes > 0) { // Good read: increase PTS. increaseTime(mCurrentReadBytes, endOfStream); - LOG.i("read thread - eos:", endOfStream, "- mLastTimeUs:", mLastTimeUs); + LOG.v("read thread - eos:", endOfStream, "- mLastTimeUs:", mLastTimeUs); mCurrentBuffer.limit(mCurrentReadBytes); enqueue(mCurrentBuffer, mLastTimeUs, endOfStream); } else if (mCurrentReadBytes == AudioRecord.ERROR_INVALID_OPERATION) { @@ -358,7 +358,7 @@ public class AudioMediaEncoder extends MediaEncoder { if (mInputBufferQueue.isEmpty()) { skipFrames(2); } else { - LOG.i("encoding thread - performing", mInputBufferQueue.size(), + LOG.v("encoding thread - performing", mInputBufferQueue.size(), "pending operations."); InputBuffer inputBuffer; while ((inputBuffer = mInputBufferQueue.peek()) != null) { @@ -408,7 +408,7 @@ public class AudioMediaEncoder extends MediaEncoder { private void encode(@NonNull InputBuffer buffer) { long executeStart = System.nanoTime() / 1000000; - LOG.i("encoding thread - performing pending operation for timestamp:", + LOG.v("encoding thread - performing pending operation for timestamp:", buffer.timestamp, "- encoding."); // NOTE: this copy is prob. the worst part here for performance buffer.data.put(buffer.source); @@ -417,7 +417,7 @@ public class AudioMediaEncoder extends MediaEncoder { encodeInputBuffer(buffer); boolean eos = buffer.isEndOfStream; mInputBufferPool.recycle(buffer); - LOG.i("encoding thread - performing pending operation for timestamp:", + LOG.v("encoding thread - performing pending operation for timestamp:", buffer.timestamp, "- draining."); // NOTE: can consider calling this drainOutput on yet another thread, which would let us // use an even smaller BUFFER_POOL_MAX_SIZE without losing audio frames. But this way diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoder.java index 8ce51f09..df5d9118 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoder.java @@ -397,7 +397,7 @@ public abstract class MediaEncoder { @SuppressLint("LogNotTimber") @SuppressWarnings("WeakerAccess") protected final void drainOutput(boolean drainAll) { - LOG.i(mName, "DRAINING - EOS:", drainAll); + LOG.v(mName, "DRAINING - EOS:", drainAll); if (mMediaCodec == null) { LOG.e("drain() was called before prepare() or after releasing."); return; @@ -459,7 +459,7 @@ public abstract class MediaEncoder { + mLastTimeUs - mFirstTimeUs; // Write. - LOG.i(mName, "DRAINING - About to write(). Adjusted presentation:", + LOG.v(mName, "DRAINING - About to write(). Adjusted presentation:", mBufferInfo.presentationTimeUs); OutputBuffer buffer = mOutputBufferPool.get(); //noinspection ConstantConditions diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoderEngine.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoderEngine.java index 7ca3eb14..744bf6a6 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoderEngine.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/MediaEncoderEngine.java @@ -186,7 +186,7 @@ public class MediaEncoderEngine { */ @SuppressWarnings("SameParameterValue") public final void notify(final String event, final Object data) { - LOG.i("Passing event to encoders:", event); + LOG.v("Passing event to encoders:", event); for (MediaEncoder encoder : mEncoders) { encoder.notify(event, data); } diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/TextureMediaEncoder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/TextureMediaEncoder.java index 4d30dc41..5730d590 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/TextureMediaEncoder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/video/encoding/TextureMediaEncoder.java @@ -124,7 +124,7 @@ public class TextureMediaEncoder extends VideoMediaEncoder { // Always render the first few frames, or muxer fails. return true; } else if (getPendingEvents(FRAME_EVENT) > 2) { - LOG.w("shouldRenderFrame - Dropping, we already have too many pending events:", + LOG.v("shouldRenderFrame - Dropping, we already have too many pending events:", getPendingEvents(FRAME_EVENT)); return false; } else { @@ -177,14 +177,14 @@ public class TextureMediaEncoder extends VideoMediaEncoder { } // First, drain any previous data. - LOG.i("onEvent -", + LOG.v("onEvent -", "frameNumber:", mFrameNumber, "timestampUs:", frame.timestampUs(), "- draining."); drainOutput(false); // Then draw on the surface. - LOG.i("onEvent -", + LOG.v("onEvent -", "frameNumber:", mFrameNumber, "timestampUs:", frame.timestampUs(), "- rendering.");