Merge "aidl PersistentSurface: remove unnecessary definitions" into main (784abf68) · Commits · e / os / android_frameworks_av

media/codec2/sfplugin/C2AidlNode.cpp

+0 −10

Original line number	Diff line number	Diff line
		@@ -29,9 +29,6 @@ namespace android {
		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 @@ C2AidlNode::C2AidlNode(const std::shared_ptr<Codec2Client::Component> &comp)
		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);

+0 −2

Original line number	Diff line number	Diff line
		@@ -34,8 +34,6 @@ public:
		// 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(

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ interface IAidlBufferSource {
		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

+0 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ interface IAidlNode {
		}

		void freeNode();
		void sendCommand(int cmd, int param);
		long getConsumerUsage();
		InputBufferParams getInputBufferParams();
		void setConsumerUsage(long usage);

+1 −1

Original line number	Diff line number	Diff line
		@@ -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.