commit 1abdcba6456dfb853fb9ffa3f5c54c31463c98ef
author Xin Li <delphij@google.com> Fri Dec 09 10:29:15 2022 -0800
committer Xin Li <delphij@google.com> Fri Dec 09 10:29:15 2022 -0800
tree 93dbba2556ecf85481be7807f6db8098015a21f9
parent 282b06666db160b5b53ef9e736913cbc1e06b6eb
parent 2d9f68b8be4edfbde5925e3736e6110cc4f1c676

Merge Android 13 QPR1

Bug: 261731544
Merged-In: Id2cc220b9122eec412823f577f07ecd82bad60fc
Change-Id: I1b1441bcd03b64013819a8fc158879554dd5a819

components/V4L2EncodeComponent.cpp

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