Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Handle zero-denominator ffprobe frame rates

Neeraj Guptadcfffea34b79
diff --git a/mobile/apps/photos/lib/models/ffmpeg/ffprobe_props.dart b/mobile/apps/photos/lib/models/ffmpeg/ffprobe_props.dart
index a15ea2474d..7274d2bc1b 100644
--- a/mobile/apps/photos/lib/models/ffmpeg/ffprobe_props.dart
+++ b/mobile/apps/photos/lib/models/ffmpeg/ffprobe_props.dart
@@ -336,7 +336,7 @@ class FFProbeProps {
if (value == null) return null;
final int? t = int.tryParse(value.split('/')[0]);
final int? b = int.tryParse(value.split('/')[1]);
- if (t != null && b != null) {
+ if (t != null && b != null && b != 0) {
// return the value upto 2 decimal places. ignore even two decimal places
// if t is perfectly divisible by b
return (t % b == 0)
diff --git a/mobile/apps/photos/test/models/ffmpeg/ffprobe_props_test.dart b/mobile/apps/photos/test/models/ffmpeg/ffprobe_props_test.dart
new file mode 100644
index 0000000000..3ef352cdf3
--- /dev/null
+++ b/mobile/apps/photos/test/models/ffmpeg/ffprobe_props_test.dart
@@ -0,0 +1,28 @@
+import "package:photos/models/ffmpeg/ffprobe_keys.dart";
+import "package:photos/models/ffmpeg/ffprobe_props.dart";
+import "package:test/test.dart";
+
+void main() {
+ group("FFProbeProps", () {
+ test("keeps a zero-denominator frame rate unformatted", () {
+ final props = FFProbeProps.parseData({
+ "streams": [
+ {FFProbeKeys.rFrameRate: "1/0"},
+ ],
+ });
+
+ expect(props.fps, "1/0");
+ expect(props.propData![FFProbeKeys.rFrameRate], "1/0");
+ });
+
+ test("formats a valid frame rate", () {
+ final props = FFProbeProps.parseData({
+ "streams": [
+ {FFProbeKeys.rFrameRate: "30000/1001"},
+ ],
+ });
+
+ expect(props.fps, "29.97");
+ });
+ });
+}