Revert "Refactor GraphicBufferSource wrappers for OMX HAL"
This reverts commit 3d32c95e94f2672d23b58196beafddacba07c5e8.
Bug: 36110748
Change-Id: I6d0cd5924b3e1e00cdcf844c638bb0acf4fae2ac
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