Revert "media: codecs: disable hybrid vp9 decoding"
The previous patch was submitted to get a build out
for DP3. The CTS tests will need to pass to ship N.
Bug: 27589011
This reverts commit 1c46d48b4d4d544bed1f6cd41d28e083eb02d942.
diff --git a/media_codecs.xml b/media_codecs.xml
index 7ba786c..838f9b7 100644
--- a/media_codecs.xml
+++ b/media_codecs.xml
@@ -140,16 +140,15 @@
<Feature name="adaptive-playback" />
<Limit name="concurrent-instances" max="3" />
</MediaCodec>
- <!-- Disable in b/27589011 -->
- <!--<MediaCodec name="OMX.Intel.VideoDecoder.VP9.hybrid" type="video/x-vnd.on2.vp9">-->
- <!--<Limit name="size" min="16x16" max="1920x1088" />-->
- <!--<Limit name="alignment" value="2x2" />-->
- <!--<Limit name="block-size" value="16x16" />-->
- <!--<Limit name="blocks-per-second" range="1-244800" />-->
- <!--<Limit name="bitrate" range="1-8000000" />-->
- <!--<Feature name="adaptive-playback" />-->
- <!--<Limit name="concurrent-instances" max="2" />-->
- <!--</MediaCodec>-->
+ <MediaCodec name="OMX.Intel.VideoDecoder.VP9.hybrid" type="video/x-vnd.on2.vp9">
+ <Limit name="size" min="16x16" max="1920x1088" />
+ <Limit name="alignment" value="2x2" />
+ <Limit name="block-size" value="16x16" />
+ <Limit name="blocks-per-second" range="1-244800" />
+ <Limit name="bitrate" range="1-8000000" />
+ <Feature name="adaptive-playback" />
+ <Limit name="concurrent-instances" max="2" />
+ </MediaCodec>
<MediaCodec name="OMX.Intel.sw_vd.h265" type="video/hevc">
<Limit name="size" min="16x16" max="1920x1088" />
<Limit name="alignment" value="2x2" />
