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

Commit d50ff4d7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "libmediaextractor: add manufacurer key in Metadata"

parents 72ef0699 bb20d556

media/libstagefright/Utils.cpp

+1 −0
Original line number Diff line number Diff line
@@ -588,6 +588,7 @@ static std::vector<std::pair<const char *, uint32_t>> stringMappings { 
        { "genre", kKeyGenre },

        { "location", kKeyLocation },

        { "lyricist", kKeyWriter },

        { "manufacturer", kKeyManufacturer },

        { "title", kKeyTitle },

        { "year", kKeyYear },

    }

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

+3 −0
Original line number Diff line number Diff line
@@ -144,6 +144,9 @@ enum { 
    // The language code for this media

    kKeyMediaLanguage     = 'lang',  // cstring



    // The manufacturer code for this media

    kKeyManufacturer  = 'manu',  // cstring



    // To store the timed text format data

    kKeyTextFormatData    = 'text',  // raw data

media/ndk/NdkMediaFormat.cpp

+1 −0
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@ EXPORT const char* AMEDIAFORMAT_KEY_LEVEL = "level"; 
EXPORT const char* AMEDIAFORMAT_KEY_LOCATION = "location";

EXPORT const char* AMEDIAFORMAT_KEY_LOOP = "loop";

EXPORT const char* AMEDIAFORMAT_KEY_LYRICIST = "lyricist";

EXPORT const char* AMEDIAFORMAT_KEY_MANUFACTURER = "manufacturer";

EXPORT const char* AMEDIAFORMAT_KEY_MAX_BIT_RATE = "max-bitrate";

EXPORT const char* AMEDIAFORMAT_KEY_MAX_HEIGHT = "max-height";

EXPORT const char* AMEDIAFORMAT_KEY_MAX_INPUT_SIZE = "max-input-size";

media/ndk/include/media/NdkMediaFormat.h

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ extern const char* AMEDIAFORMAT_KEY_IS_SYNC_FRAME __INTRODUCED_IN(29); 
extern const char* AMEDIAFORMAT_KEY_LOCATION __INTRODUCED_IN(29);

extern const char* AMEDIAFORMAT_KEY_LOOP __INTRODUCED_IN(29);

extern const char* AMEDIAFORMAT_KEY_LYRICIST __INTRODUCED_IN(29);

extern const char* AMEDIAFORMAT_KEY_MANUFACTURER __INTRODUCED_IN(29);

extern const char* AMEDIAFORMAT_KEY_MAX_BIT_RATE __INTRODUCED_IN(29);

extern const char* AMEDIAFORMAT_KEY_MPEG2_STREAM_HEADER __INTRODUCED_IN(29);

extern const char* AMEDIAFORMAT_KEY_PCM_BIG_ENDIAN __INTRODUCED_IN(29);

media/ndk/libmediandk.map.txt

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ LIBMEDIANDK { 
    AMEDIAFORMAT_KEY_LOCATION; # var introduced=29

    AMEDIAFORMAT_KEY_LOOP; # var introduced=29

    AMEDIAFORMAT_KEY_LYRICIST; # var introduced=29

    AMEDIAFORMAT_KEY_MANUFACTURER; # var introduced=29

    AMEDIAFORMAT_KEY_MAX_BIT_RATE; # var introduced=29

    AMEDIAFORMAT_KEY_MAX_HEIGHT; # var introduced=21

    AMEDIAFORMAT_KEY_MAX_INPUT_SIZE; # var introduced=21