diff options
| author | James Dong <jdong@google.com> | 2010-11-12 15:33:41 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-12 15:33:41 -0800 |
| commit | a9d02bf6020e195acc18b16508c62f8be20dc207 (patch) | |
| tree | 9f1180028cc632ec81cc2bf9cd617e55cda19a9e /include/media | |
| parent | b0b5b17442a5f13f88b85d59314a88b26e0d5801 (diff) | |
| parent | aac193cf38ac084eea0f6367b98f6304d1ec38f2 (diff) | |
| download | frameworks_base-a9d02bf6020e195acc18b16508c62f8be20dc207.zip frameworks_base-a9d02bf6020e195acc18b16508c62f8be20dc207.tar.gz frameworks_base-a9d02bf6020e195acc18b16508c62f8be20dc207.tar.bz2 | |
Merge "Separate the key for audio sampling rate and video frame rate in MetaData.h"
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/stagefright/MetaData.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index b4c5d3c..295b127 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -37,7 +37,8 @@ enum { kKeyStride = 'strd', // int32_t kKeySliceHeight = 'slht', // int32_t kKeyChannelCount = '#chn', // int32_t - kKeySampleRate = 'srte', // int32_t (also video frame rate) + kKeySampleRate = 'srte', // int32_t (audio sampling rate Hz) + kKeyFrameRate = 'frmR', // int32_t (video frame rate fps) kKeyBitRate = 'brte', // int32_t (bps) kKeyESDS = 'esds', // raw data kKeyAVCC = 'avcc', // raw data |