Merge pull request #1394 from pedroSG94/fix/streambase-release

add release method to StreamBase
pedroSG94 · Feb 14, 2024 · b68fc57 · b68fc57
2 parents 45b332a + 28e2580
commit b68fc57
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/app/src/main/java/com/pedro/streamer/rotation/StreamService.kt b/app/src/main/java/com/pedro/streamer/rotation/StreamService.kt
@@ -94,6 +94,7 @@ class StreamService: Service(), ConnectChecker {
     stopRecord()
     stopStream()
     stopPreview()
+    rtmpCamera?.release()
     sensorRotationManager?.stop()
     prepared = false
     observer.postValue(null)

diff --git a/encoder/src/main/java/com/pedro/encoder/audio/AudioEncoder.java b/encoder/src/main/java/com/pedro/encoder/audio/AudioEncoder.java
@@ -60,6 +60,8 @@ public AudioEncoder(GetAacData getAacData) {
    */
   public boolean prepareAudioEncoder(int bitRate, int sampleRate, boolean isStereo,
       int maxInputSize) {
+    if (prepared) stop();
+
     this.bitRate = bitRate;
     this.sampleRate = sampleRate;
     this.maxInputSize = maxInputSize;

diff --git a/encoder/src/main/java/com/pedro/encoder/video/VideoEncoder.java b/encoder/src/main/java/com/pedro/encoder/video/VideoEncoder.java
@@ -89,6 +89,8 @@ public boolean prepareVideoEncoder(int width, int height, int fps, int bitRate,
   public boolean prepareVideoEncoder(int width, int height, int fps, int bitRate, int rotation,
       int iFrameInterval, FormatVideoEncoder formatVideoEncoder, int profile,
       int level) {
+    if (prepared) stop();
+
     this.width = width;
     this.height = height;
     this.fps = fps;

diff --git a/library/src/main/java/com/pedro/library/base/StreamBase.kt b/library/src/main/java/com/pedro/library/base/StreamBase.kt
@@ -360,6 +360,14 @@ abstract class StreamBase(
     if (!isRecording) recordController.resetFormats()
   }
 
+  fun release() {
+    if (isStreaming) stopStream()
+    if (isRecording) stopRecord()
+    if (isOnPreview) stopPreview()
+    stopSources()
+    videoSource.release()
+  }
+
   private fun prepareEncoders(): Boolean {
     return videoEncoder.prepareVideoEncoder() && audioEncoder.prepareAudioEncoder()
   }