summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MediaCodecList.cpp
diff options
context:
space:
mode:
authorRonghua Wu <ronghuawu@google.com>2015-04-29 10:36:40 -0700
committerRonghua Wu <ronghuawu@google.com>2015-04-29 10:36:40 -0700
commit795697e9012213979e4cf904d1a39ecf007223b6 (patch)
treedcf46f93ee90406e37d77325b7a926d4526f2b7a /media/libstagefright/MediaCodecList.cpp
parentdae24729d0b3ced8c4a7d7f9b631e852f564db4f (diff)
downloadframeworks_av-795697e9012213979e4cf904d1a39ecf007223b6.zip
frameworks_av-795697e9012213979e4cf904d1a39ecf007223b6.tar.gz
frameworks_av-795697e9012213979e4cf904d1a39ecf007223b6.tar.bz2
libstagefright: add xml parsing for measured-frame-rate and measured-blocks-per-second.
Bug: 20507129 Change-Id: I4623d2bd93670283d6c82c9bf9acfd00e214c4f0
Diffstat (limited to 'media/libstagefright/MediaCodecList.cpp')
-rw-r--r--media/libstagefright/MediaCodecList.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/MediaCodecList.cpp b/media/libstagefright/MediaCodecList.cpp
index 26798ae..0491fc4 100644
--- a/media/libstagefright/MediaCodecList.cpp
+++ b/media/libstagefright/MediaCodecList.cpp
@@ -882,14 +882,16 @@ status_t MediaCodecList::addLimit(const char **attrs) {
return -EINVAL;
}
- // size, blocks, bitrate, frame-rate, blocks-per-second, aspect-ratio: range
+ // size, blocks, bitrate, frame-rate, blocks-per-second, aspect-ratio,
+ // measured-frame-rate, measured-blocks-per-second: range
// quality: range + default + [scale]
// complexity: range + default
bool found;
if (name == "aspect-ratio" || name == "bitrate" || name == "block-count"
|| name == "blocks-per-second" || name == "complexity"
- || name == "frame-rate" || name == "quality" || name == "size") {
+ || name == "frame-rate" || name == "quality" || name == "size"
+ || name == "measured-blocks-per-second" || name == "measured-frame-rate") {
AString min, max;
if (msg->findString("min", &min) && msg->findString("max", &max)) {
min.append("-");