Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: AudioMediaRecorder to improve readability and resource management #3613

Merged
merged 10 commits into from
Nov 18, 2024
Merged

refactor: AudioMediaRecorder to improve readability and resource management #3613

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1e10eb8
refactor: AudioMediaRecorder to improve readability and resource mana…
kl3jvi Nov 7, 2024
36a60c4
refactor: AudioMediaRecorder to improve readability and resource mana…
kl3jvi Nov 7, 2024
293fb28
Merge branch 'wireapp:develop' into develop
kl3jvi Nov 11, 2024
9b586cd
Merge branch 'wireapp:develop' into develop
kl3jvi Nov 13, 2024
329e536
Merge branch 'develop' into develop
kl3jvi Nov 14, 2024
9ff4216
Merge branch 'develop' into develop
MohamadJaara Nov 14, 2024
c5d3efd
Merge branch 'wireapp:develop' into develop
kl3jvi Nov 15, 2024
bdb4a98
Merge branch 'develop' into develop
MohamadJaara Nov 15, 2024
e6bf6c9
Merge branch 'develop' into develop
kl3jvi Nov 18, 2024
8818770
Merge branch 'wireapp:develop' into develop
kl3jvi Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
329 changes: 158 additions & 171 deletions ...rc/main/kotlin/com/wire/android/ui/home/messagecomposer/recordaudio/AudioMediaRecorder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ import okio.buffer
import java.io.File
import java.io.FileInputStream
import java.io.IOException
import java.io.RandomAccessFile
import java.nio.ByteBuffer
import java.nio.ByteOrder
import javax.inject.Inject
Expand Down Expand Up @@ -121,19 +122,21 @@ class AudioMediaRecorder @Inject constructor(
val blockAlign = channels * (bitsPerSample / BITS_PER_BYTE)

// We use buffer() to correctly write the string values.
bufferedSink.writeUtf8(CHUNK_ID_RIFF) // Chunk ID
bufferedSink.writeIntLe(PLACEHOLDER_SIZE) // Placeholder for Chunk Size (will be updated later)
bufferedSink.writeUtf8(FORMAT_WAVE) // Format
bufferedSink.writeUtf8(SUBCHUNK1_ID_FMT) // Subchunk1 ID
bufferedSink.writeIntLe(SUBCHUNK1_SIZE_PCM) // Subchunk1 Size (PCM)
bufferedSink.writeShortLe(AUDIO_FORMAT_PCM) // Audio Format (PCM)
bufferedSink.writeShortLe(channels) // Number of Channels
bufferedSink.writeIntLe(sampleRate) // Sample Rate
bufferedSink.writeIntLe(byteRate) // Byte Rate
bufferedSink.writeShortLe(blockAlign) // Block Align
bufferedSink.writeShortLe(bitsPerSample) // Bits Per Sample
bufferedSink.writeUtf8(SUBCHUNK2_ID_DATA) // Subchunk2 ID
bufferedSink.writeIntLe(PLACEHOLDER_SIZE) // Placeholder for Subchunk2 Size (will be updated later)
with(bufferedSink) {
writeUtf8(CHUNK_ID_RIFF) // Chunk ID
writeIntLe(PLACEHOLDER_SIZE) // Placeholder for Chunk Size (will be updated later)
writeUtf8(FORMAT_WAVE) // Format
writeUtf8(SUBCHUNK1_ID_FMT) // Subchunk1 ID
writeIntLe(SUBCHUNK1_SIZE_PCM) // Subchunk1 Size (PCM)
writeShortLe(AUDIO_FORMAT_PCM) // Audio Format (PCM)
writeShortLe(channels) // Number of Channels
writeIntLe(sampleRate) // Sample Rate
writeIntLe(byteRate) // Byte Rate
writeShortLe(blockAlign) // Block Align
writeShortLe(bitsPerSample) // Bits Per Sample
writeUtf8(SUBCHUNK2_ID_DATA) // Subchunk2 ID
writeIntLe(PLACEHOLDER_SIZE) // Placeholder for Subchunk2 Size (will be updated later)
}
}

