commit 0a4427bb91e72a4dfece276521d7f21fbb6c7846
author Lajos Molnar <lajos@google.com> Thu Feb 11 19:42:52 2016 -0800
committer Lajos Molnar <lajos@google.com> Fri Feb 12 12:17:11 2016 -0800
tree b0ac3b7803a2be1e411b9b7b5b7a13b4dada626e
parent 36e4e1592bb07e1fdf8d4324f65a66ba332d75f2

stagefright: use MediaCodec::QueryCapabilities

This reverts commit cfb71f189ca620b7b2caf213572849bf59b50231
and still fixes b/27142863.

Bug: 27142863
Change-Id: I914bcc882d5f9049bc9eb8b31913b07ae572b441

include/media/MediaCodecInfo.h

diff --git a/include/media/MediaCodecInfo.h b/include/media/MediaCodecInfo.h
index 3ce5433..48d0407 100644
--- a/include/media/MediaCodecInfo.h
+++ b/include/media/MediaCodecInfo.h
@@ -33,7 +33,6 @@
 
 struct AMessage;
 class Parcel;
-struct CodecCapabilities;
 
 typedef KeyedVector<AString, AString> CodecSettings;
 
@@ -127,7 +126,8 @@
     void addQuirk(const char *name);
     status_t addMime(const char *mime);
     status_t updateMime(const char *mime);
-    status_t initializeCapabilities(const CodecCapabilities &caps);
+
+    status_t initializeCapabilities(const sp<Capabilities> &caps);
     void addDetail(const AString &key, const AString &value);
     void addFeature(const AString &key, int32_t value);
     void addFeature(const AString &key, const char *value);