Skip to content

Handle FPS mismatch between video source and video encoder output #331

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

Closed
dimadesu wants to merge 7 commits into from
Closed

Handle FPS mismatch between video source and video encoder output #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
da1e569
Handle FPS mismatch between video source and video encoder output
dimadesu Jun 8, 2026
68f0c4d
Add 50, 100, 120 fps settings
dimadesu Jun 8, 2026
cad6319
Set versionName = "1.34.0-unlock-high-fps-01"
dimadesu Jun 8, 2026
d8743b6
fix: correct video frame presentation timestamps and reset state on c…
dimadesu Jun 13, 2026
e7a929d
fix: correct video frame presentation timestamps and reset state on c…
dimadesu Jun 13, 2026
4a876c7
fix: remove camera swap freeze frame to prevent incorrect mirroring g…
dimadesu Jun 13, 2026
a10bbda
fix: request IDR keyframe after camera switch and fix black-frame tim…
dimadesu Jun 13, 2026
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
2 changes: 1 addition & 1 deletion StreamPack
Open in desktop
Submodule StreamPack updated 6 files
+10 −1 core/src/main/java/io/github/thibaultbee/streampack/core/elements/encoders/mediacodec/MediaCodecEncoder.kt
+149 −19 core/src/main/java/io/github/thibaultbee/streampack/core/elements/processing/video/DefaultSurfaceProcessor.kt
+2 −0 core/src/main/java/io/github/thibaultbee/streampack/core/elements/processing/video/ISurfaceProcessor.kt
+60 −0 core/src/main/java/io/github/thibaultbee/streampack/core/elements/processing/video/OpenGlRenderer.kt
+45 −1 core/src/main/java/io/github/thibaultbee/streampack/core/pipelines/StreamerPipeline.kt
+47 −16 core/src/main/java/io/github/thibaultbee/streampack/core/pipelines/inputs/VideoInput.kt
2 changes: 1 addition & 1 deletion app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ android {
compileSdk = 36

versionCode = 23
versionName = "1.34.0"
versionName = "1.34.0-unlock-high-fps-01"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

Expand Down
28 changes: 6 additions & 22 deletions app/src/main/java/com/dimadesu/lifestreamer/ui/settings/SettingsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,32 +332,16 @@ class SettingsFragment : PreferenceFragmentCompat() {
videoResolutionListPreference.entryValues = this
}

// Inflates video fps
val supportedFramerates = streamerInfo.video.getSupportedFramerates(
requireContext(), encoder, requireContext().defaultCameraId
)
videoFpsListPreference.entryValues.filter { fps ->
supportedFramerates.any { it.contains(fps.toString().toIntOrNull() ?: 0) }
// Inflates video fps based on video encoder capabilities (not camera)
val supportedFramerateRange = streamerInfo.video.getSupportedFramerate(encoder)
val defaultFpsList = resources.getStringArray(R.array.FpsEntries)
defaultFpsList.filter { fps ->
supportedFramerateRange.contains(fps.toIntOrNull() ?: 0)
}.toTypedArray().run {
videoFpsListPreference.entries = this
videoFpsListPreference.entryValues = this
}
videoFpsListPreference.setOnPreferenceChangeListener { _, newValue ->
val fps = (newValue as? String)?.toIntOrNull() ?: return@setOnPreferenceChangeListener true
val cameraManager = requireContext().getSystemService(Context.CAMERA_SERVICE) as android.hardware.camera2.CameraManager
val unsupportedCameras = cameraManager.cameraIdList.filter {
!cameraManager.getCameraCharacteristics(it).isFpsSupported(fps)
}
if (unsupportedCameras.isNotEmpty()) {
DialogUtils.showAlertDialog(
requireContext(), getString(R.string.warning), resources.getQuantityString(
R.plurals.camera_frame_rate_not_supported,
unsupportedCameras.size,
unsupportedCameras.joinToString(", "),
fps
)
)
}
videoFpsListPreference.setOnPreferenceChangeListener { _, _ ->
true
}

Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values/array.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
<item>24</item>
<item>25</item>
<item>30</item>
<item>50</item>
<item>60</item>
<item>100</item>
<item>120</item>
</string-array>

<string-array name="moblin_regulator_mode_entries">
Expand Down