diff options
| author | Andreas Huber <andih@google.com> | 2010-11-08 11:50:14 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-11-08 11:56:08 -0800 |
| commit | 2e1a8967243a88d73f3b3485b07a02aa4f8d16d9 (patch) | |
| tree | 51d2379d88e270d6c401e505521237ff3ce96c7a /include | |
| parent | d8166a719e192a026bf25a82b8eb6212823950a3 (diff) | |
| parent | 31dc911aee2b50752c0eb7785176075cdaed139c (diff) | |
| download | frameworks_base-2e1a8967243a88d73f3b3485b07a02aa4f8d16d9.zip frameworks_base-2e1a8967243a88d73f3b3485b07a02aa4f8d16d9.tar.gz frameworks_base-2e1a8967243a88d73f3b3485b07a02aa4f8d16d9.tar.bz2 | |
resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp
Change-Id: I2f51b2120b3c552566d91a7dc498a5e8b130205f
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/IOMX.h | 9 | ||||
| -rw-r--r-- | include/media/stagefright/HardwareAPI.h | 8 | ||||
| -rw-r--r-- | include/media/stagefright/MetaData.h | 1 |
3 files changed, 15 insertions, 3 deletions
diff --git a/include/media/IOMX.h b/include/media/IOMX.h index 2f61cbe..f794766 100644 --- a/include/media/IOMX.h +++ b/include/media/IOMX.h @@ -115,7 +115,8 @@ public: const char *componentName, OMX_COLOR_FORMATTYPE colorFormat, size_t encodedWidth, size_t encodedHeight, - size_t displayWidth, size_t displayHeight) = 0; + size_t displayWidth, size_t displayHeight, + int32_t rotationDegrees) = 0; // Note: These methods are _not_ virtual, it exists as a wrapper around // the virtual "createRenderer" method above facilitating extraction @@ -125,14 +126,16 @@ public: const char *componentName, OMX_COLOR_FORMATTYPE colorFormat, size_t encodedWidth, size_t encodedHeight, - size_t displayWidth, size_t displayHeight); + size_t displayWidth, size_t displayHeight, + int32_t rotationDegrees); sp<IOMXRenderer> createRendererFromJavaSurface( JNIEnv *env, jobject javaSurface, const char *componentName, OMX_COLOR_FORMATTYPE colorFormat, size_t encodedWidth, size_t encodedHeight, - size_t displayWidth, size_t displayHeight); + size_t displayWidth, size_t displayHeight, + int32_t rotationDegrees); }; struct omx_message { diff --git a/include/media/stagefright/HardwareAPI.h b/include/media/stagefright/HardwareAPI.h index 221c679..63f11d1 100644 --- a/include/media/stagefright/HardwareAPI.h +++ b/include/media/stagefright/HardwareAPI.h @@ -32,6 +32,14 @@ extern android::VideoRenderer *createRenderer( size_t displayWidth, size_t displayHeight, size_t decodedWidth, size_t decodedHeight); +extern android::VideoRenderer *createRendererWithRotation( + const android::sp<android::ISurface> &surface, + const char *componentName, + OMX_COLOR_FORMATTYPE colorFormat, + size_t displayWidth, size_t displayHeight, + size_t decodedWidth, size_t decodedHeight, + int32_t rotationDegrees); + extern android::OMXPluginBase *createOMXPlugin(); #endif // HARDWARE_API_H_ diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index b1a775a..a69d9af 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -32,6 +32,7 @@ enum { kKeyMIMEType = 'mime', // cstring kKeyWidth = 'widt', // int32_t kKeyHeight = 'heig', // int32_t + kKeyRotation = 'rotA', // int32_t (angle in degrees) kKeyIFramesInterval = 'ifiv', // int32_t kKeyStride = 'strd', // int32_t kKeySliceHeight = 'slht', // int32_t |