summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-09-08 17:57:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-08 17:57:56 -0700
commite3aa6aa77014b5798f95f6c5817df85910ecaac3 (patch)
tree1191efdfffad53daa99abaefdbc8adb505764f32 /include
parent13831586874fab1592a9d6f9134a693b0b27bae8 (diff)
parent306cd58ddcc0cb8487bc6e015f8c692eea47a334 (diff)
downloadframeworks_base-e3aa6aa77014b5798f95f6c5817df85910ecaac3.zip
frameworks_base-e3aa6aa77014b5798f95f6c5817df85910ecaac3.tar.gz
frameworks_base-e3aa6aa77014b5798f95f6c5817df85910ecaac3.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')
-rw-r--r--include/media/stagefright/MetaData.h1
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