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

Commit 5fc92b37 authored by Ray Essick's avatar Ray Essick Committed by Android (Google) Code Review
Browse files

Merge "libmedia-ndk: add common missing constants" into udc-dev

parents 758ba288 7076b604

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

+2 −1
Original line number Diff line number Diff line
@@ -866,10 +866,11 @@ constexpr char SECURE[] = "android.media.mediacodec.secure"; 
constexpr char WIDTH[] = "android.media.mediacodec.width";



constexpr int32_t BUFFER_FLAG_CODEC_CONFIG = 2;

constexpr int32_t BUFFER_FLAG_DECODE_ONLY = 32;

constexpr int32_t BUFFER_FLAG_END_OF_STREAM = 4;

constexpr int32_t BUFFER_FLAG_KEY_FRAME = 1;

constexpr int32_t BUFFER_FLAG_MUXER_DATA = 16;

constexpr int32_t BUFFER_FLAG_PARTIAL_FRAME = 8;

constexpr int32_t BUFFER_FLAG_DECODE_ONLY = 32;

constexpr int32_t BUFFER_FLAG_SYNC_FRAME = 1;

constexpr int32_t CONFIGURE_FLAG_ENCODE = 1;

constexpr int32_t CONFIGURE_FLAG_USE_BLOCK_MODEL = 2;

media/ndk/NdkMediaFormat.cpp

+2 −0
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ EXPORT const char* AMEDIAFORMAT_KEY_AAC_SBR_MODE = "aac-sbr-mode"; 
EXPORT const char* AMEDIAFORMAT_KEY_ALBUM = "album";

EXPORT const char* AMEDIAFORMAT_KEY_ALBUMART = "albumart";

EXPORT const char* AMEDIAFORMAT_KEY_ALBUMARTIST = "albumartist";

EXPORT const char* AMEDIAFORMAT_KEY_ALLOW_FRAME_DROP = "allow-frame-drop";

EXPORT const char* AMEDIAFORMAT_KEY_ARTIST = "artist";

EXPORT const char* AMEDIAFORMAT_KEY_AUDIO_PRESENTATION_INFO = "audio-presentation-info";

EXPORT const char* AMEDIAFORMAT_KEY_AUDIO_PRESENTATION_PRESENTATION_ID =
@@ -444,6 +445,7 @@ EXPORT const char* AMEDIAFORMAT_KEY_LOW_LATENCY = "low-latency"; 
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_B_FRAMES = "max-bframes";

EXPORT const char* AMEDIAFORMAT_KEY_MAX_FPS_TO_ENCODER = "max-fps-to-encoder";

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

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

media/ndk/include/media/NdkMediaCodec.h

+3 −0
Original line number Diff line number Diff line
@@ -64,9 +64,12 @@ typedef struct AMediaCodecBufferInfo AMediaCodecBufferInfo; 
typedef struct AMediaCodecCryptoInfo AMediaCodecCryptoInfo;



enum {

    AMEDIACODEC_BUFFER_FLAG_KEY_FRAME = 1,

    AMEDIACODEC_BUFFER_FLAG_CODEC_CONFIG = 2,

    AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM = 4,

    AMEDIACODEC_BUFFER_FLAG_PARTIAL_FRAME = 8,

    AMEDIACODEC_BUFFER_FLAG_MUXER_DATA = 16,

    AMEDIACODEC_BUFFER_FLAG_DECODE_ONLY = 32,



    AMEDIACODEC_CONFIGURE_FLAG_ENCODE = 1,

    AMEDIACODEC_INFO_OUTPUT_BUFFERS_CHANGED = -3,

media/ndk/include/media/NdkMediaFormat.h

+2 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ extern const char* AMEDIAFORMAT_KEY_AAC_ENCODED_TARGET_LEVEL __INTRODUCED_IN(28) 
extern const char* AMEDIAFORMAT_KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_AAC_PROFILE __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_AAC_SBR_MODE __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_ALLOW_FRAME_DROP __INTRODUCED_IN(34);

extern const char* AMEDIAFORMAT_KEY_AUDIO_SESSION_ID __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_BITRATE_MODE __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_BIT_RATE __INTRODUCED_IN(21);
@@ -169,6 +170,7 @@ extern const char* AMEDIAFORMAT_KEY_I_FRAME_INTERVAL __INTRODUCED_IN(21); 
extern const char* AMEDIAFORMAT_KEY_LANGUAGE __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_LATENCY __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_LEVEL __INTRODUCED_IN(28);

extern const char* AMEDIAFORMAT_KEY_MAX_B_FRAMES __INTRODUCED_IN(34);

extern const char* AMEDIAFORMAT_KEY_MAX_HEIGHT __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_MAX_INPUT_SIZE __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_MAX_WIDTH __INTRODUCED_IN(21);

media/ndk/include/media/NdkMediaMuxer.h

+4 −2
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ typedef enum { 
    AMEDIAMUXER_OUTPUT_FORMAT_MPEG_4 = 0,

    AMEDIAMUXER_OUTPUT_FORMAT_WEBM = 1,

    AMEDIAMUXER_OUTPUT_FORMAT_THREE_GPP = 2,

    AMEDIAMUXER_OUTPUT_FORMAT_HEIF = 3,

    AMEDIAMUXER_OUTPUT_FORMAT_OGG = 4,

} OutputFormat;



typedef enum {