diff options
| author | Lajos Molnar <lajos@google.com> | 2015-09-17 17:01:52 -0700 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2015-09-17 17:36:35 -0700 |
| commit | 2a886d196ae717adc353a9fb4371b6a5abbd89a5 (patch) | |
| tree | 041aa973b34bbab10401e1b0846ff6f86f7bae0e /media/libstagefright/Utils.cpp | |
| parent | 75f0b792547f699761cb2b538b1dc1d020567238 (diff) | |
| download | frameworks_av-2a886d196ae717adc353a9fb4371b6a5abbd89a5.zip frameworks_av-2a886d196ae717adc353a9fb4371b6a5abbd89a5.tar.gz frameworks_av-2a886d196ae717adc353a9fb4371b6a5abbd89a5.tar.bz2 | |
stagefright: only pass valid framerates in msg and meta
Bug: 21573897
Change-Id: Ide83419fa0c92726a33bad2570321e0df2558429
Diffstat (limited to 'media/libstagefright/Utils.cpp')
| -rw-r--r-- | media/libstagefright/Utils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/Utils.cpp b/media/libstagefright/Utils.cpp index 7c8d441..17f0201 100644 --- a/media/libstagefright/Utils.cpp +++ b/media/libstagefright/Utils.cpp @@ -199,7 +199,7 @@ status_t convertMetaDataToMessage( } int32_t fps; - if (meta->findInt32(kKeyFrameRate, &fps)) { + if (meta->findInt32(kKeyFrameRate, &fps) && fps > 0) { msg->setInt32("frame-rate", fps); } @@ -664,7 +664,7 @@ void convertMessageToMetaData(const sp<AMessage> &msg, sp<MetaData> &meta) { } int32_t fps; - if (msg->findInt32("frame-rate", &fps)) { + if (msg->findInt32("frame-rate", &fps) && fps > 0) { meta->setInt32(kKeyFrameRate, fps); } |