diff options
author | Chong Zhang <chz@google.com> | 2015-05-13 19:55:58 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 19:55:58 +0000 |
commit | 55c3bd0cacfb6e1601cd03fdba814be544a34326 (patch) | |
tree | 24ea9b5be6334e24c10cb1846778e3ad687e8c9f /media/libmediaplayerservice | |
parent | 2e69a987ea5a6430c9804e1b59faa0e6ca45a43e (diff) | |
parent | 8f469e18c307cb9dc0d16ed9225972aa8be4516f (diff) | |
download | frameworks_av-55c3bd0cacfb6e1601cd03fdba814be544a34326.zip frameworks_av-55c3bd0cacfb6e1601cd03fdba814be544a34326.tar.gz frameworks_av-55c3bd0cacfb6e1601cd03fdba814be544a34326.tar.bz2 |
Merge "stagefright: rename usePersistentInputSurface to setInputSurface" into mnc-dev
Diffstat (limited to 'media/libmediaplayerservice')
4 files changed, 7 insertions, 6 deletions
diff --git a/media/libmediaplayerservice/MediaRecorderClient.cpp b/media/libmediaplayerservice/MediaRecorderClient.cpp index ed442e3..f761dec 100644 --- a/media/libmediaplayerservice/MediaRecorderClient.cpp +++ b/media/libmediaplayerservice/MediaRecorderClient.cpp @@ -55,15 +55,15 @@ static bool checkPermission(const char* permissionString) { return ok; } -status_t MediaRecorderClient::usePersistentSurface(const sp<IGraphicBufferConsumer>& surface) +status_t MediaRecorderClient::setInputSurface(const sp<IGraphicBufferConsumer>& surface) { - ALOGV("usePersistentSurface"); + ALOGV("setInputSurface"); Mutex::Autolock lock(mLock); if (mRecorder == NULL) { ALOGE("recorder is not initialized"); return NO_INIT; } - return mRecorder->usePersistentSurface(surface); + return mRecorder->setInputSurface(surface); } sp<IGraphicBufferProducer> MediaRecorderClient::querySurfaceMediaSource() diff --git a/media/libmediaplayerservice/MediaRecorderClient.h b/media/libmediaplayerservice/MediaRecorderClient.h index 7ac88cb..05130d4 100644 --- a/media/libmediaplayerservice/MediaRecorderClient.h +++ b/media/libmediaplayerservice/MediaRecorderClient.h @@ -55,7 +55,7 @@ public: virtual status_t close(); virtual status_t release(); virtual status_t dump(int fd, const Vector<String16>& args); - virtual status_t usePersistentSurface(const sp<IGraphicBufferConsumer>& surface); + virtual status_t setInputSurface(const sp<IGraphicBufferConsumer>& surface); virtual sp<IGraphicBufferProducer> querySurfaceMediaSource(); private: diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp index 509a592..e16a4b5 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.cpp +++ b/media/libmediaplayerservice/StagefrightRecorder.cpp @@ -243,7 +243,7 @@ status_t StagefrightRecorder::setPreviewSurface(const sp<IGraphicBufferProducer> return OK; } -status_t StagefrightRecorder::usePersistentSurface( +status_t StagefrightRecorder::setInputSurface( const sp<IGraphicBufferConsumer>& surface) { mPersistentSurface = surface; @@ -1752,6 +1752,7 @@ status_t StagefrightRecorder::stop() { } mGraphicBufferProducer.clear(); + mPersistentSurface.clear(); if (mOutputFd >= 0) { ::close(mOutputFd); diff --git a/media/libmediaplayerservice/StagefrightRecorder.h b/media/libmediaplayerservice/StagefrightRecorder.h index 1a7b720..7473f42 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.h +++ b/media/libmediaplayerservice/StagefrightRecorder.h @@ -54,7 +54,7 @@ struct StagefrightRecorder : public MediaRecorderBase { virtual status_t setVideoFrameRate(int frames_per_second); virtual status_t setCamera(const sp<ICamera>& camera, const sp<ICameraRecordingProxy>& proxy); virtual status_t setPreviewSurface(const sp<IGraphicBufferProducer>& surface); - virtual status_t usePersistentSurface(const sp<IGraphicBufferConsumer>& surface); + virtual status_t setInputSurface(const sp<IGraphicBufferConsumer>& surface); virtual status_t setOutputFile(int fd, int64_t offset, int64_t length); virtual status_t setParameters(const String8& params); virtual status_t setListener(const sp<IMediaRecorderClient>& listener); |