Merge "VirtualDisplaySurface: initialize producer in onFirstRef()." into main (7c87a532) · Commits · e / os / android_frameworks_native

services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp

+6 −2

Original line number	Diff line number	Diff line
		@@ -99,8 +99,6 @@ VirtualDisplaySurface::VirtualDisplaySurface(HWComposer& hwc,
		mOutputFormat = mDefaultOutputFormat;

		sink->setAsyncMode(true);
		IGraphicBufferProducer::QueueBufferOutput output;
		mSource[SOURCE_SCRATCH]->connect(nullptr, NATIVE_WINDOW_API_EGL, false, &output);

		for (size_t i = 0; i < sizeof(mHwcBufferIds) / sizeof(mHwcBufferIds[0]); ++i) {
		mHwcBufferIds[i] = UINT64_MAX;
		@@ -114,9 +112,15 @@ void VirtualDisplaySurface::initializeConsumer() {
		mConsumer->setDefaultBufferSize(mSinkBufferWidth, mSinkBufferHeight);
		}

		void VirtualDisplaySurface::initializeProducer() {
		IGraphicBufferProducer::QueueBufferOutput output;
		mSource[SOURCE_SCRATCH]->connect(nullptr, NATIVE_WINDOW_API_EGL, false, &output);
		}

		void VirtualDisplaySurface::onFirstRef() {
		ConsumerBase::onFirstRef();
		initializeConsumer();
		initializeProducer();
		}

		VirtualDisplaySurface::~VirtualDisplaySurface() {

+1 −0

Original line number	Diff line number	Diff line
		@@ -105,6 +105,7 @@ private:
		};

		void initializeConsumer();
		void initializeProducer();

		virtual ~VirtualDisplaySurface();