diff options
| author | Shao-Chuan Lee <shaochuan@google.com> | 2022-06-02 08:06:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-02 08:06:13 +0000 |
| commit | 09a22ed53c5570d329c3e6603d4fe711cec6e309 (patch) | |
| tree | dd2e1ded5775bf3df9c115c73f0c7741870e9654 | |
| parent | 24a45f96483a15ff5057538fc8688865d9596e11 (diff) | |
| parent | 39f241ae60695c912854445caca3299f91fb590e (diff) | |
| download | v4l2_codec2-09a22ed53c5570d329c3e6603d4fe711cec6e309.tar.gz | |
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: Id9ffdaca917cfa024a8168a929ff783cefeba477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | components/V4L2EncodeComponent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ bool V4L2EncodeComponent::encode(C2ConstGraphicBlock block, uint64_t index, int6 // 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)); |