| commit | cd37e7acf4e9c804dde036484ce95f0b65cb0566 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Mar 28 10:29:42 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 28 10:29:42 2023 +0000 |
| tree | b762e17eb3f2c83a8ce29ca6677f5168059be9cf | |
| parent | 7a915f372e8aa50587aa47dc8ab5239680985908 [diff] | |
| parent | 5f7c057ddb925518df66199af5ef7e6aaa301cfb [diff] |
Merge "C2SoftAvcEnc: Clip level to max supported level" am: 5f7c057ddb Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2483255 Change-Id: I63afaf8f9845d73cc2091b1d97684e82d2908f3d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/codec2/components/avc/C2SoftAvcEnc.cpp b/media/codec2/components/avc/C2SoftAvcEnc.cpp index 5d2856a..9c054f0 100644 --- a/media/codec2/components/avc/C2SoftAvcEnc.cpp +++ b/media/codec2/components/avc/C2SoftAvcEnc.cpp
@@ -356,7 +356,7 @@ needsUpdate = true; } } - if (!found) { + if (!found || me.v.level > LEVEL_AVC_5) { // We set to the highest supported level. me.set().level = LEVEL_AVC_5; }