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

Handle file descriptor properly #86

Merged
merged 2 commits into from
Jan 16, 2025
Merged

Handle file descriptor properly #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6fd397
Minor code improvement
naveensingh Jan 16, 2025
95f13fc
Wrap file descriptor in parcel file descriptor
naveensingh Jan 16, 2025
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
7 changes: 4 additions & 3 deletions app/src/main/kotlin/org/fossify/voicerecorder/recorder/MediaRecorderWrapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package org.fossify.voicerecorder.recorder
import android.annotation.SuppressLint
import android.content.Context
import android.media.MediaRecorder
import android.os.ParcelFileDescriptor
import org.fossify.voicerecorder.extensions.config
import org.fossify.voicerecorder.helpers.SAMPLE_RATE
import java.io.FileDescriptor

class MediaRecorderWrapper(val context: Context) : Recorder {

Expand All @@ -22,8 +22,9 @@ class MediaRecorderWrapper(val context: Context) : Recorder {
recorder.setOutputFile(path)
}

override fun setOutputFile(fileDescriptor: FileDescriptor) {
recorder.setOutputFile(fileDescriptor)
override fun setOutputFile(parcelFileDescriptor: ParcelFileDescriptor) {
val pFD = ParcelFileDescriptor.dup(parcelFileDescriptor.fileDescriptor)
recorder.setOutputFile(pFD.fileDescriptor)
}

override fun prepare() {
Expand Down
16 changes: 9 additions & 7 deletions app/src/main/kotlin/org/fossify/voicerecorder/recorder/Mp3Recorder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import android.annotation.SuppressLint
import android.content.Context
import android.media.AudioFormat
import android.media.AudioRecord
import android.os.ParcelFileDescriptor
import com.naman14.androidlame.AndroidLame
import com.naman14.androidlame.LameBuilder
import org.fossify.commons.extensions.showErrorToast
import org.fossify.commons.helpers.ensureBackgroundThread
import org.fossify.voicerecorder.extensions.config
import org.fossify.voicerecorder.helpers.SAMPLE_RATE
import java.io.File
import java.io.FileDescriptor
import java.io.FileNotFoundException
import java.io.FileOutputStream
import java.io.IOException
Expand All @@ -26,7 +26,7 @@ class Mp3Recorder(val context: Context) : Recorder {
private var amplitude = AtomicInteger(0)
private var outputPath: String? = null
private var androidLame: AndroidLame? = null
private var fileDescriptor: FileDescriptor? = null
private var fileDescriptor: ParcelFileDescriptor? = null
private var outputStream: FileOutputStream? = null
private val minBufferSize = AudioRecord.getMinBufferSize(
SAMPLE_RATE,
Expand Down Expand Up @@ -55,7 +55,7 @@ class Mp3Recorder(val context: Context) : Recorder {

outputStream = try {
if (fileDescriptor != null) {
FileOutputStream(fileDescriptor)
FileOutputStream(fileDescriptor!!.fileDescriptor)
} else {
FileOutputStream(File(outputPath!!))
}
Expand All @@ -64,7 +64,7 @@ class Mp3Recorder(val context: Context) : Recorder {
return
}

val androidLame = LameBuilder()
androidLame = LameBuilder()
.setInSampleRate(SAMPLE_RATE)
.setOutBitrate(context.config.bitrate / 1000)
.setOutSampleRate(SAMPLE_RATE)
Expand All @@ -83,7 +83,7 @@ class Mp3Recorder(val context: Context) : Recorder {
if (!isPaused.get()) {
val count = audioRecord.read(rawData, 0, minBufferSize)
if (count > 0) {
val encoded = androidLame.encode(rawData, rawData, count, mp3buffer)
val encoded = androidLame!!.encode(rawData, rawData, count, mp3buffer)
if (encoded > 0) {
try {
updateAmplitude(rawData)
Expand All @@ -101,6 +101,7 @@ class Mp3Recorder(val context: Context) : Recorder {
override fun stop() {
isPaused.set(true)
isStopped.set(true)
audioRecord.stop()
}

override fun pause() {
Expand All @@ -114,14 +115,15 @@ class Mp3Recorder(val context: Context) : Recorder {
override fun release() {
androidLame?.flush(mp3buffer)
outputStream?.close()
audioRecord.release()
}

override fun getMaxAmplitude(): Int {
return amplitude.get()
}

override fun setOutputFile(fileDescriptor: FileDescriptor) {
this.fileDescriptor = fileDescriptor
override fun setOutputFile(parcelFileDescriptor: ParcelFileDescriptor) {
this.fileDescriptor = ParcelFileDescriptor.dup(parcelFileDescriptor.fileDescriptor)
}

private fun updateAmplitude(data: ShortArray) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/kotlin/org/fossify/voicerecorder/recorder/Recorder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.fossify.voicerecorder.recorder

import java.io.FileDescriptor
import android.os.ParcelFileDescriptor

interface Recorder {
fun setOutputFile(path: String)
fun setOutputFile(fileDescriptor: FileDescriptor)
fun setOutputFile(parcelFileDescriptor: ParcelFileDescriptor)
fun prepare()
fun start()
fun stop()
Expand Down
14 changes: 4 additions & 10 deletions app/src/main/kotlin/org/fossify/voicerecorder/services/RecorderService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,19 +113,13 @@ class RecorderService : Service() {
if (isRPlus()) {
val fileUri = createDocumentUriUsingFirstParentTreeUri(recordingFile)
createSAFFileSdk30(recordingFile)

val outputFileDescriptor =
contentResolver.openFileDescriptor(fileUri, "w")!!.fileDescriptor

recorder?.setOutputFile(outputFileDescriptor)
contentResolver.openFileDescriptor(fileUri, "w")!!
.use { recorder?.setOutputFile(it) }
} else if (isPathOnSD(recordingFile)) {
var document = getDocumentFile(recordingFile.getParentPath())
document = document?.createFile("", recordingFile.getFilenameFromPath())

val outputFileDescriptor =
contentResolver.openFileDescriptor(document!!.uri, "w")!!.fileDescriptor

recorder?.setOutputFile(outputFileDescriptor)
contentResolver.openFileDescriptor(document!!.uri, "w")!!
.use { recorder?.setOutputFile(it) }
} else {
recorder?.setOutputFile(recordingFile)
}
Expand Down
Loading