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

Commit f004bf8e authored by Arun Johnson's avatar Arun Johnson
Browse files

MediaCodec constants For Multiple access-units 

Bug: 298052174
(cherry picked from https://android-review.googlesource.com/q/commit:23f5e357db68ab0d17cb5fcf290b9d617278635b)

Change-Id: I68927a18df629420312380ee47974c707b9d93f9
parent 04b9352c

media/aconfig/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ cc_aconfig_library { 
    name: "aconfig_mediacodec_flags_c_lib",

    min_sdk_version: "30",

    vendor_available: true,

    double_loadable: true,

    apex_available: [

        "//apex_available:platform",

        "com.android.media.swcodec",

media/libstagefright/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ cc_library_static { 
            cflags: [

                "-DDISABLE_AUDIO_SYSTEM_OFFLOAD",

            ],

        }

        },

    },

}

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

+3 −0
Original line number Diff line number Diff line
@@ -809,6 +809,9 @@ inline constexpr char KEY_MAX_BIT_RATE[] = "max-bitrate"; 
inline constexpr char KEY_MAX_FPS_TO_ENCODER[] = "max-fps-to-encoder";

inline constexpr char KEY_MAX_HEIGHT[] = "max-height";

inline constexpr char KEY_MAX_INPUT_SIZE[] = "max-input-size";

inline constexpr char KEY_BUFFER_BATCH_MAX_OUTPUT_SIZE[] = "buffer-batch-max-output-size";

inline constexpr char KEY_BUFFER_BATCH_THRESHOLD_OUTPUT_SIZE[] =

        "buffer-batch-threshold-output-size";

inline constexpr char KEY_MAX_OUTPUT_CHANNEL_COUNT[] = "max-output-channel-count";

inline constexpr char KEY_MAX_PTS_GAP_TO_ENCODER[] = "max-pts-gap-to-encoder";

inline constexpr char KEY_MAX_WIDTH[] = "max-width";

media/ndk/NdkMediaFormat.cpp

+4 −0
Original line number Diff line number Diff line
@@ -449,6 +449,10 @@ 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";

EXPORT const char* AMEDIAFORMAT_KEY_BUFFER_BATCH_MAX_OUTPUT_SIZE =

        "buffer-batch-max-output-size";

EXPORT const char* AMEDIAFORMAT_KEY_BUFFER_BATCH_THRESHOLD_OUTPUT_SIZE =

        "buffer-batch-threshold-output-size";

EXPORT const char* AMEDIAFORMAT_KEY_MAX_PTS_GAP_TO_ENCODER = "max-pts-gap-to-encoder";

EXPORT const char* AMEDIAFORMAT_KEY_MAX_WIDTH = "max-width";

EXPORT const char* AMEDIAFORMAT_KEY_MIME = "mime";

media/ndk/include/media/NdkMediaFormat.h

+2 −0
Original line number Diff line number Diff line
@@ -186,6 +186,8 @@ 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_BUFFER_BATCH_MAX_OUTPUT_SIZE __INTRODUCED_IN(35);

extern const char* AMEDIAFORMAT_KEY_BUFFER_BATCH_THRESHOLD_OUTPUT_SIZE __INTRODUCED_IN(35);

extern const char* AMEDIAFORMAT_KEY_MAX_WIDTH __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_MIME __INTRODUCED_IN(21);

extern const char* AMEDIAFORMAT_KEY_MPEG_USER_DATA __INTRODUCED_IN(28);