diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-06-27 00:23:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-27 00:23:32 +0000 |
| commit | 29b7cec9a248828d2371bc8758d819308d0e84a4 (patch) | |
| tree | dd4b70d4779ca785218b30ed4651ade4ab23771d /media | |
| parent | 6705edd4e58c4fcff0cbbff30bacffa561759ba8 (diff) | |
| parent | 50cf65497283aa324c5c28aa69a3895644574885 (diff) | |
| download | frameworks_av-29b7cec9a248828d2371bc8758d819308d0e84a4.zip frameworks_av-29b7cec9a248828d2371bc8758d819308d0e84a4.tar.gz frameworks_av-29b7cec9a248828d2371bc8758d819308d0e84a4.tar.bz2 | |
Merge "libstagefright: only do boot time codec profiling for debugging." into mnc-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/MediaCodecList.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/media/libstagefright/MediaCodecList.cpp b/media/libstagefright/MediaCodecList.cpp index 8993403..ab49c11 100644 --- a/media/libstagefright/MediaCodecList.cpp +++ b/media/libstagefright/MediaCodecList.cpp @@ -38,6 +38,7 @@ #include <sys/stat.h> #include <utils/threads.h> +#include <cutils/properties.h> #include <libexpat/expat.h> namespace android { @@ -56,6 +57,11 @@ static bool parseBoolean(const char *s) { } static bool isProfilingNeeded() { + int8_t value = property_get_bool("debug.stagefright.profilecodec", 0); + if (value == 0) { + return false; + } + bool profilingNeeded = true; FILE *resultsFile = fopen(kProfilingResults, "r"); if (resultsFile) { @@ -1005,8 +1011,7 @@ status_t MediaCodecList::addLimit(const char **attrs) { return limitFoundMissingAttr(name, "ranges", found); } else if (msg->contains("scale")) { return limitFoundMissingAttr(name, "scale"); - } else if ((name == "alignment" || name == "block-size" - || name == "max-supported-instances") ^ + } else if ((name == "alignment" || name == "block-size") ^ (found = msg->findString("value", &value))) { return limitFoundMissingAttr(name, "value", found); } |