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

Commit a944197b authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

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

am: 32d6e5f0

Change-Id: I200068e27004c5f3c9508a4f46747e0459b31ba8
parents b29fdbe4 32d6e5f0

cmds/stagefright/mediafilter.cpp

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

namespace android {





struct SaturationRSFilter : RenderScriptWrapper::RSFilterCallback {

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 = new ScriptC_saturation(context);

        mScript->set_gSaturation(3.f);

        mScript->set_gSaturation(3.f);

    }

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

};





struct NightVisionRSFilter : RenderScriptWrapper::RSFilterCallback {

struct NightVisionRSFilter : RenderScriptWrapper::RSFilterCallback {

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

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

        mScript = new ScriptC_nightvision(context);

        mScript = new ScriptC_nightvision(context);

    }

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

};





struct ARGBToRGBARSFilter : RenderScriptWrapper::RSFilterCallback {

struct ARGBToRGBARSFilter : RenderScriptWrapper::RSFilterCallback {

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

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

        mScript = new ScriptC_argbtorgba(context);

        mScript = new ScriptC_argbtorgba(context);

    }

    }

include/media/stagefright/MediaBuffer.h

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

    // The underlying data remains the responsibility of the caller!

    MediaBuffer(void *data, size_t size);

    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

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

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

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

include/media/stagefright/MediaCodec.h

+2 −2
Original line number Original line 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

    // by adding rendered frame information to a base notification message. Returns the number

    // of frames that were rendered.

    // of frames that were rendered.

    static size_t CreateFramesRenderedMessage(

    static size_t CreateFramesRenderedMessage(

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

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





protected:

protected:

    virtual ~MediaCodec();

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




        void addResource(

        void addResource(

                int64_t clientId,

                int64_t clientId,

                const sp<IResourceManagerClient> client,

                const sp<IResourceManagerClient> &client,

                const Vector<MediaResource> &resources);

                const Vector<MediaResource> &resources);





        void removeResource(int64_t clientId);

        void removeResource(int64_t clientId);

include/media/stagefright/Utils.h

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

    int64_t mTimeUs;

    sp<AMessage> mMeta;

    sp<AMessage> mMeta;





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

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

    int64_t getSegmentTimeUs() const;

    int64_t getSegmentTimeUs() const;

};

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




// read and write various object to/from AMessage

// 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 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(

void readFromAMessage(

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

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

include/media/stagefright/foundation/ABuffer.h

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

class MediaBufferBase;





struct ABuffer : public RefBase {

struct ABuffer : public RefBase {

    ABuffer(size_t capacity);

    explicit ABuffer(size_t capacity);

    ABuffer(void *data, size_t capacity);

    ABuffer(void *data, size_t capacity);





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

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