diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-04-30 15:39:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-30 15:39:38 +0000 |
| commit | d707ac5a0494398cb1306ead0ba587034f610f30 (patch) | |
| tree | cf30064690d7f33daefa39305cd229725405c4ee /media/libstagefright/MediaCodecList.cpp | |
| parent | 11bf6d35c3916b99c06de27302d9296c43b6ce50 (diff) | |
| parent | 795697e9012213979e4cf904d1a39ecf007223b6 (diff) | |
| download | frameworks_av-d707ac5a0494398cb1306ead0ba587034f610f30.zip frameworks_av-d707ac5a0494398cb1306ead0ba587034f610f30.tar.gz frameworks_av-d707ac5a0494398cb1306ead0ba587034f610f30.tar.bz2 | |
Merge "libstagefright: add xml parsing for measured-frame-rate and measured-blocks-per-second." into mnc-dev
Diffstat (limited to 'media/libstagefright/MediaCodecList.cpp')
| -rw-r--r-- | media/libstagefright/MediaCodecList.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/MediaCodecList.cpp b/media/libstagefright/MediaCodecList.cpp index 97640a8..f12a913 100644 --- a/media/libstagefright/MediaCodecList.cpp +++ b/media/libstagefright/MediaCodecList.cpp @@ -886,14 +886,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("-"); |