commit 6a58c9a307c346cf877014a0a15beefc9f97e659
author Lajos Molnar <lajos@google.com> Tue Jul 10 22:03:20 2018 -0700
committer Lajos Molnar <lajos@google.com> Wed Jul 11 20:13:44 2018 +0000
tree 5eb71c845502b47c6f67fe192531a2e5ebb2ff96
parent b22d45715dd44ce455b8b06933329d04adbdab1a

CCodec: limit webrtc.vp8 ts-schema to vp8 encoders

We don't keep track of the requested schema as before, and it
is confusing when e.g. an HEVC codec lists webrtc.vp8 schema
even if they are technically identically described.

Bug: 67591367
Test: manual verification
Change-Id: I824d18323de1c02c72ed2b2a7c9d10d1632ec4ea

media/sfplugin/CCodecConfig.cpp

diff --git a/media/sfplugin/CCodecConfig.cpp b/media/sfplugin/CCodecConfig.cpp
index b0eb518..bd66eee 100644
--- a/media/sfplugin/CCodecConfig.cpp
+++ b/media/sfplugin/CCodecConfig.cpp
@@ -1068,7 +1068,10 @@
             if (layering && layering->m.layerCount > 0
                     && layering->m.bLayerCount < layering->m.layerCount) {
                 // check if this is webrtc compatible
-                if (layering->m.bLayerCount == 0 &&
+                AString mime;
+                if (msg->findString(KEY_MIME, &mime) &&
+                        mime.equalsIgnoreCase(MIMETYPE_VIDEO_VP8) &&
+                        layering->m.bLayerCount == 0 &&
                         (layering->m.layerCount == 1
                                 || (layering->m.layerCount == 2
                                         && layering->flexCount() >= 1