Merge "Reduce the latecy of encoding 1st frame" into rvc-dev (761bd495) · Commits · e / os / android_frameworks_av

media/codec2/sfplugin/C2OMXNode.cpp

+6 −4

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ public:
		android::base::unique_fd &&fd0,
		android::base::unique_fd &&fd1) {
		Mutexed<Jobs>::Locked jobs(mJobs);
		auto it = jobs->queues.try_emplace(comp, comp, systemTime()).first;
		auto it = jobs->queues.try_emplace(comp, comp).first;
		it->second.workList.emplace_back(
		std::move(work), fenceFd, std::move(fd0), std::move(fd1));
		jobs->cond.broadcast();
		@@ -79,7 +79,8 @@ protected:
		for (auto it = jobs->queues.begin(); it != jobs->queues.end(); ) {
		Queue &queue = it->second;
		if (queue.workList.empty()
		\|\| nowNs - queue.lastQueuedTimestampNs < kIntervalNs) {
		\|\| (queue.lastQueuedTimestampNs != 0 &&
		nowNs - queue.lastQueuedTimestampNs < kIntervalNs)) {
		++it;
		continue;
		}
		@@ -104,6 +105,7 @@ protected:
		sp<Fence> fence(new Fence(fenceFd));
		fence->waitForever(LOG_TAG);
		}
		queue.lastQueuedTimestampNs = nowNs;
		comp->queue(&items);
		for (android::base::unique_fd &ufd : uniqueFds) {
		(void)ufd.release();
		@@ -143,8 +145,8 @@ private:
		android::base::unique_fd fd1;
		};
		struct Queue {
		Queue(const std::shared_ptr<Codec2Client::Component> &comp, nsecs_t timestamp)
		: component(comp), lastQueuedTimestampNs(timestamp) {}
		Queue(const std::shared_ptr<Codec2Client::Component> &comp)
		: component(comp), lastQueuedTimestampNs(0) {}
		Queue(const Queue &) = delete;
		Queue &operator =(const Queue &) = delete;