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

Commit 008e7055 authored by Songyue Han's avatar Songyue Han Committed by Automerger Merge Worker
Browse files

Merge "Add DynamicColorAspects and DetachedSurface features in native." into... 

Merge "Add DynamicColorAspects and DetachedSurface features in native." into main am: 1167e5b3 am: 6c86f6ec

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



Change-Id: I76642f0ad6a037d08a573b6fbd8a32c6ea898bdf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d0abe031 6c86f6ec

media/libmedia/CodecCapabilities.cpp

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ static const std::vector<Feature> DECODER_FEATURES = { 
    Feature(FEATURE_MultipleFrames,   (1 << 5), false),

    Feature(FEATURE_DynamicTimestamp, (1 << 6), false),

    Feature(FEATURE_LowLatency,       (1 << 7), true),

    Feature(FEATURE_DynamicColorAspects, (1 << 8), true),

    Feature(FEATURE_DetachedSurface,     (1 << 9), true),

    // feature to exclude codec from REGULAR codec list

    Feature(FEATURE_SpecialCodec,     (1 << 30), false, true),

};

media/libstagefright/include/media/stagefright/MediaCodecConstants.h

+2 −0
Original line number Diff line number Diff line
@@ -854,6 +854,8 @@ inline static const char *asString_ColorFormat(int32_t i, const char *def = "??" 
}



inline constexpr char FEATURE_AdaptivePlayback[]       = "adaptive-playback";

inline constexpr char FEATURE_DetachedSurface[]        = "detached-surface";

inline constexpr char FEATURE_DynamicColorAspects[]    = "dynamic-color-aspects";

inline constexpr char FEATURE_DynamicTimestamp[]       = "dynamic-timestamp";

inline constexpr char FEATURE_EncodingStatistics[]     = "encoding-statistics";

inline constexpr char FEATURE_FrameParsing[]           = "frame-parsing";