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

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

Merge "mediaplayer2: rename some MEDIA2_INFO_* constants"

parents d02904c6 cad5a3a2
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -96,17 +96,17 @@ enum media2_error_type {
enum media2_info_type {
    // 0xx
    MEDIA2_INFO_UNKNOWN = 1,
    // The player was started because it was used as the next player for another
    // player, which just completed playback
    MEDIA2_INFO_STARTED_AS_NEXT = 2,
    // The player just started the playback of this data source.
    MEDIA2_INFO_DATA_SOURCE_START = 2,
    // The player just pushed the very first video frame for rendering
    MEDIA2_INFO_VIDEO_RENDERING_START = 3,
    // The player just pushed the very first audio frame for rendering
    MEDIA2_INFO_AUDIO_RENDERING_START = 4,
    // The player just completed the playback of this data source
    MEDIA2_INFO_PLAYBACK_COMPLETE = 5,
    // The player just completed the playback of the full play list
    MEDIA2_INFO_PLAYLIST_END = 6,
    MEDIA2_INFO_DATA_SOURCE_END = 5,
    // The player just completed the playback of all data sources.
    // But this is not visible in native code. Just keep this entry for completeness.
    MEDIA2_INFO_DATA_SOURCE_LIST_END = 6,

    //1xx
    // The player just prepared a data source.
+2 −2
Original line number Diff line number Diff line
@@ -2474,8 +2474,8 @@ void NuPlayer2::performPlayNextDataSource() {
    if (mDriver != NULL) {
        sp<NuPlayer2Driver> driver = mDriver.promote();
        if (driver != NULL) {
            notifyListener(previousSrcId, MEDIA2_INFO, MEDIA2_INFO_PLAYBACK_COMPLETE, 0);
            notifyListener(mSrcId, MEDIA2_INFO, MEDIA2_INFO_STARTED_AS_NEXT, 0);
            notifyListener(previousSrcId, MEDIA2_INFO, MEDIA2_INFO_DATA_SOURCE_END, 0);
            notifyListener(mSrcId, MEDIA2_INFO, MEDIA2_INFO_DATA_SOURCE_START, 0);
        }
    }