diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-14 04:05:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-14 04:05:55 +0000 |
| commit | f0e390f031e56b5df9945ef9d533c479df347fe9 (patch) | |
| tree | 01c7adf2323f595701ea55a39b4b3057d31ce7b5 | |
| parent | 219281958192823797af5ae79cd2e19b1a5daaed (diff) | |
| parent | 8c0967afb0ed3b0e6e44411f87f41cff8bf286ea (diff) | |
| download | av-f0e390f031e56b5df9945ef9d533c479df347fe9.tar.gz | |
Merge "Revert "StagefrightMetadataRetriever: check P010 support when computing bitdepth"" into main am: 8c0967afb0
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>
| -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: { |