diff options
| author | Rachad <rachad@google.com> | 2014-08-09 04:56:42 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-09 00:45:27 +0000 |
| commit | e079c76c5c29d6cca85d9debc470358588721618 (patch) | |
| tree | 670b27f35b504199cdcaa1473619128a314c9ad9 /include/media | |
| parent | 53a1e46e559b00653eadf6f4bb5572679b0ee734 (diff) | |
| parent | 5a446aafff3020d607ad6fb14cc7ae76dd8f7947 (diff) | |
| download | frameworks_av-e079c76c5c29d6cca85d9debc470358588721618.zip frameworks_av-e079c76c5c29d6cca85d9debc470358588721618.tar.gz frameworks_av-e079c76c5c29d6cca85d9debc470358588721618.tar.bz2 | |
Merge "Added Tunneled video playback support to ACodec" into lmp-dev
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/IOMX.h | 4 | ||||
| -rw-r--r-- | include/media/stagefright/ACodec.h | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/media/IOMX.h b/include/media/IOMX.h index dd13fea..627f23b 100644 --- a/include/media/IOMX.h +++ b/include/media/IOMX.h @@ -87,6 +87,10 @@ public: node_id node, OMX_U32 portIndex, OMX_BOOL enable, OMX_U32 maxFrameWidth, OMX_U32 maxFrameHeight) = 0; + virtual status_t configureVideoTunnelMode( + node_id node, OMX_U32 portIndex, OMX_BOOL tunneled, + OMX_U32 audioHwSync, native_handle_t **sidebandHandle) = 0; + virtual status_t enableGraphicBuffers( node_id node, OMX_U32 port_index, OMX_BOOL enable) = 0; diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index 3a6bb9e..eb31c77 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -234,6 +234,9 @@ private: status_t setComponentRole(bool isEncoder, const char *mime); status_t configureCodec(const char *mime, const sp<AMessage> &msg); + status_t configureTunneledVideoPlayback(int64_t audioHwSync, + const sp<ANativeWindow> &nativeWindow); + status_t setVideoPortFormatType( OMX_U32 portIndex, OMX_VIDEO_CODINGTYPE compressionFormat, |