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

Commit da3ce0b7 authored by Wonsik Kim's avatar Wonsik Kim Committed by Gerrit Code Review
Browse files

Merge "StagefrightMetadataRetriever: check P010 support when computing bitdepth" into main

parents 4ec817db e0b98eaa

media/libmediaplayerservice/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ cc_defaults { 
        "libmemunreachable",

        "libnetd_client",

        "libpowermanager",

        "libsfplugin_ccodec_utils",

        "libstagefright",

        "libstagefright_foundation",

        "libstagefright_httplive",

media/libmediaplayerservice/StagefrightMetadataRetriever.cpp

+8 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <media/stagefright/MetaData.h>

#include <media/stagefright/Utils.h>

#include <media/CharacterEncodingDetector.h>

#include <Codec2CommonUtils.h>



namespace android {
@@ -239,6 +240,13 @@ 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

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ cc_defaults { 
        "libmedia",

        "libstagefright",

        "libutils",

        "libsfplugin_ccodec_utils",

        "libstagefright_foundation",

    ],

    fuzz_config: {