commit 45d7895a8debf6abc537d923a0efd6e1f59ccb69
author Shao-Chuan Lee <shaochuan@google.com> Thu Jun 02 08:07:10 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 02 08:07:10 2022 +0000
tree dd2e1ded5775bf3df9c115c73f0c7741870e9654
parent 40521db6e6615db996ba2d5e8ad8c2d1ab0d5b43
parent 39f241ae60695c912854445caca3299f91fb590e

V4L2EncodeComponent: clamp framerate to at least 1 on dynamic framerate change am: 39f241ae60

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/18707983

Change-Id: Ic1f73083e703286e35e97221216fc005aef72e5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

components/V4L2EncodeComponent.cpp

diff --git a/components/V4L2EncodeComponent.cpp b/components/V4L2EncodeComponent.cpp
index a1b46ab..4ce4404 100644
--- a/components/V4L2EncodeComponent.cpp
+++ b/components/V4L2EncodeComponent.cpp
@@ -756,8 +756,8 @@
     // Dynamically adjust framerate based on the frame's timestamp if required.
     constexpr int64_t kMaxFramerateDiff = 5;
     if (mLastFrameTime && (timestamp > *mLastFrameTime)) {
-        int64_t newFramerate =
-                static_cast<int64_t>(std::round(1000000.0 / (timestamp - *mLastFrameTime)));
+        int64_t newFramerate = std::max(
+                static_cast<int64_t>(std::round(1000000.0 / (timestamp - *mLastFrameTime))), 1LL);
         if (abs(mFramerate - newFramerate) > kMaxFramerateDiff) {
             ALOGV("Adjusting framerate to %" PRId64 " based on frame timestamps", newFramerate);
             mInterface->setFramerate(static_cast<uint32_t>(newFramerate));