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

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

Merge "Pass through slow-motion metadata buffer"

parents f9077519 722d7128

media/libstagefright/Utils.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -769,6 +769,7 @@ static std::vector<std::pair<const char *, uint32_t>> bufferMappings { 
        { "sei", kKeySEI },

        { "sei", kKeySEI },

        { "text-format-data", kKeyTextFormatData },

        { "text-format-data", kKeyTextFormatData },

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

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

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

    }

    }

};

};

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -257,6 +257,10 @@ enum { 
    kKeyRtpCvoDegrees    = 'cvod', // int32_t, rtp cvo degrees as per 3GPP 26.114.

    kKeyRtpCvoDegrees    = 'cvod', // int32_t, rtp cvo degrees as per 3GPP 26.114.

    kKeyRtpDscp          = 'dscp', // int32_t, DSCP(Differentiated services codepoint) of RFC 2474.

    kKeyRtpDscp          = 'dscp', // int32_t, DSCP(Differentiated services codepoint) of RFC 2474.

    kKeySocketNetwork    = 'sNet', // int64_t, socket will be bound to network handle.

    kKeySocketNetwork    = 'sNet', // int64_t, socket will be bound to network handle.



    // Slow-motion markers

    kKeySlowMotionMarkers = 'slmo', // raw data, byte array following spec for

                                    // MediaFormat#KEY_SLOW_MOTION_MARKERS

};

};





enum {

enum {

media/ndk/NdkMediaFormat.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -364,6 +364,7 @@ EXPORT const char* AMEDIAFORMAT_KEY_SAR_HEIGHT = "sar-height"; 
EXPORT const char* AMEDIAFORMAT_KEY_SAR_WIDTH = "sar-width";

EXPORT const char* AMEDIAFORMAT_KEY_SAR_WIDTH = "sar-width";

EXPORT const char* AMEDIAFORMAT_KEY_SEI = "sei";

EXPORT const char* AMEDIAFORMAT_KEY_SEI = "sei";

EXPORT const char* AMEDIAFORMAT_KEY_SLICE_HEIGHT = "slice-height";

EXPORT const char* AMEDIAFORMAT_KEY_SLICE_HEIGHT = "slice-height";

EXPORT const char* AMEDIAFORMAT_KEY_SLOW_MOTION_MARKERS = "slow-motion-markers";

EXPORT const char* AMEDIAFORMAT_KEY_STRIDE = "stride";

EXPORT const char* AMEDIAFORMAT_KEY_STRIDE = "stride";

EXPORT const char* AMEDIAFORMAT_KEY_TARGET_TIME = "target-time";

EXPORT const char* AMEDIAFORMAT_KEY_TARGET_TIME = "target-time";

EXPORT const char* AMEDIAFORMAT_KEY_TEMPORAL_LAYER_COUNT = "temporal-layer-count";

EXPORT const char* AMEDIAFORMAT_KEY_TEMPORAL_LAYER_COUNT = "temporal-layer-count";

media/ndk/include/media/NdkMediaFormat.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -322,6 +322,10 @@ extern const char* AMEDIAFORMAT_KEY_YEAR __INTRODUCED_IN(29); 
extern const char* AMEDIAFORMAT_KEY_LOW_LATENCY __INTRODUCED_IN(30);

extern const char* AMEDIAFORMAT_KEY_LOW_LATENCY __INTRODUCED_IN(30);

#endif /* __ANDROID_API__ >= 30 */

#endif /* __ANDROID_API__ >= 30 */





#if __ANDROID_API__ >= 31

extern const char* AMEDIAFORMAT_KEY_SLOW_MOTION_MARKERS __INTRODUCED_IN(31);

#endif /* __ANDROID_API__ >= 31 */



__END_DECLS

__END_DECLS





#endif // _NDK_MEDIA_FORMAT_H

#endif // _NDK_MEDIA_FORMAT_H

media/ndk/libmediandk.map.txt

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

    AMEDIAFORMAT_KEY_SAR_WIDTH; # var introduced=29

    AMEDIAFORMAT_KEY_SEI; # var introduced=28

    AMEDIAFORMAT_KEY_SEI; # var introduced=28

    AMEDIAFORMAT_KEY_SLICE_HEIGHT; # var introduced=28

    AMEDIAFORMAT_KEY_SLICE_HEIGHT; # var introduced=28

    AMEDIAFORMAT_KEY_SLOW_MOTION_MARKERS; # var introduced=31

    AMEDIAFORMAT_KEY_STRIDE; # var introduced=21

    AMEDIAFORMAT_KEY_STRIDE; # var introduced=21

    AMEDIAFORMAT_KEY_TARGET_TIME; # var introduced=29

    AMEDIAFORMAT_KEY_TARGET_TIME; # var introduced=29

    AMEDIAFORMAT_KEY_TEMPORAL_LAYER_COUNT; # var introduced=29

    AMEDIAFORMAT_KEY_TEMPORAL_LAYER_COUNT; # var introduced=29