diff options
author | James Dong <jdong@google.com> | 2010-09-08 17:57:56 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-08 17:57:56 -0700 |
commit | 9b2cef27bbe953c0b5c37ada9bf18d706c396513 (patch) | |
tree | 4a7dc01920b8eb7e82603ff465c91c848af176c0 /include/media | |
parent | 87e607994fa1703e1b975af41b02e539e7b7411f (diff) | |
parent | 368b56e07f5d55911bfdd81bf39c04da57bccfb4 (diff) | |
download | frameworks_av-9b2cef27bbe953c0b5c37ada9bf18d706c396513.zip frameworks_av-9b2cef27bbe953c0b5c37ada9bf18d706c396513.tar.gz frameworks_av-9b2cef27bbe953c0b5c37ada9bf18d706c396513.tar.bz2 |
am 306cd58d: am d353c840: Merge "HW audio encoder expects timestamp via kKeyTime from each input buffer" into gingerbread
Merge commit '306cd58ddcc0cb8487bc6e015f8c692eea47a334'
* commit '306cd58ddcc0cb8487bc6e015f8c692eea47a334':
HW audio encoder expects timestamp via kKeyTime from each input buffer
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/stagefright/MetaData.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index 1e447f1..1594e31 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -49,6 +49,7 @@ enum { kKeyNTPTime = 'ntpT', // uint64_t (ntp-timestamp) kKeyTargetTime = 'tarT', // int64_t (usecs) kKeyDriftTime = 'dftT', // int64_t (usecs) + kKeyAnchorTime = 'ancT', // int64_t (usecs) kKeyDuration = 'dura', // int64_t (usecs) kKeyColorFormat = 'colf', kKeyPlatformPrivate = 'priv', // pointer |