diff options
| author | Chong Zhang <chz@google.com> | 2015-04-29 23:02:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-29 23:02:05 +0000 |
| commit | 5f88cdae61079be7920aee166eaac4941f65fb9f (patch) | |
| tree | 040595ac9f12be4e2753c29a745290401c001261 | |
| parent | eaa34703cb5f1acedb20cbcdff1ab79c11ff6857 (diff) | |
| parent | 8f5919da04fb6aa7eb7cff70b061d8702627436c (diff) | |
| download | frameworks_av-5f88cdae61079be7920aee166eaac4941f65fb9f.zip frameworks_av-5f88cdae61079be7920aee166eaac4941f65fb9f.tar.gz frameworks_av-5f88cdae61079be7920aee166eaac4941f65fb9f.tar.bz2 | |
Merge "stagefright: convert kKeyFrameRate between msg and meta" into mnc-dev
| -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)) { |