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/libstagefright/MediaCodec.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/libstagefright/MediaCodec.cpp')
-rw-r--r-- | media/libstagefright/MediaCodec.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp index 44f6542..121bc09 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -548,9 +548,9 @@ status_t MediaCodec::configure( return err; } -status_t MediaCodec::usePersistentInputSurface( +status_t MediaCodec::setInputSurface( const sp<PersistentSurface> &surface) { - sp<AMessage> msg = new AMessage(kWhatUsePersistentInputSurface, this); + sp<AMessage> msg = new AMessage(kWhatSetInputSurface, this); msg->setObject("input-surface", surface.get()); sp<AMessage> response; @@ -1274,7 +1274,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { case CodecBase::kWhatInputSurfaceAccepted: { - // response to initiateUsePersistentInputSurface() + // response to initiateSetInputSurface() status_t err = NO_ERROR; sp<AMessage> response = new AMessage(); if (!msg->findInt32("err", &err)) { @@ -1760,7 +1760,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { } case kWhatCreateInputSurface: - case kWhatUsePersistentInputSurface: + case kWhatSetInputSurface: { sp<AReplyToken> replyID; CHECK(msg->senderAwaitsResponse(&replyID)); @@ -1778,7 +1778,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { sp<RefBase> obj; CHECK(msg->findObject("input-surface", &obj)); - mCodec->initiateUsePersistentInputSurface( + mCodec->initiateSetInputSurface( static_cast<PersistentSurface *>(obj.get())); } break; |