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

Commit 3a0bcf10 authored by Steve Kondik's avatar Steve Kondik
Browse files

stagefright: Act V: I am become death, the destroyer of worlds 

 * In which our hero unites the legions of distant worlds together
   as one at last to fight anew until the segfaults boil the lands
   and the New Version cometh.

Change-Id: I869b2ab254968ed7a133827ea9e5ba6056f68a5c
parent 29c75250

include/media/IMediaRecorder.h

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ public: 
    virtual status_t prepare() = 0;

    virtual status_t getMaxAmplitude(int* max) = 0;

    virtual status_t start() = 0;

    virtual status_t pause() = 0;

    virtual status_t stop() = 0;

    virtual status_t reset() = 0;

    virtual status_t init() = 0;
@@ -59,6 +58,8 @@ public: 
    virtual status_t release() = 0;

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

    virtual sp<IGraphicBufferProducer> querySurfaceMediaSource() = 0;



    virtual status_t pause() = 0;

};



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

include/media/MediaRecorderBase.h

+5 −2
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ struct MediaRecorderBase { 
    virtual status_t prepare() = 0;

    virtual status_t start() = 0;

    virtual status_t stop() = 0;

    virtual status_t pause() = 0;

    virtual status_t close() = 0;

    virtual status_t reset() = 0;

    virtual status_t getMaxAmplitude(int *max) = 0;
@@ -61,13 +60,17 @@ struct MediaRecorderBase { 
    virtual status_t setInputSurface(const sp<IGraphicBufferConsumer>& surface) = 0;

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





protected:

    String16 mOpPackageName;



private:

    MediaRecorderBase(const MediaRecorderBase &);

    MediaRecorderBase &operator=(const MediaRecorderBase &);



public:

    virtual status_t pause() = 0;





};



}  // namespace android

include/media/mediarecorder.h

+3 −1
Original line number Diff line number Diff line
@@ -249,7 +249,6 @@ public: 
    status_t    getMaxAmplitude(int* max);

    virtual status_t    start();

    virtual status_t    stop();

    virtual status_t    pause();

    status_t    reset();

    status_t    init();

    status_t    close();
@@ -278,6 +277,9 @@ protected: 
    bool                        mIsOutputFileSet;

    Mutex                       mLock;

    Mutex                       mNotifyLock;



public:

    virtual status_t    pause();

};



};  // namespace android

include/media/stagefright/AudioSource.h

+4 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ struct AudioSource : public MediaSource, public MediaBufferObserver { 
    virtual status_t stop() { return reset(); }

    virtual sp<MetaData> getFormat();



    virtual status_t pause();



    // Returns the maximum amplitude since last call.

    int16_t getMaxAmplitude();
@@ -113,6 +111,10 @@ protected: 


    AudioSource(const AudioSource &);

    AudioSource &operator=(const AudioSource &);



public:

    virtual status_t pause();



};



}  // namespace android

include/media/stagefright/FileSource.h

+4 −4
Original line number Diff line number Diff line
@@ -39,14 +39,14 @@ public: 


    virtual status_t getSize(off64_t *size);



    virtual String8 getUri() {

        return mUri;

    }



    virtual sp<DecryptHandle> DrmInitialization(const char *mime);



    virtual void getDrmInfo(sp<DecryptHandle> &handle, DrmManagerClient **client);



    virtual String8 getUri() {

        return mUri;

    }



protected:

    virtual ~FileSource();