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

Commit 001a7b82 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/av into 1.1

Android 4.2.2 release 1
parents d8526971 f0ff908d
Loading
Loading
Loading
Loading
+11 −1
Original line number Diff line number Diff line
@@ -36,8 +36,11 @@ public:
        size_t frameCount;
    };

    virtual ~AudioBufferProvider() {}
protected:
    AudioBufferProvider() : mValid(kValid) { }
    virtual ~AudioBufferProvider() { mValid = kDead; }

public:
    // value representing an invalid presentation timestamp
    static const int64_t kInvalidPTS = 0x7FFFFFFFFFFFFFFFLL;    // <stdint.h> is too painful

@@ -47,6 +50,13 @@ public:
    virtual status_t getNextBuffer(Buffer* buffer, int64_t pts = kInvalidPTS) = 0;

    virtual void releaseBuffer(Buffer* buffer) = 0;

    int getValid() const { return mValid; }
    static const int kValid = 'GOOD';
    static const int kDead = 'DEAD';

private:
    int mValid;
};

// ----------------------------------------------------------------------------
+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ class IRemoteDisplay : public IInterface
public:
    DECLARE_META_INTERFACE(RemoteDisplay);

    virtual status_t pause() = 0;
    virtual status_t resume() = 0;

    // Disconnects the remote display and stops listening for new connections.
    virtual status_t dispose() = 0;
};
+5 −0
Original line number Diff line number Diff line
@@ -73,6 +73,11 @@ struct IStreamListener : public IInterface {
    // ATSParser::DiscontinuityType.
    static const char *const kKeyDiscontinuityMask;

    // Optionally signalled as part of a discontinuity that includes
    // DISCONTINUITY_TIME. It indicates the media time (in us) to be associated
    // with the next PTS occuring in the stream. The value is of type int64_t.
    static const char *const kKeyMediaTimeUs;

    virtual void issueCommand(
            Command cmd, bool synchronous, const sp<AMessage> &msg = NULL) = 0;
};
+0 −1
Original line number Diff line number Diff line
@@ -249,7 +249,6 @@ private:
    sp<MediaPlayerListener>     mListener;
    void*                       mCookie;
    media_player_states         mCurrentState;
    int                         mDuration;
    int                         mCurrentPosition;
    int                         mSeekPosition;
    bool                        mPrepareSync;
+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ private:
    bool mChannelMaskPresent;
    int32_t mChannelMask;

    status_t setCyclicIntraMacroblockRefresh(const sp<AMessage> &msg, int32_t mode);
    status_t allocateBuffersOnPort(OMX_U32 portIndex);
    status_t freeBuffersOnPort(OMX_U32 portIndex);
    status_t freeBuffer(OMX_U32 portIndex, size_t i);
Loading