diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/media/IMediaRecorder.h | 2 | ||||
-rw-r--r-- | include/media/IOMX.h | 2 | ||||
-rw-r--r-- | include/media/MediaRecorderBase.h | 2 | ||||
-rw-r--r-- | include/media/mediarecorder.h | 2 | ||||
-rw-r--r-- | include/media/stagefright/ACodec.h | 5 | ||||
-rw-r--r-- | include/media/stagefright/CodecBase.h | 2 | ||||
-rw-r--r-- | include/media/stagefright/MediaCodec.h | 4 | ||||
-rw-r--r-- | include/media/stagefright/MediaFilter.h | 3 |
8 files changed, 10 insertions, 12 deletions
diff --git a/include/media/IMediaRecorder.h b/include/media/IMediaRecorder.h index 47de0ca..77ed5d3 100644 --- a/include/media/IMediaRecorder.h +++ b/include/media/IMediaRecorder.h @@ -56,7 +56,7 @@ public: virtual status_t init() = 0; virtual status_t close() = 0; virtual status_t release() = 0; - virtual status_t usePersistentSurface(const sp<IGraphicBufferConsumer>& surface) = 0; + virtual status_t setInputSurface(const sp<IGraphicBufferConsumer>& surface) = 0; virtual sp<IGraphicBufferProducer> querySurfaceMediaSource() = 0; }; diff --git a/include/media/IOMX.h b/include/media/IOMX.h index df3aeca..d33d142 100644 --- a/include/media/IOMX.h +++ b/include/media/IOMX.h @@ -118,7 +118,7 @@ public: sp<IGraphicBufferProducer> *bufferProducer, sp<IGraphicBufferConsumer> *bufferConsumer) = 0; - virtual status_t usePersistentInputSurface( + virtual status_t setInputSurface( node_id node, OMX_U32 port_index, const sp<IGraphicBufferConsumer> &bufferConsumer) = 0; diff --git a/include/media/MediaRecorderBase.h b/include/media/MediaRecorderBase.h index 9947309..d6cc4bb 100644 --- a/include/media/MediaRecorderBase.h +++ b/include/media/MediaRecorderBase.h @@ -57,7 +57,7 @@ struct MediaRecorderBase { virtual status_t reset() = 0; virtual status_t getMaxAmplitude(int *max) = 0; virtual status_t dump(int fd, const Vector<String16>& args) const = 0; - virtual status_t usePersistentSurface(const sp<IGraphicBufferConsumer>& surface) = 0; + virtual status_t setInputSurface(const sp<IGraphicBufferConsumer>& surface) = 0; virtual sp<IGraphicBufferProducer> querySurfaceMediaSource() const = 0; diff --git a/include/media/mediarecorder.h b/include/media/mediarecorder.h index 9210feb..15ff82d 100644 --- a/include/media/mediarecorder.h +++ b/include/media/mediarecorder.h @@ -237,7 +237,7 @@ public: status_t close(); status_t release(); void notify(int msg, int ext1, int ext2); - status_t usePersistentSurface(const sp<PersistentSurface>& surface); + status_t setInputSurface(const sp<PersistentSurface>& surface); sp<IGraphicBufferProducer> querySurfaceMediaSourceFromMediaServer(); private: diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index 0a54df9..b3b3ccb 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -44,8 +44,7 @@ struct ACodec : public AHierarchicalStateMachine, public CodecBase { virtual void initiateAllocateComponent(const sp<AMessage> &msg); virtual void initiateConfigureComponent(const sp<AMessage> &msg); virtual void initiateCreateInputSurface(); - virtual void initiateUsePersistentInputSurface( - const sp<PersistentSurface> &surface); + virtual void initiateSetInputSurface(const sp<PersistentSurface> &surface); virtual void initiateStart(); virtual void initiateShutdown(bool keepComponentAllocated = false); @@ -119,7 +118,7 @@ private: kWhatConfigureComponent = 'conf', kWhatSetSurface = 'setS', kWhatCreateInputSurface = 'cisf', - kWhatUsePersistentInputSurface = 'pisf', + kWhatSetInputSurface = 'sisf', kWhatSignalEndOfInputStream = 'eois', kWhatStart = 'star', kWhatRequestIDRFrame = 'ridr', diff --git a/include/media/stagefright/CodecBase.h b/include/media/stagefright/CodecBase.h index 51213b6..989df4f 100644 --- a/include/media/stagefright/CodecBase.h +++ b/include/media/stagefright/CodecBase.h @@ -50,7 +50,7 @@ struct CodecBase : public AHandler { virtual void initiateAllocateComponent(const sp<AMessage> &msg) = 0; virtual void initiateConfigureComponent(const sp<AMessage> &msg) = 0; virtual void initiateCreateInputSurface() = 0; - virtual void initiateUsePersistentInputSurface( + virtual void initiateSetInputSurface( const sp<PersistentSurface> &surface) = 0; virtual void initiateStart() = 0; virtual void initiateShutdown(bool keepComponentAllocated = false) = 0; diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index 56d2523..a1911ff 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -80,7 +80,7 @@ struct MediaCodec : public AHandler { status_t createInputSurface(sp<IGraphicBufferProducer>* bufferProducer); - status_t usePersistentInputSurface(const sp<PersistentSurface> &surface); + status_t setInputSurface(const sp<PersistentSurface> &surface); status_t start(); @@ -188,7 +188,7 @@ private: kWhatConfigure = 'conf', kWhatSetSurface = 'sSur', kWhatCreateInputSurface = 'cisf', - kWhatUsePersistentInputSurface = 'pisf', + kWhatSetInputSurface = 'sisf', kWhatStart = 'strt', kWhatStop = 'stop', kWhatRelease = 'rele', diff --git a/include/media/stagefright/MediaFilter.h b/include/media/stagefright/MediaFilter.h index fdd2a34..d0a572c 100644 --- a/include/media/stagefright/MediaFilter.h +++ b/include/media/stagefright/MediaFilter.h @@ -34,8 +34,7 @@ struct MediaFilter : public CodecBase { virtual void initiateAllocateComponent(const sp<AMessage> &msg); virtual void initiateConfigureComponent(const sp<AMessage> &msg); virtual void initiateCreateInputSurface(); - virtual void initiateUsePersistentInputSurface( - const sp<PersistentSurface> &surface); + virtual void initiateSetInputSurface(const sp<PersistentSurface> &surface); virtual void initiateStart(); virtual void initiateShutdown(bool keepComponentAllocated = false); |