diff options
| author | Dave Burke <daveburke@google.com> | 2012-09-13 19:00:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-13 19:00:27 -0700 |
| commit | d8421c54dc00d637e41689004edcb06caaa40b62 (patch) | |
| tree | 6d4e455bc9ae39fb17930b241fb54ad0a08ef2e2 /include | |
| parent | 896adcd3ae6a1c7010e526327eff54e16179987b (diff) | |
| parent | 496238cc7551d414067dcbbb4fe3bd801f205f95 (diff) | |
Merge "Support IDR requests in wifi display, MediaCodec and ACodec." into jb-mr1-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/ACodec.h | 5 | ||||
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index 500dde6b..d27f4637 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -58,6 +58,8 @@ struct ACodec : public AHierarchicalStateMachine { void initiateConfigureComponent(const sp<AMessage> &msg); void initiateStart(); + void signalRequestIDRFrame(); + struct PortDescription : public RefBase { size_t countBuffers(); IOMX::buffer_id bufferIDAt(size_t index) const; @@ -102,6 +104,7 @@ private: kWhatAllocateComponent = 'allo', kWhatConfigureComponent = 'conf', kWhatStart = 'star', + kWhatRequestIDRFrame = 'ridr', }; enum { @@ -262,6 +265,8 @@ private: OMX_ERRORTYPE error = OMX_ErrorUndefined, status_t internalError = UNKNOWN_ERROR); + status_t requestIDRFrame(); + DISALLOW_EVIL_CONSTRUCTORS(ACodec); }; diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index e46e8e95..8c612d4a 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -106,6 +106,8 @@ struct MediaCodec : public AHandler { status_t getInputBuffers(Vector<sp<ABuffer> > *buffers) const; status_t getOutputBuffers(Vector<sp<ABuffer> > *buffers) const; + status_t requestIDRFrame(); + protected: virtual ~MediaCodec(); virtual void onMessageReceived(const sp<AMessage> &msg); @@ -145,6 +147,7 @@ private: kWhatDequeueInputTimedOut = 'dITO', kWhatDequeueOutputTimedOut = 'dOTO', kWhatCodecNotify = 'codc', + kWhatRequestIDRFrame = 'ridr', }; enum { |