From 8f469e18c307cb9dc0d16ed9225972aa8be4516f Mon Sep 17 00:00:00 2001 From: Chong Zhang Date: Wed, 13 May 2015 10:21:33 -0700 Subject: stagefright: rename usePersistentInputSurface to setInputSurface and clear persistent surface pointer when MediaRecorder is reset bug: 21045118 bug: 21045402 Change-Id: Ifd0d6deeb969f2252123929541b30b518cecbf9a --- include/media/IMediaRecorder.h | 2 +- include/media/IOMX.h | 2 +- include/media/MediaRecorderBase.h | 2 +- include/media/mediarecorder.h | 2 +- include/media/stagefright/ACodec.h | 5 ++--- include/media/stagefright/CodecBase.h | 2 +- include/media/stagefright/MediaCodec.h | 4 ++-- include/media/stagefright/MediaFilter.h | 3 +-- 8 files changed, 10 insertions(+), 12 deletions(-) (limited to 'include') 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& surface) = 0; + virtual status_t setInputSurface(const sp& surface) = 0; virtual sp 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 *bufferProducer, sp *bufferConsumer) = 0; - virtual status_t usePersistentInputSurface( + virtual status_t setInputSurface( node_id node, OMX_U32 port_index, const sp &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& args) const = 0; - virtual status_t usePersistentSurface(const sp& surface) = 0; + virtual status_t setInputSurface(const sp& surface) = 0; virtual sp 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& surface); + status_t setInputSurface(const sp& surface); sp 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 &msg); virtual void initiateConfigureComponent(const sp &msg); virtual void initiateCreateInputSurface(); - virtual void initiateUsePersistentInputSurface( - const sp &surface); + virtual void initiateSetInputSurface(const sp &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 &msg) = 0; virtual void initiateConfigureComponent(const sp &msg) = 0; virtual void initiateCreateInputSurface() = 0; - virtual void initiateUsePersistentInputSurface( + virtual void initiateSetInputSurface( const sp &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* bufferProducer); - status_t usePersistentInputSurface(const sp &surface); + status_t setInputSurface(const sp &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 &msg); virtual void initiateConfigureComponent(const sp &msg); virtual void initiateCreateInputSurface(); - virtual void initiateUsePersistentInputSurface( - const sp &surface); + virtual void initiateSetInputSurface(const sp &surface); virtual void initiateStart(); virtual void initiateShutdown(bool keepComponentAllocated = false); -- cgit v1.1