Skip to content

fix camerax stop and file sources loop #2174

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

Merged
pedroSG94 merged 1 commit into from
Aug 5, 2026
Merged

fix camerax stop and file sources loop #2174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions encoder/src/main/java/com/pedro/encoder/input/decoder/BaseDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,12 +259,11 @@ private void decode() {
long ts = TimeUtils.getCurrentTimeMicro() - startTs;
sleepTime = extractor.getSleepTime(ts);
finished = !extractor.advance();
if (finished) {
if (!loopMode) {
codec.queueInputBuffer(inIndex, 0, 0, 0, MediaCodec.BUFFER_FLAG_END_OF_STREAM);
}
if (finished && !loopMode) {
codec.queueInputBuffer(inIndex, 0, 0, 0, MediaCodec.BUFFER_FLAG_END_OF_STREAM);
} else {
codec.queueInputBuffer(inIndex, 0, sampleSize, ts + sleepTime, 0);
codec.queueInputBuffer(inIndex, 0, Math.max(sampleSize, 0), ts + sleepTime, 0);
if (finished) extractor.seekTo(0);
}
}
int outIndex = codec.dequeueOutputBuffer(bufferInfo, 10000);
Expand Down
8 changes: 8 additions & 0 deletions extra-sources/src/main/java/com/pedro/extrasources/CameraXSource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@ import com.pedro.encoder.input.sources.video.VideoSource
import com.pedro.encoder.input.video.Camera2ApiManager.ImageCallback
import com.pedro.encoder.input.video.Camera2ResolutionCalculator.getOptimalResolution
import com.pedro.encoder.input.video.CameraHelper
import java.util.concurrent.CountDownLatch
import java.util.concurrent.ExecutorService
import java.util.concurrent.Executors
import java.util.concurrent.TimeUnit

/**
* Created by pedro on 16/2/24.
Expand All @@ -69,6 +71,7 @@ class CameraXSource(
private var autoWhiteBalanceEnabled = false
private var fingerSpacing = 0f
private var requiredSize: Size? = null
private var surfaceReleased = CountDownLatch(0)

override fun getLifecycle(): Lifecycle = lifecycleRegistry

Expand Down Expand Up @@ -108,6 +111,7 @@ class CameraXSource(
it.provideSurface(surface, executor) {
surface.release()
executor.shutdown()
surfaceReleased.countDown()
}
this.surface = surface
this.executor = executor
Expand All @@ -116,11 +120,15 @@ class CameraXSource(
}

override fun stop() {
val wasRunning = isRunning()
surfaceReleased = CountDownLatch(1)
lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
camera?.let {
cameraProvider.unbindAll()
camera = null
}
preview.surfaceProvider = null
if (wasRunning) surfaceReleased.await(500L, TimeUnit.MILLISECONDS)
surface?.release()
surface = null
executor?.shutdown()
Expand Down
Loading