diff options
| author | Chong Zhang <chz@google.com> | 2015-04-29 15:53:41 -0700 |
|---|---|---|
| committer | Chong Zhang <chz@google.com> | 2015-04-29 15:53:41 -0700 |
| commit | 8f5919da04fb6aa7eb7cff70b061d8702627436c (patch) | |
| tree | 7c31d2b696859b79886c82f59d8a4b88af478aae /media/libstagefright/Utils.cpp | |
| parent | 5e95559255d1abd62c78b308731ebe3991186e94 (diff) | |
| download | frameworks_av-8f5919da04fb6aa7eb7cff70b061d8702627436c.zip frameworks_av-8f5919da04fb6aa7eb7cff70b061d8702627436c.tar.gz frameworks_av-8f5919da04fb6aa7eb7cff70b061d8702627436c.tar.bz2 | |
stagefright: convert kKeyFrameRate between msg and meta
bug: 20431757
Change-Id: I2d00e9914550ba3e62bc5ac8604ba44bcbb6026a
Diffstat (limited to 'media/libstagefright/Utils.cpp')
| -rw-r--r-- | media/libstagefright/Utils.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/media/libstagefright/Utils.cpp b/media/libstagefright/Utils.cpp index 0d8e64a..7b089b0 100644 --- a/media/libstagefright/Utils.cpp +++ b/media/libstagefright/Utils.cpp @@ -181,6 +181,11 @@ status_t convertMetaDataToMessage( msg->setInt32("rotation-degrees", rotationDegrees); } + int32_t fps; + if (meta->findInt32(kKeyFrameRate, &fps)) { + msg->setInt32("frame-rate", fps); + } + uint32_t type; const void *data; size_t size; @@ -588,6 +593,11 @@ void convertMessageToMetaData(const sp<AMessage> &msg, sp<MetaData> &meta) { meta->setInt32(kKeyMaxHeight, maxHeight); } + int32_t fps; + if (msg->findInt32("frame-rate", &fps)) { + meta->setInt32(kKeyFrameRate, fps); + } + // reassemble the csd data into its original form sp<ABuffer> csd0; if (msg->findBuffer("csd-0", &csd0)) { |