| commit | 45055ad4900e9985ec4a3d8fc976ddf7e4893a46 | [log] [tgz] |
|---|---|---|
| author | Ray Essick <essick@google.com> | Mon Aug 17 05:34:23 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 17 05:34:23 2020 +0000 |
| tree | 3113c040287cdbcbbda2f8b161f4708314c86c0d | |
| parent | 459b345b6ff84d847ae8f0e63b87dc792cb1763f [diff] | |
| parent | 8ae5b5d64737b107e295583d216f5c4cc5d307a0 [diff] |
Merge "C2SoftAvcDec: Increase maximum output delay to 34" am: 8ae5b5d647 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1398270 Change-Id: I6ff3c6c7433fbe8505e878b01dde5eed465e4d82
diff --git a/media/codec2/components/avc/C2SoftAvcDec.cpp b/media/codec2/components/avc/C2SoftAvcDec.cpp index 932a16a..5480d1e 100644 --- a/media/codec2/components/avc/C2SoftAvcDec.cpp +++ b/media/codec2/components/avc/C2SoftAvcDec.cpp
@@ -34,7 +34,11 @@ constexpr char COMPONENT_NAME[] = "c2.android.avc.decoder"; constexpr uint32_t kDefaultOutputDelay = 8; -constexpr uint32_t kMaxOutputDelay = 16; +/* avc specification allows for a maximum delay of 16 frames. + As soft avc decoder supports interlaced, this delay would be 32 fields. + And avc decoder implementation has an additional delay of 2 decode calls. + So total maximum output delay is 34 */ +constexpr uint32_t kMaxOutputDelay = 34; constexpr uint32_t kMinInputBytes = 4; } // namespace