diff options
| author | James Dong <jdong@google.com> | 2010-11-06 14:22:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-06 14:22:05 -0700 |
| commit | d8166a719e192a026bf25a82b8eb6212823950a3 (patch) | |
| tree | 3f6f516a25016b93365922631c05818ccd7ebc9d /include | |
| parent | bb97d7bbf33393af842de1d8fd8512a24c73b6b3 (diff) | |
| parent | 1653e261e84922facfe27d3d8acc455ed2b6b6da (diff) | |
| download | frameworks_base-d8166a719e192a026bf25a82b8eb6212823950a3.zip frameworks_base-d8166a719e192a026bf25a82b8eb6212823950a3.tar.gz frameworks_base-d8166a719e192a026bf25a82b8eb6212823950a3.tar.bz2 | |
am 1653e261: Merge "Rotation support" into gingerbread
* commit '1653e261e84922facfe27d3d8acc455ed2b6b6da':
Rotation support
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MPEG4Writer.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/MetaData.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h index bb469e5..7bf07eb 100644 --- a/include/media/stagefright/MPEG4Writer.h +++ b/include/media/stagefright/MPEG4Writer.h @@ -154,6 +154,7 @@ private: bool exceedsFileDurationLimit(); bool isFileStreamable() const; void trackProgressStatus(const Track* track, int64_t timeUs, status_t err = OK); + void writeCompositionMatrix(int32_t degrees); MPEG4Writer(const MPEG4Writer &); MPEG4Writer &operator=(const MPEG4Writer &); diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index ac0624a..b1a775a 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -92,6 +92,7 @@ enum { // Track authoring progress status // kKeyTrackTimeStatus is used to track progress in elapsed time kKeyTrackTimeStatus = 'tktm', // int64_t + kKeyRotationDegree = 'rdge', // int32_t (clockwise, in degree) kKeyNotRealTime = 'ntrt', // bool (int32_t) |