Revert "Refactor GraphicBufferSource wrappers for OMX HAL"
This reverts commit 3d32c95e94f2672d23b58196beafddacba07c5e8.
Bug: 36110748
Change-Id: I6d0cd5924b3e1e00cdcf844c638bb0acf4fae2ac
(cherry picked from commit a6331ba30928fac713f9d6ce94e1d5f0d008b501)
diff --git a/include/media/omx/1.0/Conversion.h b/include/media/omx/1.0/Conversion.h
index f3f8441..ee83713 100644
--- a/include/media/omx/1.0/Conversion.h
+++ b/include/media/omx/1.0/Conversion.h
@@ -191,19 +191,6 @@
}
/**
- * \brief Convert `Return<Status>` to `binder::Status`.
- *
- * \param[in] t The source `Return<Status>`.
- * \return The corresponding `binder::Status`.
- */
-// convert: Return<Status> -> ::android::binder::Status
-inline ::android::binder::Status toBinderStatus(
- Return<Status> const& t) {
- return ::android::binder::Status::fromStatusT(
- t.isOk() ? static_cast<status_t>(static_cast<Status>(t)) : UNKNOWN_ERROR);
-}
-
-/**
* \brief Convert `Return<Status>` to `status_t`. This is for legacy binder
* calls.
*
diff --git a/include/media/omx/1.0/WGraphicBufferSource.h b/include/media/omx/1.0/WGraphicBufferSource.h
index 0ca5f44..7c80c2e 100644
--- a/include/media/omx/1.0/WGraphicBufferSource.h
+++ b/include/media/omx/1.0/WGraphicBufferSource.h
@@ -48,6 +48,7 @@
using ::android::hardware::Return;
using ::android::hardware::Void;
using ::android::sp;
+
using ::android::IOMXNode;
/**
@@ -59,7 +60,7 @@
* - TW = Treble Wrapper --- It wraps a legacy object inside a Treble object.
*/
-typedef ::android::binder::Status BnStatus;
+typedef ::android::IGraphicBufferSource LGraphicBufferSource;
typedef ::android::BnGraphicBufferSource BnGraphicBufferSource;
typedef ::android::hardware::media::omx::V1_0::IGraphicBufferSource
TGraphicBufferSource;
@@ -67,19 +68,36 @@
struct LWGraphicBufferSource : public BnGraphicBufferSource {
sp<TGraphicBufferSource> mBase;
LWGraphicBufferSource(sp<TGraphicBufferSource> const& base);
- BnStatus configure(
+ ::android::binder::Status configure(
const sp<IOMXNode>& omxNode, int32_t dataSpace) override;
- BnStatus setSuspend(bool suspend, int64_t timeUs) override;
- BnStatus setRepeatPreviousFrameDelayUs(
+ ::android::binder::Status setSuspend(bool suspend, int64_t timeUs) override;
+ ::android::binder::Status setRepeatPreviousFrameDelayUs(
int64_t repeatAfterUs) override;
- BnStatus setMaxFps(float maxFps) override;
- BnStatus setTimeLapseConfig(
+ ::android::binder::Status setMaxFps(float maxFps) override;
+ ::android::binder::Status setTimeLapseConfig(
int64_t timePerFrameUs, int64_t timePerCaptureUs) override;
- BnStatus setStartTimeUs(int64_t startTimeUs) override;
- BnStatus setStopTimeUs(int64_t stopTimeUs) override;
- BnStatus setColorAspects(int32_t aspects) override;
- BnStatus setTimeOffsetUs(int64_t timeOffsetsUs) override;
- BnStatus signalEndOfInputStream() override;
+ ::android::binder::Status setStartTimeUs(int64_t startTimeUs) override;
+ ::android::binder::Status setStopTimeUs(int64_t stopTimeUs) override;
+ ::android::binder::Status setColorAspects(int32_t aspects) override;
+ ::android::binder::Status setTimeOffsetUs(int64_t timeOffsetsUs) override;
+ ::android::binder::Status signalEndOfInputStream() override;
+};
+
+struct TWGraphicBufferSource : public TGraphicBufferSource {
+ sp<LGraphicBufferSource> mBase;
+ TWGraphicBufferSource(sp<LGraphicBufferSource> const& base);
+ Return<void> configure(
+ const sp<IOmxNode>& omxNode, Dataspace dataspace) override;
+ Return<void> setSuspend(bool suspend, int64_t timeUs) override;
+ Return<void> setRepeatPreviousFrameDelayUs(int64_t repeatAfterUs) override;
+ Return<void> setMaxFps(float maxFps) override;
+ Return<void> setTimeLapseConfig(
+ int64_t timePerFrameUs, int64_t timePerCaptureUs) override;
+ Return<void> setStartTimeUs(int64_t startTimeUs) override;
+ Return<void> setStopTimeUs(int64_t stopTimeUs) override;
+ Return<void> setColorAspects(const ColorAspects& aspects) override;
+ Return<void> setTimeOffsetUs(int64_t timeOffsetUs) override;
+ Return<void> signalEndOfInputStream() override;
};
} // namespace utils
diff --git a/include/media/omx/1.0/WOmx.h b/include/media/omx/1.0/WOmx.h
index 9268bd6..4aaf470 100644
--- a/include/media/omx/1.0/WOmx.h
+++ b/include/media/omx/1.0/WOmx.h
@@ -70,6 +70,18 @@
sp<::android::IGraphicBufferSource>* bufferSource) override;
};
+struct TWOmx : public IOmx {
+ sp<IOMX> mBase;
+ TWOmx(sp<IOMX> const& base);
+ Return<void> listNodes(listNodes_cb _hidl_cb) override;
+ Return<void> allocateNode(
+ const hidl_string& name,
+ const sp<IOmxObserver>& observer,
+ allocateNode_cb _hidl_cb) override;
+ Return<void> createInputSurface(createInputSurface_cb _hidl_cb) override;
+
+};
+
} // namespace utils
} // namespace V1_0
} // namespace omx
diff --git a/media/libmedia/omx/1.0/WGraphicBufferSource.cpp b/media/libmedia/omx/1.0/WGraphicBufferSource.cpp
index b4e2975..247c540 100644
--- a/media/libmedia/omx/1.0/WGraphicBufferSource.cpp
+++ b/media/libmedia/omx/1.0/WGraphicBufferSource.cpp
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#include <stagefright/foundation/ColorUtils.h>
+
#include <media/omx/1.0/WGraphicBufferSource.h>
#include <media/omx/1.0/WOmxNode.h>
#include <media/omx/1.0/Conversion.h>
@@ -25,12 +27,14 @@
namespace V1_0 {
namespace utils {
+using android::ColorUtils;
+
// LWGraphicBufferSource
LWGraphicBufferSource::LWGraphicBufferSource(
sp<TGraphicBufferSource> const& base) : mBase(base) {
}
-BnStatus LWGraphicBufferSource::configure(
+::android::binder::Status LWGraphicBufferSource::configure(
const sp<IOMXNode>& omxNode, int32_t dataSpace) {
sp<IOmxNode> hOmxNode = omxNode->getHalInterface();
return toBinderStatus(mBase->configure(
@@ -38,51 +42,111 @@
toHardwareDataspace(dataSpace)));
}
-BnStatus LWGraphicBufferSource::setSuspend(
+::android::binder::Status LWGraphicBufferSource::setSuspend(
bool suspend, int64_t timeUs) {
return toBinderStatus(mBase->setSuspend(suspend, timeUs));
}
-BnStatus LWGraphicBufferSource::setRepeatPreviousFrameDelayUs(
+::android::binder::Status LWGraphicBufferSource::setRepeatPreviousFrameDelayUs(
int64_t repeatAfterUs) {
return toBinderStatus(mBase->setRepeatPreviousFrameDelayUs(repeatAfterUs));
}
-BnStatus LWGraphicBufferSource::setMaxFps(float maxFps) {
+::android::binder::Status LWGraphicBufferSource::setMaxFps(float maxFps) {
return toBinderStatus(mBase->setMaxFps(maxFps));
}
-BnStatus LWGraphicBufferSource::setTimeLapseConfig(
+::android::binder::Status LWGraphicBufferSource::setTimeLapseConfig(
int64_t timePerFrameUs, int64_t timePerCaptureUs) {
return toBinderStatus(mBase->setTimeLapseConfig(
timePerFrameUs, timePerCaptureUs));
}
-BnStatus LWGraphicBufferSource::setStartTimeUs(
+::android::binder::Status LWGraphicBufferSource::setStartTimeUs(
int64_t startTimeUs) {
return toBinderStatus(mBase->setStartTimeUs(startTimeUs));
}
-BnStatus LWGraphicBufferSource::setStopTimeUs(
+::android::binder::Status LWGraphicBufferSource::setStopTimeUs(
int64_t stopTimeUs) {
return toBinderStatus(mBase->setStopTimeUs(stopTimeUs));
}
-BnStatus LWGraphicBufferSource::setColorAspects(
+::android::binder::Status LWGraphicBufferSource::setColorAspects(
int32_t aspects) {
return toBinderStatus(mBase->setColorAspects(
toHardwareColorAspects(aspects)));
}
-BnStatus LWGraphicBufferSource::setTimeOffsetUs(
+::android::binder::Status LWGraphicBufferSource::setTimeOffsetUs(
int64_t timeOffsetsUs) {
return toBinderStatus(mBase->setTimeOffsetUs(timeOffsetsUs));
}
-BnStatus LWGraphicBufferSource::signalEndOfInputStream() {
+::android::binder::Status LWGraphicBufferSource::signalEndOfInputStream() {
return toBinderStatus(mBase->signalEndOfInputStream());
}
+// TWGraphicBufferSource
+TWGraphicBufferSource::TWGraphicBufferSource(
+ sp<LGraphicBufferSource> const& base) : mBase(base) {
+}
+
+Return<void> TWGraphicBufferSource::configure(
+ const sp<IOmxNode>& omxNode, Dataspace dataspace) {
+ mBase->configure(new LWOmxNode(omxNode), toRawDataspace(dataspace));
+ return Void();
+}
+
+Return<void> TWGraphicBufferSource::setSuspend(
+ bool suspend, int64_t timeUs) {
+ mBase->setSuspend(suspend, timeUs);
+ return Void();
+}
+
+Return<void> TWGraphicBufferSource::setRepeatPreviousFrameDelayUs(
+ int64_t repeatAfterUs) {
+ mBase->setRepeatPreviousFrameDelayUs(repeatAfterUs);
+ return Void();
+}
+
+Return<void> TWGraphicBufferSource::setMaxFps(float maxFps) {
+ mBase->setMaxFps(maxFps);
+ return Void();
+}
+
+Return<void> TWGraphicBufferSource::setTimeLapseConfig(
+ int64_t timePerFrameUs, int64_t timePerCaptureUs) {
+ mBase->setTimeLapseConfig(timePerFrameUs, timePerCaptureUs);
+ return Void();
+}
+
+Return<void> TWGraphicBufferSource::setStartTimeUs(int64_t startTimeUs) {
+ mBase->setStartTimeUs(startTimeUs);
+ return Void();
+}
+
+Return<void> TWGraphicBufferSource::setStopTimeUs(int64_t stopTimeUs) {
+ mBase->setStopTimeUs(stopTimeUs);
+ return Void();
+}
+
+Return<void> TWGraphicBufferSource::setColorAspects(
+ const ColorAspects& aspects) {
+ mBase->setColorAspects(toCompactColorAspects(aspects));
+ return Void();
+}
+
+Return<void> TWGraphicBufferSource::setTimeOffsetUs(int64_t timeOffsetUs) {
+ mBase->setTimeOffsetUs(timeOffsetUs);
+ return Void();
+}
+
+Return<void> TWGraphicBufferSource::signalEndOfInputStream() {
+ mBase->signalEndOfInputStream();
+ return Void();
+}
+
} // namespace utils
} // namespace V1_0
} // namespace omx
diff --git a/media/libmedia/omx/1.0/WOmx.cpp b/media/libmedia/omx/1.0/WOmx.cpp
index 8e4e147..39871f8 100644
--- a/media/libmedia/omx/1.0/WOmx.cpp
+++ b/media/libmedia/omx/1.0/WOmx.cpp
@@ -79,6 +79,45 @@
return transStatus == NO_ERROR ? fnStatus : transStatus;
}
+// TWOmx
+TWOmx::TWOmx(sp<IOMX> const& base) : mBase(base) {
+}
+
+Return<void> TWOmx::listNodes(listNodes_cb _hidl_cb) {
+ List<IOMX::ComponentInfo> lList;
+ Status status = toStatus(mBase->listNodes(&lList));
+
+ hidl_vec<IOmx::ComponentInfo> tList;
+ tList.resize(lList.size());
+ size_t i = 0;
+ for (auto const& lInfo : lList) {
+ convertTo(&(tList[i++]), lInfo);
+ }
+ _hidl_cb(status, tList);
+ return Void();
+}
+
+Return<void> TWOmx::allocateNode(
+ const hidl_string& name,
+ const sp<IOmxObserver>& observer,
+ allocateNode_cb _hidl_cb) {
+ sp<IOMXNode> omxNode;
+ Status status = toStatus(mBase->allocateNode(
+ name, new LWOmxObserver(observer), &omxNode));
+ _hidl_cb(status, new TWOmxNode(omxNode));
+ return Void();
+}
+
+Return<void> TWOmx::createInputSurface(createInputSurface_cb _hidl_cb) {
+ sp<::android::IGraphicBufferProducer> lProducer;
+ sp<::android::IGraphicBufferSource> lSource;
+ status_t status = mBase->createInputSurface(&lProducer, &lSource);
+ _hidl_cb(toStatus(status),
+ new TWOmxBufferProducer(lProducer),
+ new TWGraphicBufferSource(lSource));
+ return Void();
+}
+
} // namespace utils
} // namespace V1_0
} // namespace omx
diff --git a/media/libstagefright/omx/Android.mk b/media/libstagefright/omx/Android.mk
index 9cba3d0..f70f13b 100644
--- a/media/libstagefright/omx/Android.mk
+++ b/media/libstagefright/omx/Android.mk
@@ -4,7 +4,6 @@
LOCAL_SRC_FILES:= \
FrameDropper.cpp \
GraphicBufferSource.cpp \
- BWGraphicBufferSource.cpp \
OMX.cpp \
OMXMaster.cpp \
OMXNodeInstance.cpp \
diff --git a/media/libstagefright/omx/BWGraphicBufferSource.cpp b/media/libstagefright/omx/BWGraphicBufferSource.cpp
deleted file mode 100644
index 4e0f6dd..0000000
--- a/media/libstagefright/omx/BWGraphicBufferSource.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright 2017, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-//#define LOG_NDEBUG 0
-#define LOG_TAG "BWGraphicBufferSource"
-
-#include <OMX_Component.h>
-#include <OMX_IndexExt.h>
-
-#include <media/OMXBuffer.h>
-#include <IOMX.h>
-
-#include "OMXUtils.h"
-#include "BWGraphicBufferSource.h"
-
-namespace android {
-
-static const OMX_U32 kPortIndexInput = 0;
-
-struct BWGraphicBufferSource::BWOmxNodeWrapper : public IOmxNodeWrapper {
- sp<IOMXNode> mOMXNode;
-
- BWOmxNodeWrapper(const sp<IOMXNode> &omxNode): mOMXNode(omxNode) {
- }
-
- virtual status_t emptyBuffer(
- int32_t bufferId, uint32_t flags,
- const sp<GraphicBuffer> &buffer,
- int64_t timestamp, int fenceFd) override {
- return mOMXNode->emptyBuffer(bufferId, buffer, flags, timestamp, fenceFd);
- }
-
- virtual void dispatchDataSpaceChanged(
- int32_t dataSpace, int32_t aspects, int32_t pixelFormat) override {
- omx_message msg;
- msg.type = omx_message::EVENT;
- msg.fenceFd = -1;
- msg.u.event_data.event = OMX_EventDataSpaceChanged;
- msg.u.event_data.data1 = dataSpace;
- msg.u.event_data.data2 = aspects;
- msg.u.event_data.data3 = pixelFormat;
- mOMXNode->dispatchMessage(msg);
- }
-};
-
-struct BWGraphicBufferSource::BWOMXBufferSource : public BnOMXBufferSource {
- sp<GraphicBufferSource> mSource;
-
- BWOMXBufferSource(const sp<GraphicBufferSource> &source): mSource(source) {
- }
-
- Status onOmxExecuting() override {
- return mSource->onOmxExecuting();
- }
-
- Status onOmxIdle() override {
- return mSource->onOmxIdle();
- }
-
- Status onOmxLoaded() override {
- return mSource->onOmxLoaded();
- }
-
- Status onInputBufferAdded(int bufferId) override {
- return mSource->onInputBufferAdded(bufferId);
- }
-
- Status onInputBufferEmptied(
- int bufferId, const OMXFenceParcelable& fenceParcel) override {
- return mSource->onInputBufferEmptied(bufferId, fenceParcel.get());
- }
-};
-
-BWGraphicBufferSource::BWGraphicBufferSource(
- sp<GraphicBufferSource> const& base) :
- mBase(base),
- mOMXBufferSource(new BWOMXBufferSource(base)) {
-}
-
-::android::binder::Status BWGraphicBufferSource::configure(
- const sp<IOMXNode>& omxNode, int32_t dataSpace) {
- // Do setInputSurface() first, the node will try to enable metadata
- // mode on input, and does necessary error checking. If this fails,
- // we can't use this input surface on the node.
- status_t err = omxNode->setInputSurface(mOMXBufferSource);
- if (err != NO_ERROR) {
- ALOGE("Unable to set input surface: %d", err);
- return Status::fromStatusT(err);
- }
-
- // use consumer usage bits queried from encoder, but always add
- // HW_VIDEO_ENCODER for backward compatibility.
- uint32_t consumerUsage;
- if (omxNode->getParameter(
- (OMX_INDEXTYPE)OMX_IndexParamConsumerUsageBits,
- &consumerUsage, sizeof(consumerUsage)) != OK) {
- consumerUsage = 0;
- }
-
- OMX_PARAM_PORTDEFINITIONTYPE def;
- InitOMXParams(&def);
- def.nPortIndex = kPortIndexInput;
-
- err = omxNode->getParameter(
- OMX_IndexParamPortDefinition, &def, sizeof(def));
- if (err != NO_ERROR) {
- ALOGE("Failed to get port definition: %d", err);
- return Status::fromStatusT(UNKNOWN_ERROR);
- }
-
- return Status::fromStatusT(mBase->configure(
- new BWOmxNodeWrapper(omxNode),
- dataSpace,
- def.nBufferCountActual,
- def.format.video.nFrameWidth,
- def.format.video.nFrameHeight,
- consumerUsage));
-}
-
-::android::binder::Status BWGraphicBufferSource::setSuspend(
- bool suspend, int64_t timeUs) {
- return Status::fromStatusT(mBase->setSuspend(suspend, timeUs));
-}
-
-::android::binder::Status BWGraphicBufferSource::setRepeatPreviousFrameDelayUs(
- int64_t repeatAfterUs) {
- return Status::fromStatusT(mBase->setRepeatPreviousFrameDelayUs(repeatAfterUs));
-}
-
-::android::binder::Status BWGraphicBufferSource::setMaxFps(float maxFps) {
- return Status::fromStatusT(mBase->setMaxFps(maxFps));
-}
-
-::android::binder::Status BWGraphicBufferSource::setTimeLapseConfig(
- int64_t timePerFrameUs, int64_t timePerCaptureUs) {
- return Status::fromStatusT(mBase->setTimeLapseConfig(
- timePerFrameUs, timePerCaptureUs));
-}
-
-::android::binder::Status BWGraphicBufferSource::setStartTimeUs(
- int64_t startTimeUs) {
- return Status::fromStatusT(mBase->setStartTimeUs(startTimeUs));
-}
-
-::android::binder::Status BWGraphicBufferSource::setStopTimeUs(
- int64_t stopTimeUs) {
- return Status::fromStatusT(mBase->setStopTimeUs(stopTimeUs));
-}
-
-::android::binder::Status BWGraphicBufferSource::setColorAspects(
- int32_t aspects) {
- return Status::fromStatusT(mBase->setColorAspects(aspects));
-}
-
-::android::binder::Status BWGraphicBufferSource::setTimeOffsetUs(
- int64_t timeOffsetsUs) {
- return Status::fromStatusT(mBase->setTimeOffsetUs(timeOffsetsUs));
-}
-
-::android::binder::Status BWGraphicBufferSource::signalEndOfInputStream() {
- return Status::fromStatusT(mBase->signalEndOfInputStream());
-}
-
-} // namespace android
diff --git a/media/libstagefright/omx/BWGraphicBufferSource.h b/media/libstagefright/omx/BWGraphicBufferSource.h
deleted file mode 100644
index f1ce2af..0000000
--- a/media/libstagefright/omx/BWGraphicBufferSource.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2017, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef BWGRAPHIC_BUFFER_SOURCE_H_
-#define BWGRAPHIC_BUFFER_SOURCE_H_
-
-#include <binder/Binder.h>
-#include <binder/Status.h>
-#include <android/BnGraphicBufferSource.h>
-#include <android/BnOMXBufferSource.h>
-#include <IOMX.h>
-
-#include "GraphicBufferSource.h"
-#include "IOmxNodeWrapper.h"
-
-namespace android {
-
-using ::android::binder::Status;
-using ::android::BnGraphicBufferSource;
-using ::android::GraphicBufferSource;
-using ::android::IOMXNode;
-using ::android::sp;
-
-struct BWGraphicBufferSource : public BnGraphicBufferSource {
- struct BWOMXBufferSource;
- struct BWOmxNodeWrapper;
-
- sp<GraphicBufferSource> mBase;
- sp<IOMXBufferSource> mOMXBufferSource;
-
- BWGraphicBufferSource(sp<GraphicBufferSource> const &base);
-
- Status configure(
- const sp<IOMXNode>& omxNode, int32_t dataSpace) override;
- Status setSuspend(bool suspend, int64_t timeUs) override;
- Status setRepeatPreviousFrameDelayUs(
- int64_t repeatAfterUs) override;
- Status setMaxFps(float maxFps) override;
- Status setTimeLapseConfig(
- int64_t timePerFrameUs, int64_t timePerCaptureUs) override;
- Status setStartTimeUs(int64_t startTimeUs) override;
- Status setStopTimeUs(int64_t stopTimeUs) override;
- Status setColorAspects(int32_t aspects) override;
- Status setTimeOffsetUs(int64_t timeOffsetsUs) override;
- Status signalEndOfInputStream() override;
-};
-
-} // namespace android
-
-#endif // ANDROID_HARDWARE_MEDIA_OMX_V1_0_WGRAPHICBUFFERSOURCE_H
diff --git a/media/libstagefright/omx/GraphicBufferSource.cpp b/media/libstagefright/omx/GraphicBufferSource.cpp
index 793ecb8..2f457ac 100644
--- a/media/libstagefright/omx/GraphicBufferSource.cpp
+++ b/media/libstagefright/omx/GraphicBufferSource.cpp
@@ -41,6 +41,37 @@
namespace android {
+static const OMX_U32 kPortIndexInput = 0;
+
+class GraphicBufferSource::OmxBufferSource : public BnOMXBufferSource {
+public:
+ GraphicBufferSource* mSource;
+
+ OmxBufferSource(GraphicBufferSource* source): mSource(source) {
+ }
+
+ Status onOmxExecuting() override {
+ return mSource->onOmxExecuting();
+ }
+
+ Status onOmxIdle() override {
+ return mSource->onOmxIdle();
+ }
+
+ Status onOmxLoaded() override {
+ return mSource->onOmxLoaded();
+ }
+
+ Status onInputBufferAdded(int bufferId) override {
+ return mSource->onInputBufferAdded(bufferId);
+ }
+
+ Status onInputBufferEmptied(
+ int bufferId, const OMXFenceParcelable& fenceParcel) override {
+ return mSource->onInputBufferEmptied(bufferId, fenceParcel);
+ }
+};
+
GraphicBufferSource::GraphicBufferSource() :
mInitCheck(UNKNOWN_ERROR),
mExecuting(false),
@@ -66,7 +97,8 @@
mTimePerFrameUs(-1ll),
mPrevCaptureUs(-1ll),
mPrevFrameUs(-1ll),
- mInputBufferTimeOffsetUs(0ll) {
+ mInputBufferTimeOffsetUs(0ll),
+ mOmxBufferSource(new OmxBufferSource(this)) {
ALOGV("GraphicBufferSource");
String8 name("GraphicBufferSource");
@@ -90,7 +122,7 @@
return;
}
- memset(&mColorAspectsPacked, 0, sizeof(mColorAspectsPacked));
+ memset(&mColorAspects, 0, sizeof(mColorAspects));
CHECK(mInitCheck == NO_ERROR);
}
@@ -241,7 +273,9 @@
}
Status GraphicBufferSource::onInputBufferEmptied(
- int32_t bufferID, int fenceFd) {
+ int32_t bufferID, const OMXFenceParcelable &fenceParcel) {
+ int fenceFd = fenceParcel.get();
+
Mutex::Autolock autoLock(mMutex);
if (!mExecuting) {
if (fenceFd >= 0) {
@@ -340,7 +374,15 @@
mLastDataSpace = dataSpace;
if (ColorUtils::convertDataSpaceToV0(dataSpace)) {
- mOMXNode->dispatchDataSpaceChanged(mLastDataSpace, mColorAspectsPacked, pixelFormat);
+ omx_message msg;
+ msg.type = omx_message::EVENT;
+ msg.fenceFd = -1;
+ msg.u.event_data.event = OMX_EventDataSpaceChanged;
+ msg.u.event_data.data1 = mLastDataSpace;
+ msg.u.event_data.data2 = ColorUtils::packToU32(mColorAspects);
+ msg.u.event_data.data3 = pixelFormat;
+
+ mOMXNode->dispatchMessage(msg);
}
}
@@ -647,7 +689,7 @@
int fenceID = item.mFence->isValid() ? item.mFence->dup() : -1;
status_t err = mOMXNode->emptyBuffer(
- bufferID, OMX_BUFFERFLAG_ENDOFFRAME, buffer, codecTimeUs, fenceID);
+ bufferID, buffer, OMX_BUFFERFLAG_ENDOFFRAME, codecTimeUs, fenceID);
if (err != OK) {
ALOGW("WARNING: emptyGraphicBuffer failed: 0x%x", err);
@@ -679,8 +721,10 @@
CodecBuffer& codecBuffer(mCodecBuffers.editItemAt(cbi));
IOMX::buffer_id bufferID = codecBuffer.mBufferID;
- status_t err = mOMXNode->emptyBuffer(bufferID,
- OMX_BUFFERFLAG_ENDOFFRAME | OMX_BUFFERFLAG_EOS);
+ status_t err = mOMXNode->emptyBuffer(
+ bufferID, (sp<GraphicBuffer>)NULL,
+ OMX_BUFFERFLAG_ENDOFFRAME | OMX_BUFFERFLAG_EOS,
+ 0 /* timestamp */, -1 /* fenceFd */);
if (err != OK) {
ALOGW("emptyDirectBuffer EOS failed: 0x%x", err);
} else {
@@ -821,38 +865,65 @@
ALOG_ASSERT(false, "GraphicBufferSource can't consume sideband streams");
}
-status_t GraphicBufferSource::configure(
- const sp<IOmxNodeWrapper>& omxNode,
- int32_t dataSpace,
- int32_t bufferCount,
- uint32_t frameWidth,
- uint32_t frameHeight,
- uint32_t consumerUsage) {
+Status GraphicBufferSource::configure(
+ const sp<IOMXNode>& omxNode, int32_t dataSpace) {
if (omxNode == NULL) {
- return BAD_VALUE;
+ return Status::fromServiceSpecificError(BAD_VALUE);
}
+ // Do setInputSurface() first, the node will try to enable metadata
+ // mode on input, and does necessary error checking. If this fails,
+ // we can't use this input surface on the node.
+ status_t err = omxNode->setInputSurface(mOmxBufferSource);
+ if (err != NO_ERROR) {
+ ALOGE("Unable to set input surface: %d", err);
+ return Status::fromServiceSpecificError(err);
+ }
+
+ // use consumer usage bits queried from encoder, but always add
+ // HW_VIDEO_ENCODER for backward compatibility.
+ uint32_t consumerUsage;
+ if (omxNode->getParameter(
+ (OMX_INDEXTYPE)OMX_IndexParamConsumerUsageBits,
+ &consumerUsage, sizeof(consumerUsage)) != OK) {
+ consumerUsage = 0;
+ }
+
+ OMX_PARAM_PORTDEFINITIONTYPE def;
+ InitOMXParams(&def);
+ def.nPortIndex = kPortIndexInput;
+
+ err = omxNode->getParameter(
+ OMX_IndexParamPortDefinition, &def, sizeof(def));
+ if (err != NO_ERROR) {
+ ALOGE("Failed to get port definition: %d", err);
+ return Status::fromServiceSpecificError(UNKNOWN_ERROR);
+ }
// Call setMaxAcquiredBufferCount without lock.
// setMaxAcquiredBufferCount could call back to onBuffersReleased
// if the buffer count change results in releasing of existing buffers,
// which would lead to deadlock.
- status_t err = mConsumer->setMaxAcquiredBufferCount(bufferCount);
+ err = mConsumer->setMaxAcquiredBufferCount(def.nBufferCountActual);
if (err != NO_ERROR) {
ALOGE("Unable to set BQ max acquired buffer count to %u: %d",
- bufferCount, err);
- return err;
+ def.nBufferCountActual, err);
+ return Status::fromServiceSpecificError(err);
}
{
Mutex::Autolock autoLock(mMutex);
mOMXNode = omxNode;
- err = mConsumer->setDefaultBufferSize(frameWidth, frameHeight);
+ err = mConsumer->setDefaultBufferSize(
+ def.format.video.nFrameWidth,
+ def.format.video.nFrameHeight);
if (err != NO_ERROR) {
ALOGE("Unable to set BQ default buffer size to %ux%u: %d",
- frameWidth, frameHeight, err);
- return err;
+ def.format.video.nFrameWidth,
+ def.format.video.nFrameHeight,
+ err);
+ return Status::fromServiceSpecificError(err);
}
consumerUsage |= GRALLOC_USAGE_HW_VIDEO_ENCODER;
@@ -886,17 +957,17 @@
mActionQueue.clear();
}
- return OK;
+ return Status::ok();
}
-status_t GraphicBufferSource::setSuspend(bool suspend, int64_t suspendStartTimeUs) {
+Status GraphicBufferSource::setSuspend(bool suspend, int64_t suspendStartTimeUs) {
ALOGV("setSuspend=%d at time %lld us", suspend, (long long)suspendStartTimeUs);
Mutex::Autolock autoLock(mMutex);
if (mStopTimeUs != -1) {
ALOGE("setSuspend failed as STOP action is pending");
- return INVALID_OPERATION;
+ return Status::fromServiceSpecificError(INVALID_OPERATION);
}
// Push the action to the queue.
@@ -906,12 +977,12 @@
if (suspendStartTimeUs > currentSystemTimeUs) {
ALOGE("setSuspend failed. %lld is larger than current system time %lld us",
(long long)suspendStartTimeUs, (long long)currentSystemTimeUs);
- return INVALID_OPERATION;
+ return Status::fromServiceSpecificError(INVALID_OPERATION);
}
if (mLastActionTimeUs != -1 && suspendStartTimeUs < mLastActionTimeUs) {
ALOGE("setSuspend failed. %lld is smaller than last action time %lld us",
(long long)suspendStartTimeUs, (long long)mLastActionTimeUs);
- return INVALID_OPERATION;
+ return Status::fromServiceSpecificError(INVALID_OPERATION);
}
mLastActionTimeUs = suspendStartTimeUs;
ActionItem action;
@@ -936,7 +1007,7 @@
releaseBuffer(item.mSlot, item.mFrameNumber, item.mFence);
}
- return OK;
+ return Status::ok();
} else {
mSuspended = false;
@@ -952,54 +1023,54 @@
}
}
}
- return OK;
+ return Status::ok();
}
-status_t GraphicBufferSource::setRepeatPreviousFrameDelayUs(int64_t repeatAfterUs) {
+Status GraphicBufferSource::setRepeatPreviousFrameDelayUs(int64_t repeatAfterUs) {
ALOGV("setRepeatPreviousFrameDelayUs: delayUs=%lld", (long long)repeatAfterUs);
Mutex::Autolock autoLock(mMutex);
if (mExecuting || repeatAfterUs <= 0ll) {
- return INVALID_OPERATION;
+ return Status::fromServiceSpecificError(INVALID_OPERATION);
}
mRepeatAfterUs = repeatAfterUs;
- return OK;
+ return Status::ok();
}
-status_t GraphicBufferSource::setTimeOffsetUs(int64_t timeOffsetUs) {
+Status GraphicBufferSource::setTimeOffsetUs(int64_t timeOffsetUs) {
Mutex::Autolock autoLock(mMutex);
// timeOffsetUs must be negative for adjustment.
if (timeOffsetUs >= 0ll) {
- return INVALID_OPERATION;
+ return Status::fromServiceSpecificError(INVALID_OPERATION);
}
mInputBufferTimeOffsetUs = timeOffsetUs;
- return OK;
+ return Status::ok();
}
-status_t GraphicBufferSource::setMaxFps(float maxFps) {
+Status GraphicBufferSource::setMaxFps(float maxFps) {
ALOGV("setMaxFps: maxFps=%lld", (long long)maxFps);
Mutex::Autolock autoLock(mMutex);
if (mExecuting) {
- return INVALID_OPERATION;
+ return Status::fromServiceSpecificError(INVALID_OPERATION);
}
mFrameDropper = new FrameDropper();
status_t err = mFrameDropper->setMaxFrameRate(maxFps);
if (err != OK) {
mFrameDropper.clear();
- return err;
+ return Status::fromServiceSpecificError(err);
}
- return OK;
+ return Status::ok();
}
-status_t GraphicBufferSource::setStartTimeUs(int64_t skipFramesBeforeUs) {
+Status GraphicBufferSource::setStartTimeUs(int64_t skipFramesBeforeUs) {
ALOGV("setStartTimeUs: skipFramesBeforeUs=%lld", (long long)skipFramesBeforeUs);
Mutex::Autolock autoLock(mMutex);
@@ -1007,16 +1078,16 @@
mSkipFramesBeforeNs =
(skipFramesBeforeUs > 0) ? (skipFramesBeforeUs * 1000) : -1ll;
- return OK;
+ return Status::ok();
}
-status_t GraphicBufferSource::setStopTimeUs(int64_t stopTimeUs) {
+Status GraphicBufferSource::setStopTimeUs(int64_t stopTimeUs) {
ALOGV("setStopTimeUs: %lld us", (long long)stopTimeUs);
Mutex::Autolock autoLock(mMutex);
if (mStopTimeUs != -1) {
// Ignore if stop time has already been set
- return OK;
+ return Status::ok();
}
// stopTimeUs must be smaller or equal to current systemTime.
@@ -1024,12 +1095,12 @@
if (stopTimeUs > currentSystemTimeUs) {
ALOGE("setStopTimeUs failed. %lld is larger than current system time %lld us",
(long long)stopTimeUs, (long long)currentSystemTimeUs);
- return INVALID_OPERATION;
+ return Status::fromServiceSpecificError(INVALID_OPERATION);
}
if (mLastActionTimeUs != -1 && stopTimeUs < mLastActionTimeUs) {
ALOGE("setSuspend failed. %lld is smaller than last action time %lld us",
(long long)stopTimeUs, (long long)mLastActionTimeUs);
- return INVALID_OPERATION;
+ return Status::fromServiceSpecificError(INVALID_OPERATION);
}
mLastActionTimeUs = stopTimeUs;
ActionItem action;
@@ -1037,46 +1108,45 @@
action.mActionTimeUs = stopTimeUs;
mActionQueue.push_back(action);
mStopTimeUs = stopTimeUs;
- return OK;
+ return Status::ok();
}
-status_t GraphicBufferSource::setTimeLapseConfig(int64_t timePerFrameUs, int64_t timePerCaptureUs) {
+Status GraphicBufferSource::setTimeLapseConfig(int64_t timePerFrameUs, int64_t timePerCaptureUs) {
ALOGV("setTimeLapseConfig: timePerFrameUs=%lld, timePerCaptureUs=%lld",
(long long)timePerFrameUs, (long long)timePerCaptureUs);
Mutex::Autolock autoLock(mMutex);
if (mExecuting || timePerFrameUs <= 0ll || timePerCaptureUs <= 0ll) {
- return INVALID_OPERATION;
+ return Status::fromServiceSpecificError(INVALID_OPERATION);
}
mTimePerFrameUs = timePerFrameUs;
mTimePerCaptureUs = timePerCaptureUs;
- return OK;
+ return Status::ok();
}
-status_t GraphicBufferSource::setColorAspects(int32_t aspectsPacked) {
+Status GraphicBufferSource::setColorAspects(int32_t aspectsPacked) {
Mutex::Autolock autoLock(mMutex);
- mColorAspectsPacked = aspectsPacked;
- ColorAspects colorAspects = ColorUtils::unpackToColorAspects(aspectsPacked);
+ mColorAspects = ColorUtils::unpackToColorAspects(aspectsPacked);
ALOGD("requesting color aspects (R:%d(%s), P:%d(%s), M:%d(%s), T:%d(%s))",
- colorAspects.mRange, asString(colorAspects.mRange),
- colorAspects.mPrimaries, asString(colorAspects.mPrimaries),
- colorAspects.mMatrixCoeffs, asString(colorAspects.mMatrixCoeffs),
- colorAspects.mTransfer, asString(colorAspects.mTransfer));
+ mColorAspects.mRange, asString(mColorAspects.mRange),
+ mColorAspects.mPrimaries, asString(mColorAspects.mPrimaries),
+ mColorAspects.mMatrixCoeffs, asString(mColorAspects.mMatrixCoeffs),
+ mColorAspects.mTransfer, asString(mColorAspects.mTransfer));
- return OK;
+ return Status::ok();
}
-status_t GraphicBufferSource::signalEndOfInputStream() {
+Status GraphicBufferSource::signalEndOfInputStream() {
Mutex::Autolock autoLock(mMutex);
ALOGV("signalEndOfInputStream: exec=%d avail=%zu eos=%d",
mExecuting, mNumFramesAvailable, mEndOfStream);
if (mEndOfStream) {
ALOGE("EOS was already signaled");
- return INVALID_OPERATION;
+ return Status::fromStatusT(INVALID_OPERATION);
}
// Set the end-of-stream flag. If no frames are pending from the
@@ -1093,7 +1163,7 @@
submitEndOfInputStream_l();
}
- return OK;
+ return Status::ok();
}
void GraphicBufferSource::onMessageReceived(const sp<AMessage> &msg) {
diff --git a/media/libstagefright/omx/GraphicBufferSource.h b/media/libstagefright/omx/GraphicBufferSource.h
index 371c5ed..475548e 100644
--- a/media/libstagefright/omx/GraphicBufferSource.h
+++ b/media/libstagefright/omx/GraphicBufferSource.h
@@ -32,8 +32,6 @@
#include <android/BnGraphicBufferSource.h>
#include <android/BnOMXBufferSource.h>
-#include "IOmxNodeWrapper.h"
-
namespace android {
using ::android::binder::Status;
@@ -56,7 +54,8 @@
* before the codec is in the "executing" state, so we need to queue
* things up until we're ready to go.
*/
-class GraphicBufferSource : public BufferQueue::ConsumerListener {
+class GraphicBufferSource : public BnGraphicBufferSource,
+ public BufferQueue::ConsumerListener {
public:
GraphicBufferSource();
@@ -96,30 +95,24 @@
// Called from OnEmptyBufferDone. If we have a BQ buffer available,
// fill it with a new frame of data; otherwise, just mark it as available.
Status onInputBufferEmptied(
- int32_t bufferID, int fenceFd);
+ int32_t bufferID, const OMXFenceParcelable& fenceParcel);
// Configure the buffer source to be used with an OMX node with the default
// data space.
- status_t configure(
- const sp<IOmxNodeWrapper> &omxNode,
- int32_t dataSpace,
- int32_t bufferCount,
- uint32_t frameWidth,
- uint32_t frameHeight,
- uint32_t consumerUsage);
+ Status configure(const sp<IOMXNode>& omxNode, int32_t dataSpace) override;
// This is called after the last input frame has been submitted or buffer
// timestamp is greater or equal than stopTimeUs. We need to submit an empty
// buffer with the EOS flag set. If we don't have a codec buffer ready,
// we just set the mEndOfStream flag.
- status_t signalEndOfInputStream();
+ Status signalEndOfInputStream() override;
// If suspend is true, all incoming buffers (including those currently
// in the BufferQueue) with timestamp larger than timeUs will be discarded
// until the suspension is lifted. If suspend is false, all incoming buffers
// including those currently in the BufferQueue) with timestamp larger than
// timeUs will be processed. timeUs uses SYSTEM_TIME_MONOTONIC time base.
- status_t setSuspend(bool suspend, int64_t timeUs);
+ Status setSuspend(bool suspend, int64_t timeUs) override;
// Specifies the interval after which we requeue the buffer previously
// queued to the encoder. This is useful in the case of surface flinger
@@ -128,30 +121,30 @@
// the decoder on the remote end would be unable to decode the latest frame.
// This API must be called before transitioning the encoder to "executing"
// state and once this behaviour is specified it cannot be reset.
- status_t setRepeatPreviousFrameDelayUs(int64_t repeatAfterUs);
+ Status setRepeatPreviousFrameDelayUs(int64_t repeatAfterUs) override;
// Sets the input buffer timestamp offset.
// When set, the sample's timestamp will be adjusted with the timeOffsetUs.
- status_t setTimeOffsetUs(int64_t timeOffsetUs);
+ Status setTimeOffsetUs(int64_t timeOffsetUs) override;
// When set, the max frame rate fed to the encoder will be capped at maxFps.
- status_t setMaxFps(float maxFps);
+ Status setMaxFps(float maxFps) override;
// Sets the time lapse (or slow motion) parameters.
// When set, the sample's timestamp will be modified to playback framerate,
// and capture timestamp will be modified to capture rate.
- status_t setTimeLapseConfig(int64_t timePerFrameUs, int64_t timePerCaptureUs);
+ Status setTimeLapseConfig(int64_t timePerFrameUs, int64_t timePerCaptureUs) override;
// Sets the start time us (in system time), samples before which should
// be dropped and not submitted to encoder
- status_t setStartTimeUs(int64_t startTimeUs);
+ Status setStartTimeUs(int64_t startTimeUs) override;
// Sets the stop time us (in system time), samples after which should be dropped
// and not submitted to encoder. timeUs uses SYSTEM_TIME_MONOTONIC time base.
- status_t setStopTimeUs(int64_t stopTimeUs);
+ Status setStopTimeUs(int64_t stopTimeUs) override;
// Sets the desired color aspects, e.g. to be used when producer does not specify a dataspace.
- status_t setColorAspects(int32_t aspectsPacked);
+ Status setColorAspects(int32_t aspectsPacked) override;
protected:
// BufferQueue::ConsumerListener interface, called when a new frame of
@@ -236,8 +229,8 @@
// Used to report constructor failure.
status_t mInitCheck;
- // Pointer back to the Omx node that created us. We send buffers here.
- sp<IOmxNodeWrapper> mOMXNode;
+ // Pointer back to the IOMXNode that created us. We send buffers here.
+ sp<IOMXNode> mOMXNode;
// Set by omxExecuting() / omxIdling().
bool mExecuting;
@@ -335,7 +328,10 @@
int64_t mInputBufferTimeOffsetUs;
- int32_t mColorAspectsPacked;
+ ColorAspects mColorAspects;
+
+ class OmxBufferSource;
+ sp<OmxBufferSource> mOmxBufferSource;
void onMessageReceived(const sp<AMessage> &msg);
diff --git a/media/libstagefright/omx/IOmxNodeWrapper.h b/media/libstagefright/omx/IOmxNodeWrapper.h
deleted file mode 100644
index cd44e67..0000000
--- a/media/libstagefright/omx/IOmxNodeWrapper.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2017, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef IOMX_NODE_WRAPPER_SOURCE_H_
-#define IOMX_NODE_WRAPPER_SOURCE_H_
-
-#include <utils/RefBase.h>
-#include <utils/StrongPointer.h>
-#include <ui/GraphicBuffer.h>
-
-#include <stdint.h>
-
-namespace android {
-
-struct IOmxNodeWrapper : public RefBase {
- virtual status_t emptyBuffer(
- int32_t bufferId, uint32_t flags,
- const sp<GraphicBuffer> &buffer = nullptr,
- int64_t timestamp = 0, int fenceFd = -1) = 0;
- virtual void dispatchDataSpaceChanged(
- int32_t dataSpace, int32_t aspects, int32_t pixelFormat) = 0;
-};
-
-} // namespace android
-
-#endif // ANDROID_HARDWARE_MEDIA_OMX_V1_0_WGRAPHICBUFFERSOURCE_H
diff --git a/media/libstagefright/omx/OMX.cpp b/media/libstagefright/omx/OMX.cpp
index bf1418f..80c125c 100644
--- a/media/libstagefright/omx/OMX.cpp
+++ b/media/libstagefright/omx/OMX.cpp
@@ -27,7 +27,7 @@
#include "../include/OMXNodeInstance.h"
#include <media/stagefright/foundation/ADebug.h>
-#include "BWGraphicBufferSource.h"
+#include "GraphicBufferSource.h"
#include "OMXMaster.h"
#include "OMXUtils.h"
@@ -174,7 +174,7 @@
}
*bufferProducer = graphicBufferSource->getIGraphicBufferProducer();
- *bufferSource = new BWGraphicBufferSource(graphicBufferSource);
+ *bufferSource = graphicBufferSource;
return OK;
}
diff --git a/media/libstagefright/omx/hal/1.0/impl/Android.mk b/media/libstagefright/omx/hal/1.0/impl/Android.mk
index 79cb1fa..09424b5 100644
--- a/media/libstagefright/omx/hal/1.0/impl/Android.mk
+++ b/media/libstagefright/omx/hal/1.0/impl/Android.mk
@@ -4,6 +4,7 @@
LOCAL_MODULE := android.hardware.media.omx@1.0-impl
LOCAL_SRC_FILES := \
WGraphicBufferSource.cpp \
+ WOmx.cpp \
WOmxBufferProducer.cpp \
WOmxBufferSource.cpp \
WOmxNode.cpp \
diff --git a/media/libstagefright/omx/hal/1.0/impl/Conversion.h b/media/libstagefright/omx/hal/1.0/impl/Conversion.h
index a6fed2e..117d1c8 100644
--- a/media/libstagefright/omx/hal/1.0/impl/Conversion.h
+++ b/media/libstagefright/omx/hal/1.0/impl/Conversion.h
@@ -611,37 +611,6 @@
}
/**
- * \brief Wrap `GraphicBuffer` in `CodecBuffer`.
- *
- * \param[out] t The wrapper of type `CodecBuffer`.
- * \param[in] l The source `GraphicBuffer`.
- */
-// wrap: OMXBuffer -> CodecBuffer
-inline CodecBuffer *wrapAs(CodecBuffer *t, sp<GraphicBuffer> const& graphicBuffer) {
- t->sharedMemory = hidl_memory();
- t->nativeHandle = hidl_handle();
- t->type = CodecBuffer::Type::ANW_BUFFER;
- if (graphicBuffer == nullptr) {
- t->attr.anwBuffer.width = 0;
- t->attr.anwBuffer.height = 0;
- t->attr.anwBuffer.stride = 0;
- t->attr.anwBuffer.format = static_cast<PixelFormat>(1);
- t->attr.anwBuffer.layerCount = 0;
- t->attr.anwBuffer.usage = 0;
- return t;
- }
- t->attr.anwBuffer.width = graphicBuffer->getWidth();
- t->attr.anwBuffer.height = graphicBuffer->getHeight();
- t->attr.anwBuffer.stride = graphicBuffer->getStride();
- t->attr.anwBuffer.format = static_cast<PixelFormat>(
- graphicBuffer->getPixelFormat());
- t->attr.anwBuffer.layerCount = graphicBuffer->getLayerCount();
- t->attr.anwBuffer.usage = graphicBuffer->getUsage();
- t->nativeHandle = graphicBuffer->handle;
- return t;
-}
-
-/**
* \brief Wrap `OMXBuffer` in `CodecBuffer`.
*
* \param[out] t The wrapper of type `CodecBuffer`.
@@ -673,7 +642,24 @@
return false;
}
case OMXBuffer::kBufferTypeANWBuffer: {
- wrapAs(t, l.mGraphicBuffer);
+ t->type = CodecBuffer::Type::ANW_BUFFER;
+ if (l.mGraphicBuffer == nullptr) {
+ t->attr.anwBuffer.width = 0;
+ t->attr.anwBuffer.height = 0;
+ t->attr.anwBuffer.stride = 0;
+ t->attr.anwBuffer.format = static_cast<PixelFormat>(1);
+ t->attr.anwBuffer.layerCount = 0;
+ t->attr.anwBuffer.usage = 0;
+ return true;
+ }
+ t->attr.anwBuffer.width = l.mGraphicBuffer->getWidth();
+ t->attr.anwBuffer.height = l.mGraphicBuffer->getHeight();
+ t->attr.anwBuffer.stride = l.mGraphicBuffer->getStride();
+ t->attr.anwBuffer.format = static_cast<PixelFormat>(
+ l.mGraphicBuffer->getPixelFormat());
+ t->attr.anwBuffer.layerCount = l.mGraphicBuffer->getLayerCount();
+ t->attr.anwBuffer.usage = l.mGraphicBuffer->getUsage();
+ t->nativeHandle = l.mGraphicBuffer->handle;
return true;
}
case OMXBuffer::kBufferTypeNativeHandle: {
diff --git a/media/libstagefright/omx/hal/1.0/impl/Omx.cpp b/media/libstagefright/omx/hal/1.0/impl/Omx.cpp
index 0ef7c8c..a9f29e9 100644
--- a/media/libstagefright/omx/hal/1.0/impl/Omx.cpp
+++ b/media/libstagefright/omx/hal/1.0/impl/Omx.cpp
@@ -123,6 +123,7 @@
Return<void> Omx::createInputSurface(createInputSurface_cb _hidl_cb) {
sp<::android::IGraphicBufferProducer> bufferProducer;
+ sp<::android::IGraphicBufferSource> bufferSource;
sp<GraphicBufferSource> graphicBufferSource = new GraphicBufferSource();
status_t err = graphicBufferSource->initCheck();
@@ -134,10 +135,11 @@
return Void();
}
bufferProducer = graphicBufferSource->getIGraphicBufferProducer();
+ bufferSource = graphicBufferSource;
_hidl_cb(toStatus(OK),
new TWOmxBufferProducer(bufferProducer),
- new TWGraphicBufferSource(graphicBufferSource));
+ new TWGraphicBufferSource(bufferSource));
return Void();
}
diff --git a/media/libstagefright/omx/hal/1.0/impl/WGraphicBufferSource.cpp b/media/libstagefright/omx/hal/1.0/impl/WGraphicBufferSource.cpp
index 13e1f2f..884e87b 100644
--- a/media/libstagefright/omx/hal/1.0/impl/WGraphicBufferSource.cpp
+++ b/media/libstagefright/omx/hal/1.0/impl/WGraphicBufferSource.cpp
@@ -14,15 +14,8 @@
* limitations under the License.
*/
-//#define LOG_NDEBUG 0
-#define LOG_TAG "TWGraphicBufferSource"
+#include <stagefright/foundation/ColorUtils.h>
-#include <android/hardware/media/omx/1.0/IOmxBufferSource.h>
-#include <android/hardware/media/omx/1.0/IOmxNode.h>
-#include <OMX_Component.h>
-#include <OMX_IndexExt.h>
-
-#include "omx/OMXUtils.h"
#include "WGraphicBufferSource.h"
#include "WOmxNode.h"
#include "Conversion.h"
@@ -34,183 +27,122 @@
namespace V1_0 {
namespace implementation {
-static const OMX_U32 kPortIndexInput = 0;
+using android::ColorUtils;
-struct TWGraphicBufferSource::TWOmxNodeWrapper : public IOmxNodeWrapper {
- sp<IOmxNode> mOmxNode;
+// LWGraphicBufferSource
+LWGraphicBufferSource::LWGraphicBufferSource(
+ sp<TGraphicBufferSource> const& base) : mBase(base) {
+}
- TWOmxNodeWrapper(const sp<IOmxNode> &omxNode): mOmxNode(omxNode) {
- }
+::android::binder::Status LWGraphicBufferSource::configure(
+ const sp<IOMXNode>& omxNode, int32_t dataSpace) {
+ return toBinderStatus(mBase->configure(
+ new TWOmxNode(omxNode), toHardwareDataspace(dataSpace)));
+}
- virtual status_t emptyBuffer(
- int32_t bufferId, uint32_t flags,
- const sp<GraphicBuffer> &buffer,
- int64_t timestamp, int fenceFd) override {
- CodecBuffer tBuffer;
- return toStatusT(mOmxNode->emptyBuffer(
- bufferId,
- *wrapAs(&tBuffer, buffer),
- flags,
- toRawTicks(timestamp),
- native_handle_create_from_fd(fenceFd)));
- }
+::android::binder::Status LWGraphicBufferSource::setSuspend(
+ bool suspend, int64_t timeUs) {
+ return toBinderStatus(mBase->setSuspend(suspend, timeUs));
+}
- virtual void dispatchDataSpaceChanged(
- int32_t dataSpace, int32_t aspects, int32_t pixelFormat) override {
- Message tMsg;
- tMsg.type = Message::Type::EVENT;
- tMsg.fence = native_handle_create(0, 0);
- tMsg.data.eventData.event = uint32_t(OMX_EventDataSpaceChanged);
- tMsg.data.eventData.data1 = dataSpace;
- tMsg.data.eventData.data2 = aspects;
- tMsg.data.eventData.data3 = pixelFormat;
- mOmxNode->dispatchMessage(tMsg);
- }
-};
+::android::binder::Status LWGraphicBufferSource::setRepeatPreviousFrameDelayUs(
+ int64_t repeatAfterUs) {
+ return toBinderStatus(mBase->setRepeatPreviousFrameDelayUs(repeatAfterUs));
+}
-struct TWGraphicBufferSource::TWOmxBufferSource : public IOmxBufferSource {
- sp<GraphicBufferSource> mSource;
+::android::binder::Status LWGraphicBufferSource::setMaxFps(float maxFps) {
+ return toBinderStatus(mBase->setMaxFps(maxFps));
+}
- TWOmxBufferSource(const sp<GraphicBufferSource> &source): mSource(source) {
- }
+::android::binder::Status LWGraphicBufferSource::setTimeLapseConfig(
+ int64_t timePerFrameUs, int64_t timePerCaptureUs) {
+ return toBinderStatus(mBase->setTimeLapseConfig(
+ timePerFrameUs, timePerCaptureUs));
+}
- Return<void> onOmxExecuting() override {
- mSource->onOmxExecuting();
- return Void();
- }
+::android::binder::Status LWGraphicBufferSource::setStartTimeUs(
+ int64_t startTimeUs) {
+ return toBinderStatus(mBase->setStartTimeUs(startTimeUs));
+}
- Return<void> onOmxIdle() override {
- mSource->onOmxIdle();
- return Void();
- }
+::android::binder::Status LWGraphicBufferSource::setStopTimeUs(
+ int64_t stopTimeUs) {
+ return toBinderStatus(mBase->setStopTimeUs(stopTimeUs));
+}
- Return<void> onOmxLoaded() override {
- mSource->onOmxLoaded();
- return Void();
- }
+::android::binder::Status LWGraphicBufferSource::setColorAspects(
+ int32_t aspects) {
+ return toBinderStatus(mBase->setColorAspects(
+ toHardwareColorAspects(aspects)));
+}
- Return<void> onInputBufferAdded(uint32_t bufferId) override {
- mSource->onInputBufferAdded(static_cast<int32_t>(bufferId));
- return Void();
- }
+::android::binder::Status LWGraphicBufferSource::setTimeOffsetUs(
+ int64_t timeOffsetsUs) {
+ return toBinderStatus(mBase->setTimeOffsetUs(timeOffsetsUs));
+}
- Return<void> onInputBufferEmptied(
- uint32_t bufferId, hidl_handle const& tFence) override {
- mSource->onInputBufferEmptied(
- static_cast<int32_t>(bufferId),
- native_handle_read_fd(tFence));
- return Void();
- }
-};
+::android::binder::Status LWGraphicBufferSource::signalEndOfInputStream() {
+ return toBinderStatus(mBase->signalEndOfInputStream());
+}
// TWGraphicBufferSource
TWGraphicBufferSource::TWGraphicBufferSource(
- sp<GraphicBufferSource> const& base) :
- mBase(base),
- mOmxBufferSource(new TWOmxBufferSource(base)) {
+ sp<LGraphicBufferSource> const& base) : mBase(base) {
}
-Return<Status> TWGraphicBufferSource::configure(
+Return<void> TWGraphicBufferSource::configure(
const sp<IOmxNode>& omxNode, Dataspace dataspace) {
- if (omxNode == NULL) {
- return toStatus(BAD_VALUE);
- }
-
- // Do setInputSurface() first, the node will try to enable metadata
- // mode on input, and does necessary error checking. If this fails,
- // we can't use this input surface on the node.
- Return<Status> err(omxNode->setInputSurface(mOmxBufferSource));
- status_t fnStatus = toStatusT(err);
- if (fnStatus != NO_ERROR) {
- ALOGE("Unable to set input surface: %d", fnStatus);
- return err;
- }
-
- // use consumer usage bits queried from encoder, but always add
- // HW_VIDEO_ENCODER for backward compatibility.
- uint32_t consumerUsage;
- void *_params = &consumerUsage;
- uint8_t *params = static_cast<uint8_t*>(_params);
- fnStatus = UNKNOWN_ERROR;
- IOmxNode::getParameter_cb _hidl_cb(
- [&fnStatus, ¶ms](Status status, hidl_vec<uint8_t> const& outParams) {
- fnStatus = toStatusT(status);
- std::copy(
- outParams.data(),
- outParams.data() + outParams.size(),
- params);
- });
- omxNode->getParameter(
- static_cast<uint32_t>(OMX_IndexParamConsumerUsageBits),
- inHidlBytes(&consumerUsage, sizeof(consumerUsage)),
- _hidl_cb);
- if (fnStatus != OK) {
- consumerUsage = 0;
- }
-
- OMX_PARAM_PORTDEFINITIONTYPE def;
- InitOMXParams(&def);
- def.nPortIndex = kPortIndexInput;
-
- _params = &def;
- params = static_cast<uint8_t*>(_params);
- omxNode->getParameter(
- static_cast<uint32_t>(OMX_IndexParamPortDefinition),
- inHidlBytes(&def, sizeof(def)),
- _hidl_cb);
- if (fnStatus != NO_ERROR) {
- ALOGE("Failed to get port definition: %d", fnStatus);
- return toStatus(fnStatus);
- }
-
-
- return toStatus(mBase->configure(
- new TWOmxNodeWrapper(omxNode),
- toRawDataspace(dataspace),
- def.nBufferCountActual,
- def.format.video.nFrameWidth,
- def.format.video.nFrameHeight,
- consumerUsage));
+ mBase->configure(new LWOmxNode(omxNode), toRawDataspace(dataspace));
+ return Void();
}
-Return<Status> TWGraphicBufferSource::setSuspend(
+Return<void> TWGraphicBufferSource::setSuspend(
bool suspend, int64_t timeUs) {
- return toStatus(mBase->setSuspend(suspend, timeUs));
+ mBase->setSuspend(suspend, timeUs);
+ return Void();
}
-Return<Status> TWGraphicBufferSource::setRepeatPreviousFrameDelayUs(
+Return<void> TWGraphicBufferSource::setRepeatPreviousFrameDelayUs(
int64_t repeatAfterUs) {
- return toStatus(mBase->setRepeatPreviousFrameDelayUs(repeatAfterUs));
+ mBase->setRepeatPreviousFrameDelayUs(repeatAfterUs);
+ return Void();
}
-Return<Status> TWGraphicBufferSource::setMaxFps(float maxFps) {
- return toStatus(mBase->setMaxFps(maxFps));
+Return<void> TWGraphicBufferSource::setMaxFps(float maxFps) {
+ mBase->setMaxFps(maxFps);
+ return Void();
}
-Return<Status> TWGraphicBufferSource::setTimeLapseConfig(
+Return<void> TWGraphicBufferSource::setTimeLapseConfig(
int64_t timePerFrameUs, int64_t timePerCaptureUs) {
- return toStatus(mBase->setTimeLapseConfig(timePerFrameUs, timePerCaptureUs));
+ mBase->setTimeLapseConfig(timePerFrameUs, timePerCaptureUs);
+ return Void();
}
-Return<Status> TWGraphicBufferSource::setStartTimeUs(int64_t startTimeUs) {
- return toStatus(mBase->setStartTimeUs(startTimeUs));
+Return<void> TWGraphicBufferSource::setStartTimeUs(int64_t startTimeUs) {
+ mBase->setStartTimeUs(startTimeUs);
+ return Void();
}
-Return<Status> TWGraphicBufferSource::setStopTimeUs(int64_t stopTimeUs) {
- return toStatus(mBase->setStopTimeUs(stopTimeUs));
+Return<void> TWGraphicBufferSource::setStopTimeUs(int64_t stopTimeUs) {
+ mBase->setStopTimeUs(stopTimeUs);
+ return Void();
}
-Return<Status> TWGraphicBufferSource::setColorAspects(
+Return<void> TWGraphicBufferSource::setColorAspects(
const ColorAspects& aspects) {
- return toStatus(mBase->setColorAspects(toCompactColorAspects(aspects)));
+ mBase->setColorAspects(toCompactColorAspects(aspects));
+ return Void();
}
-Return<Status> TWGraphicBufferSource::setTimeOffsetUs(int64_t timeOffsetUs) {
- return toStatus(mBase->setTimeOffsetUs(timeOffsetUs));
+Return<void> TWGraphicBufferSource::setTimeOffsetUs(int64_t timeOffsetUs) {
+ mBase->setTimeOffsetUs(timeOffsetUs);
+ return Void();
}
-Return<Status> TWGraphicBufferSource::signalEndOfInputStream() {
- return toStatus(mBase->signalEndOfInputStream());
+Return<void> TWGraphicBufferSource::signalEndOfInputStream() {
+ mBase->signalEndOfInputStream();
+ return Void();
}
} // namespace implementation
diff --git a/media/libstagefright/omx/hal/1.0/impl/WGraphicBufferSource.h b/media/libstagefright/omx/hal/1.0/impl/WGraphicBufferSource.h
index 8cf11ca..bd60c46 100644
--- a/media/libstagefright/omx/hal/1.0/impl/WGraphicBufferSource.h
+++ b/media/libstagefright/omx/hal/1.0/impl/WGraphicBufferSource.h
@@ -20,16 +20,15 @@
#include <hidl/MQDescriptor.h>
#include <hidl/Status.h>
-#include <android/hardware/media/omx/1.0/IGraphicBufferSource.h>
-#include <android/hardware/media/omx/1.0/IOmxNode.h>
+#include <media/IOMX.h>
+#include <binder/Binder.h>
+
#include <android/hardware/graphics/common/1.0/types.h>
#include <android/hardware/media/omx/1.0/IOmxNode.h>
#include <android/hardware/media/omx/1.0/IGraphicBufferSource.h>
#include <android/BnGraphicBufferSource.h>
-#include "../../../GraphicBufferSource.h"
-
namespace android {
namespace hardware {
namespace media {
@@ -37,12 +36,10 @@
namespace V1_0 {
namespace implementation {
-using ::android::GraphicBufferSource;
using ::android::hardware::graphics::common::V1_0::Dataspace;
using ::android::hardware::media::omx::V1_0::ColorAspects;
using ::android::hardware::media::omx::V1_0::IGraphicBufferSource;
using ::android::hardware::media::omx::V1_0::IOmxNode;
-using ::android::hardware::media::omx::V1_0::Status;
using ::android::hidl::base::V1_0::IBase;
using ::android::hardware::hidl_array;
using ::android::hardware::hidl_memory;
@@ -63,28 +60,44 @@
* - TW = Treble Wrapper --- It wraps a legacy object inside a Treble object.
*/
+typedef ::android::IGraphicBufferSource LGraphicBufferSource;
+typedef ::android::BnGraphicBufferSource BnGraphicBufferSource;
typedef ::android::hardware::media::omx::V1_0::IGraphicBufferSource
TGraphicBufferSource;
-struct TWGraphicBufferSource : public TGraphicBufferSource {
- struct TWOmxNodeWrapper;
- struct TWOmxBufferSource;
- sp<GraphicBufferSource> mBase;
- sp<IOmxBufferSource> mOmxBufferSource;
-
- TWGraphicBufferSource(sp<GraphicBufferSource> const& base);
- Return<Status> configure(
- const sp<IOmxNode>& omxNode, Dataspace dataspace) override;
- Return<Status> setSuspend(bool suspend, int64_t timeUs) override;
- Return<Status> setRepeatPreviousFrameDelayUs(int64_t repeatAfterUs) override;
- Return<Status> setMaxFps(float maxFps) override;
- Return<Status> setTimeLapseConfig(
+struct LWGraphicBufferSource : public BnGraphicBufferSource {
+ sp<TGraphicBufferSource> mBase;
+ LWGraphicBufferSource(sp<TGraphicBufferSource> const& base);
+ ::android::binder::Status configure(
+ const sp<IOMXNode>& omxNode, int32_t dataSpace) override;
+ ::android::binder::Status setSuspend(bool suspend, int64_t timeUs) override;
+ ::android::binder::Status setRepeatPreviousFrameDelayUs(
+ int64_t repeatAfterUs) override;
+ ::android::binder::Status setMaxFps(float maxFps) override;
+ ::android::binder::Status setTimeLapseConfig(
int64_t timePerFrameUs, int64_t timePerCaptureUs) override;
- Return<Status> setStartTimeUs(int64_t startTimeUs) override;
- Return<Status> setStopTimeUs(int64_t stopTimeUs) override;
- Return<Status> setColorAspects(const ColorAspects& aspects) override;
- Return<Status> setTimeOffsetUs(int64_t timeOffsetUs) override;
- Return<Status> signalEndOfInputStream() override;
+ ::android::binder::Status setStartTimeUs(int64_t startTimeUs) override;
+ ::android::binder::Status setStopTimeUs(int64_t stopTimeUs) override;
+ ::android::binder::Status setColorAspects(int32_t aspects) override;
+ ::android::binder::Status setTimeOffsetUs(int64_t timeOffsetsUs) override;
+ ::android::binder::Status signalEndOfInputStream() override;
+};
+
+struct TWGraphicBufferSource : public TGraphicBufferSource {
+ sp<LGraphicBufferSource> mBase;
+ TWGraphicBufferSource(sp<LGraphicBufferSource> const& base);
+ Return<void> configure(
+ const sp<IOmxNode>& omxNode, Dataspace dataspace) override;
+ Return<void> setSuspend(bool suspend, int64_t timeUs) override;
+ Return<void> setRepeatPreviousFrameDelayUs(int64_t repeatAfterUs) override;
+ Return<void> setMaxFps(float maxFps) override;
+ Return<void> setTimeLapseConfig(
+ int64_t timePerFrameUs, int64_t timePerCaptureUs) override;
+ Return<void> setStartTimeUs(int64_t startTimeUs) override;
+ Return<void> setStopTimeUs(int64_t stopTimeUs) override;
+ Return<void> setColorAspects(const ColorAspects& aspects) override;
+ Return<void> setTimeOffsetUs(int64_t timeOffsetUs) override;
+ Return<void> signalEndOfInputStream() override;
};
} // namespace implementation
diff --git a/media/libstagefright/omx/hal/1.0/impl/WOmx.cpp b/media/libstagefright/omx/hal/1.0/impl/WOmx.cpp
new file mode 100644
index 0000000..da1c23d
--- /dev/null
+++ b/media/libstagefright/omx/hal/1.0/impl/WOmx.cpp
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2016, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "WOmx.h"
+#include "WOmxNode.h"
+#include "WOmxObserver.h"
+#include "WOmxBufferProducer.h"
+#include "WGraphicBufferSource.h"
+#include "Conversion.h"
+
+namespace android {
+namespace hardware {
+namespace media {
+namespace omx {
+namespace V1_0 {
+namespace implementation {
+
+// LWOmx
+LWOmx::LWOmx(sp<IOmx> const& base) : mBase(base) {
+}
+
+status_t LWOmx::listNodes(List<IOMX::ComponentInfo>* list) {
+ status_t fnStatus;
+ status_t transStatus = toStatusT(mBase->listNodes(
+ [&fnStatus, list](
+ Status status,
+ hidl_vec<IOmx::ComponentInfo> const& nodeList) {
+ fnStatus = toStatusT(status);
+ list->clear();
+ for (size_t i = 0; i < nodeList.size(); ++i) {
+ auto newInfo = list->insert(
+ list->end(), IOMX::ComponentInfo());
+ convertTo(&*newInfo, nodeList[i]);
+ }
+ }));
+ return transStatus == NO_ERROR ? fnStatus : transStatus;
+}
+
+status_t LWOmx::allocateNode(
+ char const* name,
+ sp<IOMXObserver> const& observer,
+ sp<IOMXNode>* omxNode) {
+ status_t fnStatus;
+ status_t transStatus = toStatusT(mBase->allocateNode(
+ name, new TWOmxObserver(observer),
+ [&fnStatus, omxNode](Status status, sp<IOmxNode> const& node) {
+ fnStatus = toStatusT(status);
+ *omxNode = new LWOmxNode(node);
+ }));
+ return transStatus == NO_ERROR ? fnStatus : transStatus;
+}
+
+status_t LWOmx::createInputSurface(
+ sp<::android::IGraphicBufferProducer>* bufferProducer,
+ sp<::android::IGraphicBufferSource>* bufferSource) {
+ status_t fnStatus;
+ status_t transStatus = toStatusT(mBase->createInputSurface(
+ [&fnStatus, bufferProducer, bufferSource] (
+ Status status,
+ sp<IOmxBufferProducer> const& tProducer,
+ sp<IGraphicBufferSource> const& tSource) {
+ fnStatus = toStatusT(status);
+ *bufferProducer = new LWOmxBufferProducer(tProducer);
+ *bufferSource = new LWGraphicBufferSource(tSource);
+ }));
+ return transStatus == NO_ERROR ? fnStatus : transStatus;
+}
+
+// TWOmx
+TWOmx::TWOmx(sp<IOMX> const& base) : mBase(base) {
+}
+
+Return<void> TWOmx::listNodes(listNodes_cb _hidl_cb) {
+ List<IOMX::ComponentInfo> lList;
+ Status status = toStatus(mBase->listNodes(&lList));
+
+ hidl_vec<IOmx::ComponentInfo> tList;
+ tList.resize(lList.size());
+ size_t i = 0;
+ for (auto const& lInfo : lList) {
+ convertTo(&(tList[i++]), lInfo);
+ }
+ _hidl_cb(status, tList);
+ return Void();
+}
+
+Return<void> TWOmx::allocateNode(
+ const hidl_string& name,
+ const sp<IOmxObserver>& observer,
+ allocateNode_cb _hidl_cb) {
+ sp<IOMXNode> omxNode;
+ Status status = toStatus(mBase->allocateNode(
+ name, new LWOmxObserver(observer), &omxNode));
+ _hidl_cb(status, new TWOmxNode(omxNode));
+ return Void();
+}
+
+Return<void> TWOmx::createInputSurface(createInputSurface_cb _hidl_cb) {
+ sp<::android::IGraphicBufferProducer> lProducer;
+ sp<::android::IGraphicBufferSource> lSource;
+ status_t status = mBase->createInputSurface(&lProducer, &lSource);
+ _hidl_cb(toStatus(status),
+ new TWOmxBufferProducer(lProducer),
+ new TWGraphicBufferSource(lSource));
+ return Void();
+}
+
+} // namespace implementation
+} // namespace V1_0
+} // namespace omx
+} // namespace media
+} // namespace hardware
+} // namespace android
diff --git a/media/libstagefright/omx/hal/1.0/impl/WOmx.h b/media/libstagefright/omx/hal/1.0/impl/WOmx.h
new file mode 100644
index 0000000..3cb002e
--- /dev/null
+++ b/media/libstagefright/omx/hal/1.0/impl/WOmx.h
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2016, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ANDROID_HARDWARE_MEDIA_OMX_V1_0_WOMX_H
+#define ANDROID_HARDWARE_MEDIA_OMX_V1_0_WOMX_H
+
+#include <hidl/MQDescriptor.h>
+#include <hidl/Status.h>
+
+#include "../../../../include/OMXNodeInstance.h"
+
+#include <android/hardware/media/omx/1.0/IOmx.h>
+
+namespace android {
+namespace hardware {
+namespace media {
+namespace omx {
+namespace V1_0 {
+namespace implementation {
+
+using ::android::hardware::media::omx::V1_0::IOmx;
+using ::android::hardware::media::omx::V1_0::IOmxNode;
+using ::android::hardware::media::omx::V1_0::IOmxObserver;
+using ::android::hardware::media::omx::V1_0::Status;
+using ::android::hidl::base::V1_0::IBase;
+using ::android::hardware::hidl_array;
+using ::android::hardware::hidl_memory;
+using ::android::hardware::hidl_string;
+using ::android::hardware::hidl_vec;
+using ::android::hardware::Return;
+using ::android::hardware::Void;
+using ::android::sp;
+
+using ::android::List;
+using ::android::IOMX;
+using ::android::BnOMX;
+
+/**
+ * Wrapper classes for conversion
+ * ==============================
+ *
+ * Naming convention:
+ * - LW = Legacy Wrapper --- It wraps a Treble object inside a legacy object.
+ * - TW = Treble Wrapper --- It wraps a legacy object inside a Treble object.
+ */
+
+struct LWOmx : public BnOMX {
+ sp<IOmx> mBase;
+ LWOmx(sp<IOmx> const& base);
+ status_t listNodes(List<IOMX::ComponentInfo>* list) override;
+ status_t allocateNode(
+ char const* name,
+ sp<IOMXObserver> const& observer,
+ sp<IOMXNode>* omxNode) override;
+ status_t createInputSurface(
+ sp<::android::IGraphicBufferProducer>* bufferProducer,
+ sp<::android::IGraphicBufferSource>* bufferSource) override;
+};
+
+struct TWOmx : public IOmx {
+ sp<IOMX> mBase;
+ TWOmx(sp<IOMX> const& base);
+ Return<void> listNodes(listNodes_cb _hidl_cb) override;
+ Return<void> allocateNode(
+ const hidl_string& name,
+ const sp<IOmxObserver>& observer,
+ allocateNode_cb _hidl_cb) override;
+ Return<void> createInputSurface(createInputSurface_cb _hidl_cb) override;
+
+};
+
+} // namespace implementation
+} // namespace V1_0
+} // namespace omx
+} // namespace media
+} // namespace hardware
+} // namespace android
+
+#endif // ANDROID_HARDWARE_MEDIA_OMX_V1_0_WOMX_H
