Merge tag 'android-13.0.0_r16' into int/13/fp3
Android 13.0.0 Release 16 (TQ1A.221205.011)
* tag 'android-13.0.0_r16':
V4L2EncodeComponent: fix build error
Change-Id: I451c4f1a7b30f5e41da99fb3a831015424a994c5
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));