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

Commit f0e390f0 authored Dec 14, 2023 by Treehugger Robot Committed by Automerger Merge Worker Dec 14, 2023

Merge "Revert "StagefrightMetadataRetriever: check P010 support when computing...

Merge "Revert "StagefrightMetadataRetriever: check P010 support when computing bitdepth"" into main am: 8c0967af

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2874916

Change-Id: I5dc8fbe512ae780e65fd691c13c7b8022ae6224a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 21928195 8c0967af

media/libmediaplayerservice/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,6 @@ cc_defaults {
		"libmemunreachable",
		"libnetd_client",
		"libpowermanager",
		"libsfplugin_ccodec_utils",
		"libstagefright",
		"libstagefright_foundation",
		"libstagefright_httplive",

media/libmediaplayerservice/StagefrightMetadataRetriever.cpp

+0 −8

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@
		#include <media/stagefright/MetaData.h>
		#include <media/stagefright/Utils.h>
		#include <media/CharacterEncodingDetector.h>
		#include <Codec2CommonUtils.h>

		namespace android {

		@@ -240,13 +239,6 @@ sp<IMemory> StagefrightMetadataRetriever::getImageInternal(
		}
		}
		}
		if (bitDepth == 10) {
		static const bool isP010Supported =
		isHalPixelFormatSupported(AHARDWAREBUFFER_FORMAT_YCbCr_P010);
		if (!isP010Supported) {
		bitDepth = 8;
		}
		}

		if (metaOnly) {
		return FrameDecoder::getMetadataOnly(trackMeta, colorFormat, thumbnail, bitDepth);

media/libmediaplayerservice/fuzzer/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ cc_defaults {
		"libmedia",
		"libstagefright",
		"libutils",
		"libsfplugin_ccodec_utils",
		"libstagefright_foundation",
		],
		fuzz_config: {