private fun updateWavHeader(filePath: Path) {
Expand All @@ -149,17 +152,14 @@ class AudioMediaRecorder @Inject constructor(
dataSizeBuffer.order(ByteOrder.LITTLE_ENDIAN)
dataSizeBuffer.putInt(dataSize)

val randomAccessFile = java.io.RandomAccessFile(file, "rw")

// Update Chunk Size
randomAccessFile.seek(CHUNK_SIZE_OFFSET.toLong())
randomAccessFile.write(chunkSizeBuffer.array())

// Update Subchunk2 Size
randomAccessFile.seek(SUBCHUNK2_SIZE_OFFSET.toLong())
randomAccessFile.write(dataSizeBuffer.array())

randomAccessFile.close()
RandomAccessFile(file, "rw").use { randomAccessFile ->
// Update Chunk Size
randomAccessFile.seek(CHUNK_SIZE_OFFSET.toLong())
randomAccessFile.write(chunkSizeBuffer.array())
// Update Subchunk2 Size
randomAccessFile.seek(SUBCHUNK2_SIZE_OFFSET.toLong())
randomAccessFile.write(dataSizeBuffer.array())
}

appLogger.i("Updated WAV Header: Chunk Size = ${fileSize - CHUNK_ID_SIZE}, Data Size = $dataSize")
}
Expand All @@ -175,194 +175,181 @@ class AudioMediaRecorder @Inject constructor(
audioRecorder = null
}

@Suppress("NestedBlockDepth")
private fun writeAudioDataToFile() {
val data = ByteArray(BUFFER_SIZE)
var sink: okio.Sink? = null

try {
sink = kaliumFileSystem.sink(originalOutputPath!!)
val bufferedSink = sink.buffer()

// Write WAV header
writeWavHeader(bufferedSink, SAMPLING_RATE, AUDIO_CHANNELS, BITS_PER_SAMPLE)

while (isRecording) {
val read = audioRecorder?.read(data, 0, BUFFER_SIZE) ?: 0
if (read > 0) {
bufferedSink.write(data, 0, read)
}
kaliumFileSystem.sink(originalOutputPath!!).use { sink ->
sink.buffer()
.use {
writeWavHeader(it, SAMPLING_RATE, AUDIO_CHANNELS, BITS_PER_SAMPLE)
while (isRecording) {
val read = audioRecorder?.read(data, 0, BUFFER_SIZE) ?: 0
if (read > 0) {
it.write(data, 0, read)
}

// Check if the file size exceeds the limit
val currentSize = originalOutputPath!!.toFile().length()
if (currentSize > (assetLimitInMB * SIZE_OF_1MB)) {
isRecording = false
scope.launch {
_maxFileSizeReached.emit(
RecordAudioDialogState.MaxFileSizeReached(
maxSize = assetLimitInMB / SIZE_OF_1MB
)
)
// Check if the file size exceeds the limit
val currentSize = originalOutputPath!!.toFile().length()
if (currentSize > (assetLimitInMB * SIZE_OF_1MB)) {
isRecording = false
scope.launch {
_maxFileSizeReached.emit(
RecordAudioDialogState.MaxFileSizeReached(
maxSize = assetLimitInMB / SIZE_OF_1MB
)
)
}
break
}
}
updateWavHeader(originalOutputPath!!)
}
break
}
}

// Close buffer to ensure all data is written
bufferedSink.close()

// Update WAV header with final file size
updateWavHeader(originalOutputPath!!)
} catch (e: IOException) {
e.printStackTrace()
appLogger.e("[RecordAudio] writeAudioDataToFile: IOException - ${e.message}")
} finally {
sink?.close()
}
}

@Suppress("LongMethod", "CyclomaticComplexMethod", "TooGenericExceptionCaught")
suspend fun convertWavToMp4(inputFilePath: String): Boolean = withContext(Dispatchers.IO) {
var codec: MediaCodec? = null
var muxer: MediaMuxer? = null
var fileInputStream: FileInputStream? = null
var parcelFileDescriptor: ParcelFileDescriptor? = null
var success = true

try {
val inputFile = File(inputFilePath)
fileInputStream = FileInputStream(inputFile)

val outputFile = mp4OutputPath?.toFile()
parcelFileDescriptor = ParcelFileDescriptor.open(
outputFile,
ParcelFileDescriptor.MODE_READ_WRITE or ParcelFileDescriptor.MODE_CREATE
)

val mediaExtractor = MediaExtractor()
mediaExtractor.setDataSource(inputFilePath)

val format = MediaFormat.createAudioFormat(
MediaFormat.MIMETYPE_AUDIO_AAC,
SAMPLING_RATE,
AUDIO_CHANNELS
)
format.setInteger(MediaFormat.KEY_BIT_RATE, BIT_RATE)
format.setInteger(MediaFormat.KEY_AAC_PROFILE, MediaCodecInfo.CodecProfileLevel.AACObjectLC)

codec = MediaCodec.createEncoderByType(MediaFormat.MIMETYPE_AUDIO_AAC)
codec.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE)
codec.start()

val bufferInfo = MediaCodec.BufferInfo()
muxer = MediaMuxer(parcelFileDescriptor.fileDescriptor, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4)
var trackIndex = -1
var sawInputEOS = false
var sawOutputEOS = false

var retryCount = 0
var presentationTimeUs = 0L
val bytesPerSample = (BITS_PER_SAMPLE / BITS_PER_BYTE) * AUDIO_CHANNELS

while (!sawOutputEOS && retryCount < MAX_RETRY_COUNT) {
if (!sawInputEOS) {
val inputBufferIndex = codec.dequeueInputBuffer(TIMEOUT_US)
if (inputBufferIndex >= 0) {
val inputBuffer = codec.getInputBuffer(inputBufferIndex)
inputBuffer?.clear()

val sampleSize = fileInputStream.channel.read(inputBuffer!!)
if (sampleSize < 0) {
codec.queueInputBuffer(inputBufferIndex, 0, 0, 0, MediaCodec.BUFFER_FLAG_END_OF_STREAM)
sawInputEOS = true
} else {
val numSamples = sampleSize / bytesPerSample
val bufferDurationUs = (numSamples * MICROSECONDS_PER_SECOND) / SAMPLING_RATE
codec.queueInputBuffer(inputBufferIndex, 0, sampleSize, presentationTimeUs, 0)

presentationTimeUs += bufferDurationUs
}
}
}

val outputBufferIndex = codec.dequeueOutputBuffer(bufferInfo, TIMEOUT_US)

when {
outputBufferIndex == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED -> {
val newFormat = codec.outputFormat
trackIndex = muxer.addTrack(newFormat)
muxer.start()
retryCount = 0
}

outputBufferIndex >= 0 -> {
val outputBuffer = codec.getOutputBuffer(outputBufferIndex)

if (bufferInfo.flags and MediaCodec.BUFFER_FLAG_CODEC_CONFIG != 0) {
bufferInfo.size = 0
}

if (bufferInfo.size != 0 && outputBuffer != null) {
outputBuffer.position(bufferInfo.offset)
outputBuffer.limit(bufferInfo.offset + bufferInfo.size)
FileInputStream(File(inputFilePath)).use { fileInputStream ->
mp4OutputPath?.toFile()?.let { outputFile ->
ParcelFileDescriptor.open(
outputFile,
ParcelFileDescriptor.MODE_READ_WRITE or ParcelFileDescriptor.MODE_CREATE
).use { parcelFileDescriptor ->

val mediaExtractor = MediaExtractor()
mediaExtractor.setDataSource(inputFilePath)

val format = MediaFormat.createAudioFormat(
MediaFormat.MIMETYPE_AUDIO_AAC,
SAMPLING_RATE,
AUDIO_CHANNELS
)
format.setInteger(MediaFormat.KEY_BIT_RATE, BIT_RATE)
format.setInteger(MediaFormat.KEY_AAC_PROFILE, MediaCodecInfo.CodecProfileLevel.AACObjectLC)

codec = MediaCodec.createEncoderByType(MediaFormat.MIMETYPE_AUDIO_AAC)
val mediaCodec = codec!!
mediaCodec.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE)
mediaCodec.start()

val bufferInfo = MediaCodec.BufferInfo()
muxer = MediaMuxer(parcelFileDescriptor.fileDescriptor, MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4)
val mediaMuxer = muxer!!

var trackIndex = -1
var sawInputEOS = false
var sawOutputEOS = false

var retryCount = 0
var presentationTimeUs = 0L
val bytesPerSample = (BITS_PER_SAMPLE / BITS_PER_BYTE) * AUDIO_CHANNELS

while (!sawOutputEOS && retryCount < MAX_RETRY_COUNT) {
if (!sawInputEOS) {
val inputBufferIndex = mediaCodec.dequeueInputBuffer(TIMEOUT_US)
if (inputBufferIndex >= 0) {
val inputBuffer = mediaCodec.getInputBuffer(inputBufferIndex)
inputBuffer?.clear()

val sampleSize = fileInputStream.channel.read(inputBuffer!!)
if (sampleSize < 0) {
mediaCodec.queueInputBuffer(inputBufferIndex, 0, 0, 0, MediaCodec.BUFFER_FLAG_END_OF_STREAM)
sawInputEOS = true
} else {
val numSamples = sampleSize / bytesPerSample
val bufferDurationUs = (numSamples * MICROSECONDS_PER_SECOND) / SAMPLING_RATE
mediaCodec.queueInputBuffer(inputBufferIndex, 0, sampleSize, presentationTimeUs, 0)

presentationTimeUs += bufferDurationUs
}
}
}

if (trackIndex >= 0) {
muxer.writeSampleData(trackIndex, outputBuffer, bufferInfo)
} else {
appLogger.e("Track index is not set. Skipping writeSampleData.")
val outputBufferIndex = mediaCodec.dequeueOutputBuffer(bufferInfo, TIMEOUT_US)

when {
outputBufferIndex == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED -> {
val newFormat = mediaCodec.outputFormat
trackIndex = mediaMuxer.addTrack(newFormat)
mediaMuxer.start()
retryCount = 0
}

outputBufferIndex >= 0 -> {
val outputBuffer = mediaCodec.getOutputBuffer(outputBufferIndex)

if (bufferInfo.flags and MediaCodec.BUFFER_FLAG_CODEC_CONFIG != 0) {
bufferInfo.size = 0
}

if (bufferInfo.size != 0 && outputBuffer != null) {
outputBuffer.position(bufferInfo.offset)
outputBuffer.limit(bufferInfo.offset + bufferInfo.size)

if (trackIndex >= 0) {
mediaMuxer.writeSampleData(trackIndex, outputBuffer, bufferInfo)
} else {
appLogger.e("Track index is not set. Skipping writeSampleData.")
}
}

mediaCodec.releaseOutputBuffer(outputBufferIndex, false)
retryCount = 0

if (bufferInfo.flags and MediaCodec.BUFFER_FLAG_END_OF_STREAM != 0) {
sawOutputEOS = true
}
}

outputBufferIndex == MediaCodec.INFO_TRY_AGAIN_LATER -> {
retryCount++
delay(RETRY_DELAY_IN_MILLIS)
}
}
}

codec.releaseOutputBuffer(outputBufferIndex, false)
retryCount = 0

if (bufferInfo.flags and MediaCodec.BUFFER_FLAG_END_OF_STREAM != 0) {
sawOutputEOS = true
if (retryCount >= MAX_RETRY_COUNT) {
appLogger.e("Reached maximum retries without receiving output from codec.")
success = false
}
}

outputBufferIndex == MediaCodec.INFO_TRY_AGAIN_LATER -> {
retryCount++
delay(RETRY_DELAY_IN_MILLIS)
}
} ?: run {
appLogger.e("[RecordAudio] convertWavToMp4: mp4OutputPath is null")
success = false
}
}
if (retryCount >= MAX_RETRY_COUNT) {
appLogger.e("Reached maximum retries without receiving output from codec.")
success = false
}
} catch (e: Exception) {
appLogger.e("Could not convert wav to mp4: ${e.message}", throwable = e)
success = false
} finally {
try {
fileInputStream?.close()
} catch (e: Exception) {
appLogger.e("Could not close FileInputStream: ${e.message}", throwable = e)
success = false
}

try {
muxer?.stop()
muxer?.release()
muxer?.let { safeMuxer ->
safeMuxer.stop()
safeMuxer.release()
}
} catch (e: Exception) {
appLogger.e("Could not stop or release MediaMuxer: ${e.message}", throwable = e)
success = false
}

try {
codec?.stop()
codec?.release()
codec?.let { safeCodec ->
safeCodec.stop()
safeCodec.release()
}
} catch (e: Exception) {
appLogger.e("Could not stop or release MediaCodec: ${e.message}", throwable = e)
success = false
}

try {
parcelFileDescriptor?.close()
} catch (e: Exception) {
appLogger.e("Could not close ParcelFileDescriptor: ${e.message}", throwable = e)
success = false
}
}
success
}
Expand Down
Loading