commit 19e848e39beda160a36efc5c699be52913b7aa4b
author James Zern <jzern@google.com> Tue Jul 02 23:01:42 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 02 23:01:42 2019 +0000
tree 690d3f302290b9b6f54df29d4b4d8644f86a39f6
parent 18fa5eca5cb1ed890e3885a13e6dc9f57f48f69c
parent 0a4b6fec72d7ff0f669c1f1e444d526316b47be2

Merge "stagefright: Use libgav1 for AV1 decoding"

media/libstagefright/data/media_codecs_google_c2_video.xml

diff --git a/media/libstagefright/data/media_codecs_google_c2_video.xml b/media/libstagefright/data/media_codecs_google_c2_video.xml
index 04041eb..a07eb8c 100644
--- a/media/libstagefright/data/media_codecs_google_c2_video.xml
+++ b/media/libstagefright/data/media_codecs_google_c2_video.xml
@@ -77,7 +77,7 @@
             <Limit name="bitrate" range="1-40000000" />
             <Feature name="adaptive-playback" />
         </MediaCodec>
-        <MediaCodec name="c2.android.av1.decoder" type="video/av01">
+        <MediaCodec name="c2.android.gav1.decoder" type="video/av01">
             <Limit name="size" min="96x96" max="1920x1080" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />

media/libstagefright/data/media_codecs_sw.xml

diff --git a/media/libstagefright/data/media_codecs_sw.xml b/media/libstagefright/data/media_codecs_sw.xml
index 67d3f1a..9532ba6 100644
--- a/media/libstagefright/data/media_codecs_sw.xml
+++ b/media/libstagefright/data/media_codecs_sw.xml
@@ -182,7 +182,7 @@
             </Variant>
             <Feature name="adaptive-playback" />
         </MediaCodec>
-        <MediaCodec name="c2.android.av1.decoder" type="video/av01" variant="!slow-cpu">
+        <MediaCodec name="c2.android.gav1.decoder" type="video/av01" variant="!slow-cpu">
             <Limit name="size" min="2x2" max="1920x1080" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />