diff options
| author | Wonsik Kim <wonsik@google.com> | 2023-12-14 00:41:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-12-14 00:41:48 +0000 |
| commit | 5f7a5be64f76718d33a6e0100246a803faf80a07 (patch) | |
| tree | 9f1858a3a19be48c55160fa6ec2ed2a6718cf265 | |
| parent | e0b98eaa7ff26ecde33f446466cd7b9b73c21e8a (diff) | |
| download | av-5f7a5be64f76718d33a6e0100246a803faf80a07.tar.gz | |
Revert "StagefrightMetadataRetriever: check P010 support when computing bitdepth"
This reverts commit e0b98eaa7ff26ecde33f446466cd7b9b73c21e8a.
Bug: 316017844
Reason for revert: regression
Change-Id: Ia42a16235a0ac857e36a939c820ae4753a8206a4
| -rw-r--r-- | media/libmediaplayerservice/Android.bp | 1 | ||||
| -rw-r--r-- | media/libmediaplayerservice/StagefrightMetadataRetriever.cpp | 8 | ||||
| -rw-r--r-- | media/libmediaplayerservice/fuzzer/Android.bp | 1 |
3 files changed, 0 insertions, 10 deletions
diff --git a/media/libmediaplayerservice/Android.bp b/media/libmediaplayerservice/Android.bp index fc4cc65d50..718f7826c3 100644 --- a/media/libmediaplayerservice/Android.bp +++ b/media/libmediaplayerservice/Android.bp @@ -71,7 +71,6 @@ cc_defaults { "libmemunreachable", "libnetd_client", "libpowermanager", - "libsfplugin_ccodec_utils", "libstagefright", "libstagefright_foundation", "libstagefright_httplive", diff --git a/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp b/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp index 77a21db5ab..84d772d729 100644 --- a/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp +++ b/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp @@ -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); diff --git a/media/libmediaplayerservice/fuzzer/Android.bp b/media/libmediaplayerservice/fuzzer/Android.bp index 46c9ab6d74..b5113720a5 100644 --- a/media/libmediaplayerservice/fuzzer/Android.bp +++ b/media/libmediaplayerservice/fuzzer/Android.bp @@ -40,7 +40,6 @@ cc_defaults { "libmedia", "libstagefright", "libutils", - "libsfplugin_ccodec_utils", "libstagefright_foundation", ], fuzz_config: { |