diff options
| author | Chong Zhang <chz@google.com> | 2015-05-13 10:21:33 -0700 |
|---|---|---|
| committer | Chong Zhang <chz@google.com> | 2015-05-13 10:49:35 -0700 |
| commit | 8f469e18c307cb9dc0d16ed9225972aa8be4516f (patch) | |
| tree | c8e07383c8bdef3b0214def08f6b2d6da7e622f4 /media/libmedia/mediarecorder.cpp | |
| parent | 635bc8f90429b2fdcaf7f8d43f7f59bcd0fe951c (diff) | |
| download | frameworks_av-8f469e18c307cb9dc0d16ed9225972aa8be4516f.zip frameworks_av-8f469e18c307cb9dc0d16ed9225972aa8be4516f.tar.gz frameworks_av-8f469e18c307cb9dc0d16ed9225972aa8be4516f.tar.bz2 | |
stagefright: rename usePersistentInputSurface to setInputSurface
and clear persistent surface pointer when MediaRecorder is reset
bug: 21045118
bug: 21045402
Change-Id: Ifd0d6deeb969f2252123929541b30b518cecbf9a
Diffstat (limited to 'media/libmedia/mediarecorder.cpp')
| -rw-r--r-- | media/libmedia/mediarecorder.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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<IGraphicBufferProducer> MediaRecorder:: -status_t MediaRecorder::usePersistentSurface(const sp<PersistentSurface>& surface) +status_t MediaRecorder::setInputSurface(const sp<PersistentSurface>& 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<PersistentSurface>& 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) |