Merge "IGBP: Address inconsistent flatten/unflatten for QueueBufferInput" into sc-dev (06e31f95) · Commits · e / os / android_frameworks_native-old

libs/gui/bufferqueue/1.0/Conversion.cpp

+10 −8

Original line number	Diff line number	Diff line
		@@ -1194,7 +1194,8 @@ constexpr size_t minFlattenedSize(
		sizeof(int) + // scalingMode
		sizeof(uint32_t) + // transform
		sizeof(uint32_t) + // stickyTransform
		sizeof(bool); // getFrameTimestamps
		sizeof(bool) + // getFrameTimestamps
		sizeof(int); // slot
		}

		/**
		@@ -1267,6 +1268,7 @@ status_t flatten(HGraphicBufferProducer::QueueBufferInput const& t,
		return status;
		}
		FlattenableUtils::write(buffer, size, decltype(HdrMetadata::validTypes)(0));
		FlattenableUtils::write(buffer, size, -1 /slot/);
		return NO_ERROR;
		}

		@@ -1319,7 +1321,7 @@ status_t unflatten(
		if (status != NO_ERROR) {
		return status;
		}
		// HdrMetadata ignored
		// HdrMetadata and slot ignored
		return unflatten(&(t->surfaceDamage), buffer, size);
		}