From e7af605bfe876ab49ca00aa2af60714fd1d0881c Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Mon, 28 Jan 2019 01:42:56 +0100 Subject: [PATCH] Remove unused audioBitRate from audio encoder --- .../otaliastudios/cameraview/AudioMediaEncoder.java | 12 ++++-------- .../cameraview/SnapshotVideoRecorder.java | 6 +++--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/cameraview/src/main/gles/com/otaliastudios/cameraview/AudioMediaEncoder.java b/cameraview/src/main/gles/com/otaliastudios/cameraview/AudioMediaEncoder.java index 6122a77d..cb2dbe9f 100644 --- a/cameraview/src/main/gles/com/otaliastudios/cameraview/AudioMediaEncoder.java +++ b/cameraview/src/main/gles/com/otaliastudios/cameraview/AudioMediaEncoder.java @@ -39,7 +39,8 @@ class AudioMediaEncoder extends MediaEncoder { private static final int SAMPLE_SIZE = 2; // byte/sample/channel private static final int BYTE_RATE_PER_CHANNEL = SAMPLING_FREQUENCY * SAMPLE_SIZE; // byte/sec/channel private static final int BYTE_RATE = BYTE_RATE_PER_CHANNEL * CHANNELS_COUNT; // byte/sec - private static final int BIT_RATE = BYTE_RATE * 8; // bit/sec + + static final int BIT_RATE = BYTE_RATE * 8; // bit/sec // We call FRAME here the chunk of data that we want to read at each loop cycle private static final int FRAME_SIZE_PER_CHANNEL = 1024; // bytes/frame/channel [AAC constant] @@ -55,13 +56,8 @@ class AudioMediaEncoder extends MediaEncoder { private AudioRecordingThread mRecorder; private ByteBufferPool mByteBufferPool; - // TODO this bitRate is ignored. - static class Config { - int bitRate; - Config(int bitRate) { - this.bitRate = bitRate; - } - } + // TODO add options + static class Config { } AudioMediaEncoder(@NonNull Config config) { } diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/SnapshotVideoRecorder.java b/cameraview/src/main/java/com/otaliastudios/cameraview/SnapshotVideoRecorder.java index 61d9429e..46130d71 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/SnapshotVideoRecorder.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/SnapshotVideoRecorder.java @@ -20,7 +20,6 @@ class SnapshotVideoRecorder extends VideoRecorder implements GlCameraPreview.Ren private static final int DEFAULT_VIDEO_FRAMERATE = 30; private static final int DEFAULT_VIDEO_BITRATE = 1000000; - private static final int DEFAULT_AUDIO_BITRATE = 64000; private static final int STATE_RECORDING = 0; private static final int STATE_NOT_RECORDING = 1; @@ -71,7 +70,6 @@ class SnapshotVideoRecorder extends VideoRecorder implements GlCameraPreview.Ren case DEVICE_DEFAULT: type = "video/avc"; break; } if (mResult.videoBitRate <= 0) mResult.videoBitRate = DEFAULT_VIDEO_BITRATE; - if (mResult.audioBitRate <= 0) mResult.audioBitRate = DEFAULT_AUDIO_BITRATE; if (mResult.videoFrameRate <= 0) mResult.videoFrameRate = DEFAULT_VIDEO_FRAMERATE; LOG.w("Creating frame encoder. Rotation:", mResult.rotation); TextureMediaEncoder.Config config = new TextureMediaEncoder.Config(width, height, @@ -84,9 +82,11 @@ class SnapshotVideoRecorder extends VideoRecorder implements GlCameraPreview.Ren EGL14.eglGetCurrentContext() ); TextureMediaEncoder videoEncoder = new TextureMediaEncoder(config); + AudioMediaEncoder audioEncoder = null; if (mResult.audio == Audio.ON) { - audioEncoder = new AudioMediaEncoder(new AudioMediaEncoder.Config(mResult.audioBitRate)); + audioEncoder = new AudioMediaEncoder(new AudioMediaEncoder.Config()); + mResult.audioBitRate = AudioMediaEncoder.BIT_RATE; } mEncoderEngine = new MediaEncoderEngine(mResult.file, videoEncoder, audioEncoder, mResult.maxDuration, mResult.maxSize, SnapshotVideoRecorder.this);