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

Commit a218d85f authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'gingerbread' into gingerbread-release

parents 0f8283ab c68a48c4

include/media/MediaPlayerInterface.h

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ public: 
        virtual uint32_t    latency() const = 0;

        virtual float       msecsPerFrame() const = 0;

        virtual status_t    getPosition(uint32_t *position) = 0;

        virtual int         getSessionId() = 0;



        // If no callback is specified, use the "write" API below to submit

        // audio data.

include/media/Metadata.h

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ class Metadata { 
    static const Type kPauseAvailable = 29;        // Boolean

    static const Type kSeekBackwardAvailable = 30; // Boolean

    static const Type kSeekForwardAvailable = 31;  // Boolean

    static const Type kSeekAvailable = 32;         // Boolean



    // @param p[inout] The parcel to append the metadata records

    // to. The global metadata header should have been set already.

include/media/stagefright/MediaExtractor.h

+4 −3
Original line number Diff line number Diff line
@@ -45,13 +45,14 @@ public: 
    virtual sp<MetaData> getMetaData();



    enum Flags {

        CAN_SEEK_BACKWARD  = 1,

        CAN_SEEK_FORWARD   = 2,

        CAN_SEEK_BACKWARD  = 1,  // the "seek 10secs back button"

        CAN_SEEK_FORWARD   = 2,  // the "seek 10secs forward button"

        CAN_PAUSE          = 4,

        CAN_SEEK           = 8,  // the "seek bar"

    };



    // If subclasses do _not_ override this, the default is

    // CAN_SEEK_BACKWARD | CAN_SEEK_FORWARD | CAN_PAUSE

    // CAN_SEEK_BACKWARD | CAN_SEEK_FORWARD | CAN_SEEK | CAN_PAUSE

    virtual uint32_t flags() const;



protected:

media/libmedia/mediaplayer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ MediaPlayer::MediaPlayer() 
    mVideoWidth = mVideoHeight = 0;

    mLockThreadId = 0;

    mAudioSessionId = AudioSystem::newAudioSessionId();

    mSendLevel = 0;

}



MediaPlayer::~MediaPlayer()

media/libmediaplayerservice/MediaPlayerService.cpp

+10 −0
Original line number Diff line number Diff line
@@ -1546,6 +1546,11 @@ void MediaPlayerService::AudioOutput::CallbackWrapper( 


}



int MediaPlayerService::AudioOutput::getSessionId()

{

    return mSessionId;

}



#undef LOG_TAG

#define LOG_TAG "AudioCache"

MediaPlayerService::AudioCache::AudioCache(const char* name) :
@@ -1733,4 +1738,9 @@ void MediaPlayerService::AudioCache::notify(void* cookie, int msg, int ext1, int 
    p->mSignal.signal();

}



int MediaPlayerService::AudioCache::getSessionId()

{

    return 0;

}



} // namespace android