Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 272845c8 authored Apr 15, 2022 by Harish Mahendrakar

C2 av1, vp9: Disable P010 temporarily

Enabling P010 causes a SIGABRT in surfaceflinger. Keep this disabled
till P010 is fully supported.

Bug: 229387180
Test: atest CtsMediaDecoderTestCases:\
 android.media.decoder.cts.DecoderTest#testAV1HdrStaticMetadata

Change-Id: Ief436e6b08a1762f4a6e727ee86eb25c225d3cab

parent 5f5b70ef

media/codec2/components/base/SimpleC2Component.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -774,7 +774,8 @@ int SimpleC2Component::getHalPixelFormatForBitDepth10(bool allowRGBA1010102) {
		// Save supported hal pixel formats for bit depth of 10, the first time this is called
		if (!mBitDepth10HalPixelFormats.size()) {
		std::vector<int> halPixelFormats;
		if (isAtLeastT()) {
		// TODO(b/229387180) Enable once P010 is fully supported
		if (false && isAtLeastT()) {
		halPixelFormats.push_back(HAL_PIXEL_FORMAT_YCBCR_P010);
		}
		// since allowRGBA1010102 can chance in each call, but mBitDepth10HalPixelFormats

media/codec2/components/gav1/C2SoftGav1Dec.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -190,7 +190,8 @@ class C2SoftGav1Dec::IntfImpl : public SimpleInterface<void>::BaseParams {
		.build());

		std::vector<uint32_t> pixelFormats = {HAL_PIXEL_FORMAT_YCBCR_420_888};
		if (isAtLeastT()) {
		// TODO(b/229387180) Enable once P010 is fully supported
		if (false && isAtLeastT()) {
		pixelFormats.push_back(HAL_PIXEL_FORMAT_YCBCR_P010);
		}
		// TODO: support more formats?

media/codec2/components/vpx/C2SoftVpxDec.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -219,7 +219,8 @@ public:
		// TODO: support more formats?
		std::vector<uint32_t> pixelFormats = {HAL_PIXEL_FORMAT_YCBCR_420_888};
		#ifdef VP9
		if (isAtLeastT()) {
		// TODO(b/229387180) Enable once P010 is fully supported
		if (false && isAtLeastT()) {
		pixelFormats.push_back(HAL_PIXEL_FORMAT_YCBCR_P010);
		}
		#endif