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

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

Merge "Parity between sdk/ndk/internal for QP manipulation constants" into sc-dev

parents d6aebd02 19042f13

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

+9 −1
Original line number Original line Diff line number Diff line
@@ -753,7 +753,7 @@ constexpr char KEY_CA_SESSION_ID[] = "ca-session-id"; 
constexpr char KEY_CA_SYSTEM_ID[] = "ca-system-id";

constexpr char KEY_CA_SYSTEM_ID[] = "ca-system-id";

constexpr char KEY_CA_PRIVATE_DATA[] = "ca-private-data";

constexpr char KEY_CA_PRIVATE_DATA[] = "ca-private-data";

constexpr char KEY_CAPTURE_RATE[] = "capture-rate";

constexpr char KEY_CAPTURE_RATE[] = "capture-rate";

constexpr char KEY_CHANNEL_COUNT[] = "channel-count";

constexpr char KEY_CHANNEL_COUNT[] = "channel-count";   // value N, eq to range 1..N

constexpr char KEY_CHANNEL_MASK[] = "channel-mask";

constexpr char KEY_CHANNEL_MASK[] = "channel-mask";

constexpr char KEY_COLOR_FORMAT[] = "color-format";

constexpr char KEY_COLOR_FORMAT[] = "color-format";

constexpr char KEY_COLOR_RANGE[] = "color-range";

constexpr char KEY_COLOR_RANGE[] = "color-range";
@@ -808,6 +808,14 @@ constexpr char KEY_TEMPORAL_LAYERING[] = "ts-schema"; 
constexpr char KEY_TILE_HEIGHT[] = "tile-height";

constexpr char KEY_TILE_HEIGHT[] = "tile-height";

constexpr char KEY_TILE_WIDTH[] = "tile-width";

constexpr char KEY_TILE_WIDTH[] = "tile-width";

constexpr char KEY_TRACK_ID[] = "track-id";

constexpr char KEY_TRACK_ID[] = "track-id";

constexpr char KEY_VIDEO_QP_B_MAX[] = "video-qp-b-max";

constexpr char KEY_VIDEO_QP_B_MIN[] = "video-qp-b-min";

constexpr char KEY_VIDEO_QP_I_MAX[] = "video-qp-i-max";

constexpr char KEY_VIDEO_QP_I_MIN[] = "video-qp-i-min";

constexpr char KEY_VIDEO_QP_MAX[] = "video-qp-max";

constexpr char KEY_VIDEO_QP_MIN[] = "video-qp-min";

constexpr char KEY_VIDEO_QP_P_MAX[] = "video-qp-p-max";

constexpr char KEY_VIDEO_QP_P_MIN[] = "video-qp-p-min";

constexpr char KEY_WIDTH[] = "width";

constexpr char KEY_WIDTH[] = "width";





// from MediaCodec.java

// from MediaCodec.java

media/ndk/Android.bp

+5 −1
Original line number Original line Diff line number Diff line
@@ -276,5 +276,9 @@ cc_library_static { 
        },

        },

    },

    },





    apex_available: ["com.android.media"],

    apex_available: [

        "//apex_available:platform",

        "com.android.media",

        "com.android.media.swcodec",

    ],

}
 
}

media/ndk/NdkMediaFormat.cpp

+8 −0
Original line number Original line Diff line number Diff line
@@ -383,6 +383,14 @@ EXPORT const char* AMEDIAFORMAT_KEY_TITLE = "title"; 
EXPORT const char* AMEDIAFORMAT_KEY_TRACK_ID = "track-id";

EXPORT const char* AMEDIAFORMAT_KEY_TRACK_ID = "track-id";

EXPORT const char* AMEDIAFORMAT_KEY_TRACK_INDEX = "track-index";

EXPORT const char* AMEDIAFORMAT_KEY_TRACK_INDEX = "track-index";

EXPORT const char* AMEDIAFORMAT_KEY_VALID_SAMPLES = "valid-samples";

EXPORT const char* AMEDIAFORMAT_KEY_VALID_SAMPLES = "valid-samples";

EXPORT const char* AMEDIAFORMAT_VIDEO_QP_B_MAX = "video-qp-b-max";

EXPORT const char* AMEDIAFORMAT_VIDEO_QP_B_MIN = "video-qp-b-min";

EXPORT const char* AMEDIAFORMAT_VIDEO_QP_I_MAX = "video-qp-i-max";

EXPORT const char* AMEDIAFORMAT_VIDEO_QP_I_MIN = "video-qp-i-min";

EXPORT const char* AMEDIAFORMAT_VIDEO_QP_MAX = "video-qp-max";

EXPORT const char* AMEDIAFORMAT_VIDEO_QP_MIN = "video-qp-min";

EXPORT const char* AMEDIAFORMAT_VIDEO_QP_P_MAX = "video-qp-p-max";

EXPORT const char* AMEDIAFORMAT_VIDEO_QP_P_MIN = "video-qp-p-min";

EXPORT const char* AMEDIAFORMAT_KEY_WIDTH = "width";

EXPORT const char* AMEDIAFORMAT_KEY_WIDTH = "width";

EXPORT const char* AMEDIAFORMAT_KEY_XMP_OFFSET = "xmp-offset";

EXPORT const char* AMEDIAFORMAT_KEY_XMP_OFFSET = "xmp-offset";

EXPORT const char* AMEDIAFORMAT_KEY_XMP_SIZE = "xmp-size";

EXPORT const char* AMEDIAFORMAT_KEY_XMP_SIZE = "xmp-size";

media/ndk/include/media/NdkMediaFormat.h

+9 −0
Original line number Original line Diff line number Diff line
@@ -308,6 +308,15 @@ extern const char* AMEDIAFORMAT_KEY_THUMBNAIL_CSD_AV1C __INTRODUCED_IN(31); 
extern const char* AMEDIAFORMAT_KEY_XMP_OFFSET __INTRODUCED_IN(31);

extern const char* AMEDIAFORMAT_KEY_XMP_OFFSET __INTRODUCED_IN(31);

extern const char* AMEDIAFORMAT_KEY_XMP_SIZE __INTRODUCED_IN(31);

extern const char* AMEDIAFORMAT_KEY_XMP_SIZE __INTRODUCED_IN(31);





extern const char* AMEDIAFORMAT_VIDEO_QP_B_MAX __INTRODUCED_IN(31);

extern const char* AMEDIAFORMAT_VIDEO_QP_B_MIN __INTRODUCED_IN(31);

extern const char* AMEDIAFORMAT_VIDEO_QP_I_MAX __INTRODUCED_IN(31);

extern const char* AMEDIAFORMAT_VIDEO_QP_I_MIN __INTRODUCED_IN(31);

extern const char* AMEDIAFORMAT_VIDEO_QP_MAX __INTRODUCED_IN(31);

extern const char* AMEDIAFORMAT_VIDEO_QP_MIN __INTRODUCED_IN(31);

extern const char* AMEDIAFORMAT_VIDEO_QP_P_MAX __INTRODUCED_IN(31);

extern const char* AMEDIAFORMAT_VIDEO_QP_P_MIN __INTRODUCED_IN(31);



__END_DECLS

__END_DECLS





#endif // _NDK_MEDIA_FORMAT_H

#endif // _NDK_MEDIA_FORMAT_H