diff options
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
-rw-r--r-- | media/libstagefright/ACodec.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 5475a4a..76da44e 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -261,7 +261,7 @@ private: bool onConfigureComponent(const sp<AMessage> &msg); void onCreateInputSurface(const sp<AMessage> &msg); - void onUsePersistentInputSurface(const sp<AMessage> &msg); + void onSetInputSurface(const sp<AMessage> &msg); void onStart(); void onShutdown(bool keepComponentAllocated); @@ -497,9 +497,9 @@ void ACodec::initiateCreateInputSurface() { (new AMessage(kWhatCreateInputSurface, this))->post(); } -void ACodec::initiateUsePersistentInputSurface( +void ACodec::initiateSetInputSurface( const sp<PersistentSurface> &surface) { - sp<AMessage> msg = new AMessage(kWhatUsePersistentInputSurface, this); + sp<AMessage> msg = new AMessage(kWhatSetInputSurface, this); msg->setObject("input-surface", surface); msg->post(); } @@ -4144,7 +4144,7 @@ bool ACodec::BaseState::onMessageReceived(const sp<AMessage> &msg) { } case ACodec::kWhatCreateInputSurface: - case ACodec::kWhatUsePersistentInputSurface: + case ACodec::kWhatSetInputSurface: case ACodec::kWhatSignalEndOfInputStream: { // This may result in an app illegal state exception. @@ -5040,9 +5040,9 @@ bool ACodec::LoadedState::onMessageReceived(const sp<AMessage> &msg) { break; } - case ACodec::kWhatUsePersistentInputSurface: + case ACodec::kWhatSetInputSurface: { - onUsePersistentInputSurface(msg); + onSetInputSurface(msg); handled = true; break; } @@ -5235,9 +5235,9 @@ void ACodec::LoadedState::onCreateInputSurface( notify->post(); } -void ACodec::LoadedState::onUsePersistentInputSurface( +void ACodec::LoadedState::onSetInputSurface( const sp<AMessage> &msg) { - ALOGV("onUsePersistentInputSurface"); + ALOGV("onSetInputSurface"); sp<AMessage> notify = mCodec->mNotify->dup(); notify->setInt32("what", CodecBase::kWhatInputSurfaceAccepted); @@ -5246,7 +5246,7 @@ void ACodec::LoadedState::onUsePersistentInputSurface( CHECK(msg->findObject("input-surface", &obj)); sp<PersistentSurface> surface = static_cast<PersistentSurface *>(obj.get()); - status_t err = mCodec->mOMX->usePersistentInputSurface( + status_t err = mCodec->mOMX->setInputSurface( mCodec->mNode, kPortIndexInput, surface->getBufferConsumer()); if (err == OK) { @@ -5257,7 +5257,7 @@ void ACodec::LoadedState::onUsePersistentInputSurface( // Can't use mCodec->signalError() here -- MediaCodec won't forward // the error through because it's in the "configured" state. We // send a kWhatInputSurfaceAccepted with an error value instead. - ALOGE("[%s] onUsePersistentInputSurface returning error %d", + ALOGE("[%s] onSetInputSurface returning error %d", mCodec->mComponentName.c_str(), err); notify->setInt32("err", err); } |