diff options
| author | Andreas Huber <andih@google.com> | 2012-08-29 15:29:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-29 15:29:11 -0700 |
| commit | d8ee4e56f92eeb44ddc0997efe280b9f28ad814d (patch) | |
| tree | 8ae19d56b416a17a218c4c405939acad3fe8cb1e /include | |
| parent | f147b722ad2405c7f92ea8691f36b04a82d62bb1 (diff) | |
| parent | d7bee3a9d2ad76d073d91f0ee36d5ac5f9df480c (diff) | |
| download | frameworks_av-d8ee4e56f92eeb44ddc0997efe280b9f28ad814d.zip frameworks_av-d8ee4e56f92eeb44ddc0997efe280b9f28ad814d.tar.gz frameworks_av-d8ee4e56f92eeb44ddc0997efe280b9f28ad814d.tar.bz2 | |
Merge "Initial checkin of support for acting as a wifi display source" into jb-mr1-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/IMediaPlayerService.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/ACodec.h | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/media/IMediaPlayerService.h b/include/media/IMediaPlayerService.h index 76c45a0..dbcdf92 100644 --- a/include/media/IMediaPlayerService.h +++ b/include/media/IMediaPlayerService.h @@ -50,6 +50,8 @@ public: virtual sp<IOMX> getOMX() = 0; virtual sp<ICrypto> makeCrypto() = 0; + virtual status_t enableRemoteDisplay(bool enable) = 0; + // codecs and audio devices usage tracking for the battery app enum BatteryDataBits { // tracking audio codec diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index 2371619..500dde6 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -25,6 +25,8 @@ #include <media/stagefright/SkipCutBuffer.h> #include <OMX_Audio.h> +#define TRACK_BUFFER_TIMING 0 + namespace android { struct ABuffer; @@ -127,6 +129,15 @@ private: sp<GraphicBuffer> mGraphicBuffer; }; +#if TRACK_BUFFER_TIMING + struct BufferStats { + int64_t mEmptyBufferTimeUs; + int64_t mFillBufferDoneTimeUs; + }; + + KeyedVector<int64_t, BufferStats> mBufferStats; +#endif + sp<AMessage> mNotify; sp<UninitializedState> mUninitializedState; |