diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-14 22:14:14 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-14 22:14:14 +0100 |
| commit | 998f3a696f0d671832624637c771e3bda3e0c9f5 (patch) | |
| tree | 67c89508c2eaad57389ffac29d673a09bc8bfaba /include/media | |
| parent | 1c47b26b1ae695c355e4ec0c317716a397588206 (diff) | |
| parent | 8ad656861c764ea4f8bf8539cb568b01edbf647d (diff) | |
| download | frameworks_av-998f3a696f0d671832624637c771e3bda3e0c9f5.zip frameworks_av-998f3a696f0d671832624637c771e3bda3e0c9f5.tar.gz frameworks_av-998f3a696f0d671832624637c771e3bda3e0c9f5.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_av into replicant-6.0replicant-6.0-alpha-0001
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/stagefright/MPEG4Writer.h | 3 | ||||
| -rw-r--r-- | include/media/stagefright/MetaData.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h index 055c079..aeaad8f 100644 --- a/include/media/stagefright/MPEG4Writer.h +++ b/include/media/stagefright/MPEG4Writer.h @@ -186,6 +186,9 @@ private: // To use 3gp4 box for clips with AMR audio bool mIsAudioAMR; + // HFR scale + uint32_t mHFRRatio; + void lock(); void unlock(); diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index 0dd5995..2a3df22 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -205,6 +205,10 @@ enum { kKeyPCMFormat = 'pfmt', kKeyArbitraryMode = 'ArbM', + + // Indicate if it is OK to hold on to the MediaBuffer and not + // release it immediately + kKeyCanDeferRelease = 'drel', // bool (int32_t) }; enum { |