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

Commit 55c3bd0c authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "stagefright: rename usePersistentInputSurface to setInputSurface" into mnc-dev

parents 2e69a987 8f469e18

include/media/IMediaRecorder.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ public: 
    virtual status_t init() = 0;

    virtual status_t close() = 0;

    virtual status_t release() = 0;

    virtual status_t usePersistentSurface(const sp<IGraphicBufferConsumer>& surface) = 0;

    virtual status_t setInputSurface(const sp<IGraphicBufferConsumer>& surface) = 0;

    virtual sp<IGraphicBufferProducer> querySurfaceMediaSource() = 0;

};

include/media/IOMX.h

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ public: 
            sp<IGraphicBufferProducer> *bufferProducer,

            sp<IGraphicBufferConsumer> *bufferConsumer) = 0;



    virtual status_t usePersistentInputSurface(

    virtual status_t setInputSurface(

            node_id node, OMX_U32 port_index,

            const sp<IGraphicBufferConsumer> &bufferConsumer) = 0;

include/media/MediaRecorderBase.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct MediaRecorderBase { 
    virtual status_t reset() = 0;

    virtual status_t getMaxAmplitude(int *max) = 0;

    virtual status_t dump(int fd, const Vector<String16>& args) const = 0;

    virtual status_t usePersistentSurface(const sp<IGraphicBufferConsumer>& surface) = 0;

    virtual status_t setInputSurface(const sp<IGraphicBufferConsumer>& surface) = 0;

    virtual sp<IGraphicBufferProducer> querySurfaceMediaSource() const = 0;

include/media/mediarecorder.h

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ public: 
    status_t    close();

    status_t    release();

    void        notify(int msg, int ext1, int ext2);

    status_t    usePersistentSurface(const sp<PersistentSurface>& surface);

    status_t    setInputSurface(const sp<PersistentSurface>& surface);

    sp<IGraphicBufferProducer>     querySurfaceMediaSourceFromMediaServer();



private:

include/media/stagefright/ACodec.h

+2 −3
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ struct ACodec : public AHierarchicalStateMachine, public CodecBase { 
    virtual void initiateAllocateComponent(const sp<AMessage> &msg);

    virtual void initiateConfigureComponent(const sp<AMessage> &msg);

    virtual void initiateCreateInputSurface();

    virtual void initiateUsePersistentInputSurface(

            const sp<PersistentSurface> &surface);

    virtual void initiateSetInputSurface(const sp<PersistentSurface> &surface);

    virtual void initiateStart();

    virtual void initiateShutdown(bool keepComponentAllocated = false);
@@ -119,7 +118,7 @@ private: 
        kWhatConfigureComponent      = 'conf',

        kWhatSetSurface              = 'setS',

        kWhatCreateInputSurface      = 'cisf',

        kWhatUsePersistentInputSurface = 'pisf',

        kWhatSetInputSurface         = 'sisf',

        kWhatSignalEndOfInputStream  = 'eois',

        kWhatStart                   = 'star',

        kWhatRequestIDRFrame         = 'ridr',