diff options
| author | Nick Desaulniers <ndesaulniers@google.com> | 2017-01-05 12:05:32 -0800 |
|---|---|---|
| committer | Nick Desaulniers <ndesaulniers@google.com> | 2017-01-05 12:05:32 -0800 |
| commit | 5d942094c74d18bf4ca42c9a4fc4c9db51b02ae9 (patch) | |
| tree | fdce646f430876583a1ce98e34b707c97e1a72c6 /media_codecs.xml | |
| parent | 075726d057144bd8bcb0da62ebdf1e3d3ca78bb3 (diff) | |
| download | fugu-5d942094c74d18bf4ca42c9a4fc4c9db51b02ae9.tar.gz | |
Revert "media: codecs: disable AVC hardware decoding"
This reverts commit 75c43b0457babf606581241bdc5531e8649f29a6.
Bug: 32976749
Bug: 34059849
Diffstat (limited to 'media_codecs.xml')
| -rw-r--r-- | media_codecs.xml | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/media_codecs.xml b/media_codecs.xml index 0a04b9e..a636229 100644 --- a/media_codecs.xml +++ b/media_codecs.xml @@ -103,16 +103,15 @@ Only the three quirks included above are recognized at this point: <Feature name="adaptive-playback" optional="yes" /> <Limit name="concurrent-instances" max="1" /> </MediaCodec> - <!-- TODO: reenable me, b/32120194, b/32976749 --> - <!--<MediaCodec name="OMX.Intel.VideoDecoder.AVC" type="video/avc">--> - <!--<Limit name="size" min="96x32" max="2560x1440" />--> - <!--<Limit name="alignment" value="2x2" />--> - <!--<Limit name="block-size" value="16x16" />--> - <!--<Limit name="blocks-per-second" range="12-864000" />--> - <!--<Limit name="bitrate" range="1-50000000" />--> - <!--<Feature name="adaptive-playback" />--> - <!--<Limit name="concurrent-instances" max="5" />--> - <!--</MediaCodec>--> + <MediaCodec name="OMX.Intel.VideoDecoder.AVC" type="video/avc"> + <Limit name="size" min="96x32" max="2560x1440" /> + <Limit name="alignment" value="2x2" /> + <Limit name="block-size" value="16x16" /> + <Limit name="blocks-per-second" range="12-864000" /> + <Limit name="bitrate" range="1-50000000" /> + <Feature name="adaptive-playback" /> + <Limit name="concurrent-instances" max="5" /> + </MediaCodec> <MediaCodec name="OMX.Intel.VideoDecoder.AVC.secure" type="video/avc"> <Limit name="size" min="96x32" max="1920x1088" /> <Limit name="alignment" value="2x2" /> |