diff options
author | Shao-Chuan Lee <shaochuan@google.com> | 2022-06-02 08:32:11 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-02 08:32:11 +0000 |
commit | 81b9208b7c440c442c872c1342203e8031d9b18c (patch) | |
tree | ea8b101fa7800092fc1595b4b051bedb29e21427 | |
parent | 6fee68bc74cbd97d281252a9e8c2bfd1ebe669fd (diff) | |
parent | f8b1084dded8f5d4d3b6ed163eeffa30c6b17ab6 (diff) | |
download | v4l2_codec2-81b9208b7c440c442c872c1342203e8031d9b18c.tar.gz |
V4L2EncodeComponent: clamp framerate to at least 1 on dynamic framerate change am: 39f241ae60 am: f8b1084dde
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/18707983
Change-Id: I1156919a47da97be21b7de54615e9a7839e4846c
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)); |