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/IMediaRecorder.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/IMediaRecorder.cpp')
-rw-r--r-- | media/libmedia/IMediaRecorder.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/media/libmedia/IMediaRecorder.cpp b/media/libmedia/IMediaRecorder.cpp index c7a1394..ee3b584 100644 --- a/media/libmedia/IMediaRecorder.cpp +++ b/media/libmedia/IMediaRecorder.cpp @@ -35,7 +35,7 @@ enum { RELEASE = IBinder::FIRST_CALL_TRANSACTION, INIT, CLOSE, - USE_PERSISTENT_SURFACE, + SET_INPUT_SURFACE, QUERY_SURFACE_MEDIASOURCE, RESET, STOP, @@ -76,13 +76,13 @@ public: return reply.readInt32(); } - status_t usePersistentSurface(const sp<IGraphicBufferConsumer>& surface) + status_t setInputSurface(const sp<IGraphicBufferConsumer>& surface) { - ALOGV("usePersistentSurface(%p)", surface.get()); + ALOGV("setInputSurface(%p)", surface.get()); Parcel data, reply; data.writeInterfaceToken(IMediaRecorder::getInterfaceDescriptor()); data.writeStrongBinder(IInterface::asBinder(surface)); - remote()->transact(USE_PERSISTENT_SURFACE, data, &reply); + remote()->transact(SET_INPUT_SURFACE, data, &reply); return reply.readInt32(); } @@ -453,12 +453,12 @@ status_t BnMediaRecorder::onTransact( reply->writeInt32(setCamera(camera, proxy)); return NO_ERROR; } break; - case USE_PERSISTENT_SURFACE: { - ALOGV("USE_PERSISTENT_SURFACE"); + case SET_INPUT_SURFACE: { + ALOGV("SET_INPUT_SURFACE"); CHECK_INTERFACE(IMediaRecorder, data, reply); sp<IGraphicBufferConsumer> surface = interface_cast<IGraphicBufferConsumer>( data.readStrongBinder()); - reply->writeInt32(usePersistentSurface(surface)); + reply->writeInt32(setInputSurface(surface)); return NO_ERROR; } break; case QUERY_SURFACE_MEDIASOURCE: { |