| commit | 101375ea3a0ffa01fa01d3cf759401d8ded4f078 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Mar 28 11:25:00 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 28 11:25:00 2023 +0000 |
| tree | 9542eac7e57208fcd2ccca6712d2be393a30d6af | |
| parent | 45f2422a1aa456fe5093a5ecea91b5a5cd026aff [diff] | |
| parent | 712dbc158aed061440e881dd1430b85f7ac13241 [diff] |
Merge "C2SoftAvcEnc: Clip level to max supported level" am: 5f7c057ddb am: cd37e7acf4 am: 712dbc158a Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2483255 Change-Id: Ieb36fe11e0b7f8dd16afa5752dc415e681523769 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; }