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

Commit fbfec1af authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: Ie807d516d00b5c28ebe1ac8dcbce9247d56403ba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 95d35980 da3ce0b7

media/libmediaplayerservice/Android.bp

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

        "libmemunreachable",

        "libnetd_client",

        "libnetd_client",

        "libpowermanager",

        "libpowermanager",

        "libsfplugin_ccodec_utils",

        "libstagefright",

        "libstagefright",

        "libstagefright_foundation",

        "libstagefright_foundation",

        "libstagefright_httplive",

        "libstagefright_httplive",

media/libmediaplayerservice/StagefrightMetadataRetriever.cpp

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

#include <media/stagefright/MetaData.h>

#include <media/stagefright/Utils.h>

#include <media/stagefright/Utils.h>

#include <media/CharacterEncodingDetector.h>

#include <media/CharacterEncodingDetector.h>

#include <Codec2CommonUtils.h>





namespace android {

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) {

    if (metaOnly) {

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

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

media/libmediaplayerservice/fuzzer/Android.bp

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

        "libmedia",

        "libstagefright",

        "libstagefright",

        "libutils",

        "libutils",

        "libsfplugin_ccodec_utils",

        "libstagefright_foundation",

        "libstagefright_foundation",

    ],

    ],

    fuzz_config: {

    fuzz_config: {