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

Commit 32d6e5f0 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh
Browse files

resolve merge conflicts of 6ae8c7bc to stage-aosp-master 

Change-Id: Iabb5d9b93b98e428c53f0504fbfe832ed24d988d
parents 311f99ea 6ae8c7bc

cmds/stagefright/mediafilter.cpp

+3 −3
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static void usage(const char *me) { 
namespace android {



struct SaturationRSFilter : RenderScriptWrapper::RSFilterCallback {

    void init(RSC::sp<RSC::RS> context) {

    void init(const RSC::sp<RSC::RS> &context) {

        mScript = new ScriptC_saturation(context);

        mScript->set_gSaturation(3.f);

    }
@@ -90,7 +90,7 @@ private: 
};



struct NightVisionRSFilter : RenderScriptWrapper::RSFilterCallback {

    void init(RSC::sp<RSC::RS> context) {

    void init(const RSC::sp<RSC::RS> &context) {

        mScript = new ScriptC_nightvision(context);

    }
@@ -110,7 +110,7 @@ private: 
};



struct ARGBToRGBARSFilter : RenderScriptWrapper::RSFilterCallback {

    void init(RSC::sp<RSC::RS> context) {

    void init(const RSC::sp<RSC::RS> &context) {

        mScript = new ScriptC_argbtorgba(context);

    }

include/media/stagefright/MediaBuffer.h

+3 −3
Original line number Diff line number Diff line
@@ -54,11 +54,11 @@ public: 
    // The underlying data remains the responsibility of the caller!

    MediaBuffer(void *data, size_t size);



    MediaBuffer(size_t size);

    explicit MediaBuffer(size_t size);



    MediaBuffer(const sp<GraphicBuffer>& graphicBuffer);

    explicit MediaBuffer(const sp<GraphicBuffer>& graphicBuffer);



    MediaBuffer(const sp<ABuffer> &buffer);

    explicit MediaBuffer(const sp<ABuffer> &buffer);



    // Decrements the reference count and returns the buffer to its

    // associated MediaBufferGroup if the reference count drops to 0.

include/media/stagefright/MediaCodec.h

+2 −2
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ struct MediaCodec : public AHandler { 
    // by adding rendered frame information to a base notification message. Returns the number

    // of frames that were rendered.

    static size_t CreateFramesRenderedMessage(

            std::list<FrameRenderTracker::Info> done, sp<AMessage> &msg);

            const std::list<FrameRenderTracker::Info> &done, sp<AMessage> &msg);



protected:

    virtual ~MediaCodec();
@@ -274,7 +274,7 @@ private: 


        void addResource(

                int64_t clientId,

                const sp<IResourceManagerClient> client,

                const sp<IResourceManagerClient> &client,

                const Vector<MediaResource> &resources);



        void removeResource(int64_t clientId);

include/media/stagefright/Utils.h

+3 −3
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ struct HLSTime { 
    int64_t mTimeUs;

    sp<AMessage> mMeta;



    HLSTime(const sp<AMessage> &meta = NULL);

    explicit HLSTime(const sp<AMessage> &meta = NULL);

    int64_t getSegmentTimeUs() const;

};
@@ -83,10 +83,10 @@ bool operator <(const HLSTime &t0, const HLSTime &t1); 


// read and write various object to/from AMessage



void writeToAMessage(sp<AMessage> msg, const AudioPlaybackRate &rate);

void writeToAMessage(const sp<AMessage> &msg, const AudioPlaybackRate &rate);

void readFromAMessage(const sp<AMessage> &msg, AudioPlaybackRate *rate /* nonnull */);



void writeToAMessage(sp<AMessage> msg, const AVSyncSettings &sync, float videoFpsHint);

void writeToAMessage(const sp<AMessage> &msg, const AVSyncSettings &sync, float videoFpsHint);

void readFromAMessage(

        const sp<AMessage> &msg, AVSyncSettings *sync /* nonnull */, float *videoFps /* nonnull */);

include/media/stagefright/foundation/ABuffer.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ struct AMessage; 
class MediaBufferBase;



struct ABuffer : public RefBase {

    ABuffer(size_t capacity);

    explicit ABuffer(size_t capacity);

    ABuffer(void *data, size_t capacity);



    uint8_t *base() { return (uint8_t *)mData; }