diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-06-21 00:45:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-21 00:45:02 +0000 |
| commit | 22ed935af74b406195769db2af9b9c3993ec0a77 (patch) | |
| tree | d65f1a3b97ce2d218af73aa644d4879857e58c54 | |
| parent | 97b4bf75065e2b3efa92060c4f6e027051e64365 (diff) | |
| parent | da48d7791be41fdf01f54445d7abfc740c548333 (diff) | |
| download | angler-22ed935af74b406195769db2af9b9c3993ec0a77.tar.gz | |
Merge "media: Limit secure (avc/hevc) decoder to 1080p" into oc-dev
| -rw-r--r-- | media_codecs.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/media_codecs.xml b/media_codecs.xml index 49e6cba..9ca7d80 100644 --- a/media_codecs.xml +++ b/media_codecs.xml @@ -159,11 +159,11 @@ Only the three quirks included above are recognized at this point: <MediaCodec name="OMX.qcom.video.decoder.avc.secure" type="video/avc" > <Quirk name="requires-allocate-on-input-ports" /> <Quirk name="requires-allocate-on-output-ports" /> - <Limit name="size" min="64x64" max="4096x2160" /> + <Limit name="size" min="64x64" max="1920x1088" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="972000" /> - <Limit name="bitrate" range="1-100000000" /> + <Limit name="blocks-per-second" min="1" max="489600" /> + <Limit name="bitrate" range="1-60000000" /> <Feature name="adaptive-playback" /> <Feature name="secure-playback" required="true" /> <Limit name="concurrent-instances" max="6" /> @@ -215,11 +215,11 @@ Only the three quirks included above are recognized at this point: <MediaCodec name="OMX.qcom.video.decoder.hevc.secure" type="video/hevc" > <Quirk name="requires-allocate-on-input-ports" /> <Quirk name="requires-allocate-on-output-ports" /> - <Limit name="size" min="64x64" max="4096x2160" /> + <Limit name="size" min="64x64" max="1920x1088" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="1" max="972000" /> - <Limit name="bitrate" range="1-100000000" /> + <Limit name="blocks-per-second" min="1" max="489600" /> + <Limit name="bitrate" range="1-60000000" /> <Feature name="adaptive-playback" /> <Feature name="secure-playback" required="true" /> <Limit name="concurrent-instances" max="6" /> |