Merge "aidl PersistentSurface: remove unnecessary definitions" into main am: 784abf6846 am: 374885fe9a
Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3015155
Change-Id: I0fdb30685d8f0dc06abb6f6ae8c2b020295dd498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/codec2/sfplugin/C2AidlNode.cpp b/media/codec2/sfplugin/C2AidlNode.cpp
index c20f50d..93c9d8b 100644
--- a/media/codec2/sfplugin/C2AidlNode.cpp
+++ b/media/codec2/sfplugin/C2AidlNode.cpp
@@ -29,9 +29,6 @@
using ::aidl::android::media::IAidlBufferSource;
using ::aidl::android::media::IAidlNode;
-using ::android::media::CommandStateSet;
-using ::android::media::NodeStatusLoaded;
-
// Conversion
using ::android::media::aidl_conversion::toAidlStatus;
@@ -43,13 +40,6 @@
return toAidlStatus(mImpl->freeNode());
}
-::ndk::ScopedAStatus C2AidlNode::sendCommand(int32_t cmd, int32_t param) {
- if (cmd == CommandStateSet && param == NodeStatusLoaded) {
- mImpl->onFirstInputFrame();
- }
- return toAidlStatus(ERROR_UNSUPPORTED);
-}
-
::ndk::ScopedAStatus C2AidlNode::getConsumerUsage(int64_t* _aidl_return) {
uint64_t usage;
mImpl->getConsumerUsageBits(&usage);
diff --git a/media/codec2/sfplugin/C2AidlNode.h b/media/codec2/sfplugin/C2AidlNode.h
index a7c328e..365a41d 100644
--- a/media/codec2/sfplugin/C2AidlNode.h
+++ b/media/codec2/sfplugin/C2AidlNode.h
@@ -34,8 +34,6 @@
// IAidlNode
::ndk::ScopedAStatus freeNode() override;
- ::ndk::ScopedAStatus sendCommand(int32_t cmd, int32_t param) override;
-
::ndk::ScopedAStatus getConsumerUsage(int64_t *_aidl_return) override;
::ndk::ScopedAStatus getInputBufferParams(
diff --git a/media/module/aidlpersistentsurface/aidl/android/media/IAidlBufferSource.aidl b/media/module/aidlpersistentsurface/aidl/android/media/IAidlBufferSource.aidl
index 0679e41..d428e99 100644
--- a/media/module/aidlpersistentsurface/aidl/android/media/IAidlBufferSource.aidl
+++ b/media/module/aidlpersistentsurface/aidl/android/media/IAidlBufferSource.aidl
@@ -52,7 +52,7 @@
void onInputBufferAdded(int bufferID);
/**
- * Called from OnEmptyBufferDone. If we have a BQ buffer available,
+ * If we have a BQ buffer available,
* fill it with a new frame of data; otherwise, just mark it as available.
*
* fence contains the fence's fd that the callee should wait on before
diff --git a/media/module/aidlpersistentsurface/aidl/android/media/IAidlNode.aidl b/media/module/aidlpersistentsurface/aidl/android/media/IAidlNode.aidl
index 6cac19e..cf880c2 100644
--- a/media/module/aidlpersistentsurface/aidl/android/media/IAidlNode.aidl
+++ b/media/module/aidlpersistentsurface/aidl/android/media/IAidlNode.aidl
@@ -37,7 +37,6 @@
}
void freeNode();
- void sendCommand(int cmd, int param);
long getConsumerUsage();
InputBufferParams getInputBufferParams();
void setConsumerUsage(long usage);
diff --git a/media/module/aidlpersistentsurface/include/media/stagefright/aidlpersistentsurface/AidlGraphicBufferSource.h b/media/module/aidlpersistentsurface/include/media/stagefright/aidlpersistentsurface/AidlGraphicBufferSource.h
index 4b38294..85de688 100644
--- a/media/module/aidlpersistentsurface/include/media/stagefright/aidlpersistentsurface/AidlGraphicBufferSource.h
+++ b/media/module/aidlpersistentsurface/include/media/stagefright/aidlpersistentsurface/AidlGraphicBufferSource.h
@@ -28,7 +28,7 @@
namespace android::media {
/*
- * This class is used to emulate feed OMX codecs from a Surface via BufferQueue or
+ * This class is used to feed codec encoders from a Surface via BufferQueue or
* HW producer using AIDL binder interfaces.
*
* See media/stagefright/bqhelper/GraphicBufferSource.h for documentation.
diff --git a/media/module/aidlpersistentsurface/include/media/stagefright/aidlpersistentsurface/C2NodeDef.h b/media/module/aidlpersistentsurface/include/media/stagefright/aidlpersistentsurface/C2NodeDef.h
index 64de7ae..364efe2 100644
--- a/media/module/aidlpersistentsurface/include/media/stagefright/aidlpersistentsurface/C2NodeDef.h
+++ b/media/module/aidlpersistentsurface/include/media/stagefright/aidlpersistentsurface/C2NodeDef.h
@@ -29,12 +29,4 @@
BUFFERFLAG_ENDOFFRAME = (1 << 4)
};
-enum C2NodeCommand : int32_t {
- CommandStateSet = 1
-};
-
-enum C2NodeStatus : int32_t {
- NodeStatusLoaded = 1
-};
-
} // namespace android::media