diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2022-04-19 21:28:59 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2022-04-19 21:28:59 -0700 |
| commit | 0e0cbcc5923cee4870e386275936453fbf15c0d2 (patch) | |
| tree | aa9cd369071767a218ce06a1b6aa13136bd681d6 | |
| parent | c02ae73ce937bfd882f81c74a17456a13f404a48 (diff) | |
| parent | 9c838ad2a89b6561827669806009156b34811643 (diff) | |
Merge "media: sm7150: Update max correct resolution for hevc encoder in xml" into video-userspace.lnx.4.2.r3-rel
| -rw-r--r-- | conf_files/sm6150/media_codecs.xml | 2 | ||||
| -rw-r--r-- | conf_files/sm6150/media_codecs_vendor_sdmmagpie_v0.xml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/conf_files/sm6150/media_codecs.xml b/conf_files/sm6150/media_codecs.xml index 54dade16..1a984b59 100644 --- a/conf_files/sm6150/media_codecs.xml +++ b/conf_files/sm6150/media_codecs.xml @@ -160,7 +160,7 @@ Only the three quirks included above are recognized at this point: <Quirk name="requires-allocate-on-input-ports" /> <Quirk name="requires-allocate-on-output-ports" /> <Quirk name="requires-loaded-to-idle-after-allocation" /> - <Limit name="size" min="96x96" max="4096x2160" /> + <Limit name="size" min="96x96" max="3840x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> <Limit name="blocks-per-second" min="24" max="972000" /> diff --git a/conf_files/sm6150/media_codecs_vendor_sdmmagpie_v0.xml b/conf_files/sm6150/media_codecs_vendor_sdmmagpie_v0.xml index ba194513..b1c0d26c 100644 --- a/conf_files/sm6150/media_codecs_vendor_sdmmagpie_v0.xml +++ b/conf_files/sm6150/media_codecs_vendor_sdmmagpie_v0.xml @@ -120,7 +120,7 @@ Only the three quirks included above are recognized at this point: |__________|_________________________________________| | h264 | 4096 2160 60 120 2073600 | | | (4096) (2304) (30) (120) | - | hevc | 4096 2160 60 120 2073600 | + | hevc | 3840 2160 60 120 1944000 | | | (4096) (2304) (30) (120) | | mpeg4-sw | 1280 720 30 4 108000 | | vp8 | 4096 2160 30 120 1036800 | @@ -172,10 +172,10 @@ Only the three quirks included above are recognized at this point: <Quirk name="requires-allocate-on-input-ports" /> <Quirk name="requires-allocate-on-output-ports" /> <Quirk name="requires-loaded-to-idle-after-allocation" /> - <Limit name="size" min="96x96" max="4096x2304" /> + <Limit name="size" min="96x96" max="3840x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="2073600" /> + <Limit name="blocks-per-second" min="24" max="1944000" /> <Limit name="bitrate" range="1-120000000" /> <Limit name="frame-rate" range="1-480" /> <Limit name="concurrent-instances" max="16" /> |