diff options
author | Chong Zhang <chz@google.com> | 2015-05-13 19:55:58 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 19:55:58 +0000 |
commit | 55c3bd0cacfb6e1601cd03fdba814be544a34326 (patch) | |
tree | 24ea9b5be6334e24c10cb1846778e3ad687e8c9f /media/libstagefright | |
parent | 2e69a987ea5a6430c9804e1b59faa0e6ca45a43e (diff) | |
parent | 8f469e18c307cb9dc0d16ed9225972aa8be4516f (diff) | |
download | frameworks_av-55c3bd0cacfb6e1601cd03fdba814be544a34326.zip frameworks_av-55c3bd0cacfb6e1601cd03fdba814be544a34326.tar.gz frameworks_av-55c3bd0cacfb6e1601cd03fdba814be544a34326.tar.bz2 |
Merge "stagefright: rename usePersistentInputSurface to setInputSurface" into mnc-dev
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/ACodec.cpp | 20 | ||||
-rw-r--r-- | media/libstagefright/MediaCodec.cpp | 10 | ||||
-rw-r--r-- | media/libstagefright/MediaCodecSource.cpp | 2 | ||||
-rw-r--r-- | media/libstagefright/OMXClient.cpp | 7 | ||||
-rw-r--r-- | media/libstagefright/filters/MediaFilter.cpp | 4 | ||||
-rw-r--r-- | media/libstagefright/include/OMX.h | 2 | ||||
-rw-r--r-- | media/libstagefright/include/OMXNodeInstance.h | 2 | ||||
-rw-r--r-- | media/libstagefright/omx/OMX.cpp | 5 | ||||
-rw-r--r-- | media/libstagefright/omx/OMXNodeInstance.cpp | 2 |
9 files changed, 26 insertions, 28 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index b9ae125..ada43be 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); @@ -498,9 +498,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(); } @@ -4225,7 +4225,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. @@ -5121,9 +5121,9 @@ bool ACodec::LoadedState::onMessageReceived(const sp<AMessage> &msg) { break; } - case ACodec::kWhatUsePersistentInputSurface: + case ACodec::kWhatSetInputSurface: { - onUsePersistentInputSurface(msg); + onSetInputSurface(msg); handled = true; break; } @@ -5316,9 +5316,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); @@ -5327,7 +5327,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) { @@ -5338,7 +5338,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); } diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp index 4080391..46c154d 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -554,9 +554,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; @@ -1290,7 +1290,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)) { @@ -1776,7 +1776,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { } case kWhatCreateInputSurface: - case kWhatUsePersistentInputSurface: + case kWhatSetInputSurface: { sp<AReplyToken> replyID; CHECK(msg->senderAwaitsResponse(&replyID)); @@ -1794,7 +1794,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; diff --git a/media/libstagefright/MediaCodecSource.cpp b/media/libstagefright/MediaCodecSource.cpp index 9b57733..e089c46 100644 --- a/media/libstagefright/MediaCodecSource.cpp +++ b/media/libstagefright/MediaCodecSource.cpp @@ -427,7 +427,7 @@ status_t MediaCodecSource::initEncoder() { // When using persistent surface, we are only interested in the // consumer, but have to use PersistentSurface as a wrapper to // pass consumer over messages (similar to BufferProducerWrapper) - err = mEncoder->usePersistentInputSurface( + err = mEncoder->setInputSurface( new PersistentSurface(NULL, mGraphicBufferConsumer)); } else { err = mEncoder->createInputSurface(&mGraphicBufferProducer); diff --git a/media/libstagefright/OMXClient.cpp b/media/libstagefright/OMXClient.cpp index 44695ce..f1ebea2 100644 --- a/media/libstagefright/OMXClient.cpp +++ b/media/libstagefright/OMXClient.cpp @@ -108,7 +108,7 @@ struct MuxOMX : public IOMX { sp<IGraphicBufferProducer> *bufferProducer, sp<IGraphicBufferConsumer> *bufferConsumer); - virtual status_t usePersistentInputSurface( + virtual status_t setInputSurface( node_id node, OMX_U32 port_index, const sp<IGraphicBufferConsumer> &bufferConsumer); @@ -356,11 +356,10 @@ status_t MuxOMX::createPersistentInputSurface( bufferProducer, bufferConsumer); } -status_t MuxOMX::usePersistentInputSurface( +status_t MuxOMX::setInputSurface( node_id node, OMX_U32 port_index, const sp<IGraphicBufferConsumer> &bufferConsumer) { - return getOMX(node)->usePersistentInputSurface( - node, port_index, bufferConsumer); + return getOMX(node)->setInputSurface(node, port_index, bufferConsumer); } status_t MuxOMX::signalEndOfInputStream(node_id node) { diff --git a/media/libstagefright/filters/MediaFilter.cpp b/media/libstagefright/filters/MediaFilter.cpp index fa9d630..0cf6b06 100644 --- a/media/libstagefright/filters/MediaFilter.cpp +++ b/media/libstagefright/filters/MediaFilter.cpp @@ -76,9 +76,9 @@ void MediaFilter::initiateCreateInputSurface() { (new AMessage(kWhatCreateInputSurface, this))->post(); } -void MediaFilter::initiateUsePersistentInputSurface( +void MediaFilter::initiateSetInputSurface( const sp<PersistentSurface> & /* surface */) { - ALOGW("initiateUsePersistentInputSurface() unsupported"); + ALOGW("initiateSetInputSurface() unsupported"); } void MediaFilter::initiateStart() { diff --git a/media/libstagefright/include/OMX.h b/media/libstagefright/include/OMX.h index b1ee628..c183208 100644 --- a/media/libstagefright/include/OMX.h +++ b/media/libstagefright/include/OMX.h @@ -99,7 +99,7 @@ public: sp<IGraphicBufferProducer> *bufferProducer, sp<IGraphicBufferConsumer> *bufferConsumer); - virtual status_t usePersistentInputSurface( + virtual status_t setInputSurface( node_id node, OMX_U32 port_index, const sp<IGraphicBufferConsumer> &bufferConsumer); diff --git a/media/libstagefright/include/OMXNodeInstance.h b/media/libstagefright/include/OMXNodeInstance.h index 03c9a8a..ad1e181 100644 --- a/media/libstagefright/include/OMXNodeInstance.h +++ b/media/libstagefright/include/OMXNodeInstance.h @@ -87,7 +87,7 @@ struct OMXNodeInstance { sp<IGraphicBufferProducer> *bufferProducer, sp<IGraphicBufferConsumer> *bufferConsumer); - status_t usePersistentInputSurface( + status_t setInputSurface( OMX_U32 portIndex, const sp<IGraphicBufferConsumer> &bufferConsumer); status_t signalEndOfInputStream(); diff --git a/media/libstagefright/omx/OMX.cpp b/media/libstagefright/omx/OMX.cpp index 876abb8..a1ceb2e 100644 --- a/media/libstagefright/omx/OMX.cpp +++ b/media/libstagefright/omx/OMX.cpp @@ -385,11 +385,10 @@ status_t OMX::createPersistentInputSurface( bufferProducer, bufferConsumer); } -status_t OMX::usePersistentInputSurface( +status_t OMX::setInputSurface( node_id node, OMX_U32 port_index, const sp<IGraphicBufferConsumer> &bufferConsumer) { - return findInstance(node)->usePersistentInputSurface( - port_index, bufferConsumer); + return findInstance(node)->setInputSurface(port_index, bufferConsumer); } diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index 04293d6..91cee73 100644 --- a/media/libstagefright/omx/OMXNodeInstance.cpp +++ b/media/libstagefright/omx/OMXNodeInstance.cpp @@ -891,7 +891,7 @@ status_t OMXNodeInstance::createPersistentInputSurface( return OK; } -status_t OMXNodeInstance::usePersistentInputSurface( +status_t OMXNodeInstance::setInputSurface( OMX_U32 portIndex, const sp<IGraphicBufferConsumer> &bufferConsumer) { Mutex::Autolock autolock(mLock); return createGraphicBufferSource(portIndex, bufferConsumer); |