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

Commit 89dc0dff authored by Gloria Wang's avatar Gloria Wang Committed by Android (Google) Code Review
Browse files

Merge "Initial CL for the timed text support: - Add support for MP4 timed text... 

Merge "Initial CL for the timed text support: - Add support for MP4 timed text - Add API for app to turn on/off a text track - Add timed text metadata(language) in the MediaMetadataRetriever"
parents 8ce23645 7a1e3e81

include/media/mediametadataretriever.h

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ enum { 
    METADATA_KEY_VIDEO_WIDTH     = 18,

    METADATA_KEY_VIDEO_HEIGHT    = 19,

    METADATA_KEY_BITRATE         = 20,

    METADATA_KEY_TIMED_TEXT_LANGUAGES      = 21,



    // Add more here...

};

include/media/mediaplayer.h

+3 −0
Original line number Diff line number Diff line
@@ -125,6 +125,9 @@ enum media_player_states { 
    MEDIA_PLAYER_PLAYBACK_COMPLETE  = 1 << 7

};



enum media_set_parameter_keys {

    KEY_PARAMETER_TIMED_TEXT_TRACK_INDEX = 1000,

};

// ----------------------------------------------------------------------------

// ref-counted object for callbacks

class MediaPlayerListener: virtual public RefBase

include/media/stagefright/MediaDefs.h

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ extern const char *MEDIA_MIMETYPE_CONTAINER_AVI; 


extern const char *MEDIA_MIMETYPE_CONTAINER_WVM;



extern const char *MEDIA_MIMETYPE_TEXT_3GPP;



}  // namespace android



#endif  // MEDIA_DEFS_H_

include/media/stagefright/MetaData.h

+3 −0
Original line number Diff line number Diff line
@@ -114,6 +114,9 @@ enum { 


    // An indication that a video buffer has been rendered.

    kKeyRendered          = 'rend',  // bool (int32_t)



    // The language code for this media

    kKeyMediaLanguage     = 'lang',  // cstring

};



enum {

media/libstagefright/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ LOCAL_SRC_FILES:= \ 
        ThrottledSource.cpp               \

        TimeSource.cpp                    \

        TimedEventQueue.cpp               \

        TimedTextPlayer.cpp               \

        Utils.cpp                         \

        VBRISeeker.cpp                    \

        WAVExtractor.cpp                  \