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

Commit 987b12a2 authored by Vignesh Venkatasubramanian's avatar Vignesh Venkatasubramanian Committed by Android (Google) Code Review
Browse files

Merge "Add AMEDIAFORMAT key for AVIF thumbnail CSD"

parents f4de3b3a 1fc3b79d

media/libstagefright/Utils.cpp

+1 −0
Original line number Diff line number Diff line
@@ -770,6 +770,7 @@ static std::vector<std::pair<const char *, uint32_t>> bufferMappings { 
        { "text-format-data", kKeyTextFormatData },

        { "thumbnail-csd-hevc", kKeyThumbnailHVCC },

        { "slow-motion-markers", kKeySlowMotionMarkers },

        { "thumbnail-csd-av1c", kKeyThumbnailAV1C },

    }

};

media/libstagefright/include/media/stagefright/MetaDataBase.h

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ enum { 
    kKeyDVCC              = 'dvcc',  // raw data

    kKeyAV1C              = 'av1c',  // raw data

    kKeyThumbnailHVCC     = 'thvc',  // raw data

    kKeyThumbnailAV1C     = 'tav1',  // raw data

    kKeyD263              = 'd263',  // raw data

    kKeyOpusHeader        = 'ohdr',  // raw data

    kKeyOpusCodecDelay    = 'ocod',  // uint64_t (codec delay in ns)

media/ndk/NdkMediaFormat.cpp

+1 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ EXPORT const char* AMEDIAFORMAT_KEY_TEMPORAL_LAYER_COUNT = "temporal-layer-count 
EXPORT const char* AMEDIAFORMAT_KEY_TEMPORAL_LAYER_ID = "temporal-layer-id";

EXPORT const char* AMEDIAFORMAT_KEY_TEMPORAL_LAYERING = "ts-schema";

EXPORT const char* AMEDIAFORMAT_KEY_TEXT_FORMAT_DATA = "text-format-data";

EXPORT const char* AMEDIAFORMAT_KEY_THUMBNAIL_CSD_AV1C = "thumbnail-csd-av1c";

EXPORT const char* AMEDIAFORMAT_KEY_THUMBNAIL_CSD_HEVC = "thumbnail-csd-hevc";

EXPORT const char* AMEDIAFORMAT_KEY_THUMBNAIL_HEIGHT = "thumbnail-height";

EXPORT const char* AMEDIAFORMAT_KEY_THUMBNAIL_TIME = "thumbnail-time";

media/ndk/include/media/NdkMediaFormat.h

+1 −0
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ extern const char* AMEDIAFORMAT_KEY_LOW_LATENCY __INTRODUCED_IN(30); 


#if __ANDROID_API__ >= 31

extern const char* AMEDIAFORMAT_KEY_SLOW_MOTION_MARKERS __INTRODUCED_IN(31);

extern const char* AMEDIAFORMAT_KEY_THUMBNAIL_CSD_AV1C __INTRODUCED_IN(31);

#endif /* __ANDROID_API__ >= 31 */



__END_DECLS

media/ndk/libmediandk.map.txt

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ LIBMEDIANDK { 
    AMEDIAFORMAT_KEY_TEMPORAL_LAYER_ID; # var introduced=28

    AMEDIAFORMAT_KEY_TEMPORAL_LAYERING; # var introduced=28

    AMEDIAFORMAT_KEY_TEXT_FORMAT_DATA; # var introduced=29

    AMEDIAFORMAT_KEY_THUMBNAIL_CSD_AV1C; # var introduced=31

    AMEDIAFORMAT_KEY_THUMBNAIL_CSD_HEVC; # var introduced=29

    AMEDIAFORMAT_KEY_THUMBNAIL_HEIGHT; # var introduced=29

    AMEDIAFORMAT_KEY_THUMBNAIL_TIME; # var introduced=29