summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorqctecmdr <qctecmdr@localhost>2022-04-07 11:43:02 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2022-04-07 11:43:01 -0700
commitc909dbaaf1cfbebc8e41b8f8a1ca2654fef97a26 (patch)
treebab9a88aa5fbd543b723d7e8510ad074bcc628cb
parentb0b0e2f911818e932a7439790326d6b453e96e70 (diff)
parentec083360260b97cd85e0a43b23190d126747297d (diff)
Merge "media: sm7150: Update max correct resolution for hevc encoder in xml"
-rw-r--r--conf_files/sm6150/media_codecs.xml2
-rw-r--r--conf_files/sm6150/media_codecs_vendor_sdmmagpie_v0.xml6
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 d85b6b27..64ef9d94 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" />