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 --- media/libmedia/mediarecorder.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'media/libmedia/mediarecorder.cpp') diff --git a/media/libmedia/mediarecorder.cpp b/media/libmedia/mediarecorder.cpp index 1f8b1d3..8bbd8f1 100644 --- a/media/libmedia/mediarecorder.cpp +++ b/media/libmedia/mediarecorder.cpp @@ -345,9 +345,9 @@ sp MediaRecorder:: -status_t MediaRecorder::usePersistentSurface(const sp& surface) +status_t MediaRecorder::setInputSurface(const sp& surface) { - ALOGV("usePersistentSurface"); + ALOGV("setInputSurface"); if (mMediaRecorder == NULL) { ALOGE("media recorder is not initialized yet"); return INVALID_OPERATION; @@ -356,11 +356,11 @@ status_t MediaRecorder::usePersistentSurface(const sp& surfac (MEDIA_RECORDER_PREPARED | MEDIA_RECORDER_RECORDING)); if (isInvalidState) { - ALOGE("usePersistentSurface is called in an invalid state: %d", mCurrentState); + ALOGE("setInputSurface is called in an invalid state: %d", mCurrentState); return INVALID_OPERATION; } - return mMediaRecorder->usePersistentSurface(surface->getBufferConsumer()); + return mMediaRecorder->setInputSurface(surface->getBufferConsumer()); } status_t MediaRecorder::setVideoFrameRate(int frames_per_second) -- cgit v1.1