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

Commit 09752c12 authored by Xiao Huang's avatar Xiao Huang Committed by Gerrit Code Review
Browse files

Merge "Replace List by std::list in ACodec and MediaCodec"

parents 92f6d9a5 c03ae22e

media/libstagefright/ACodec.cpp

+3 −4
Original line number Diff line number Diff line
@@ -5167,12 +5167,11 @@ void ACodec::deferMessage(const sp<AMessage> &msg) { 
}



void ACodec::processDeferredMessages() {

    List<sp<AMessage> > queue = mDeferredQueue;

    std::list<sp<AMessage>> queue = mDeferredQueue;

    mDeferredQueue.clear();



    List<sp<AMessage> >::iterator it = queue.begin();

    while (it != queue.end()) {

        onMessageReceived(*it++);

    for(const sp<AMessage> &msg : queue) {

        onMessageReceived(msg);

    }

}

media/libstagefright/MediaCodec.cpp

+2 −2
Original line number Diff line number Diff line
@@ -5286,7 +5286,7 @@ status_t MediaCodec::onReleaseOutputBuffer(const sp<AMessage> &msg) { 
MediaCodec::BufferInfo *MediaCodec::peekNextPortBuffer(int32_t portIndex) {

    CHECK(portIndex == kPortIndexInput || portIndex == kPortIndexOutput);



    List<size_t> *availBuffers = &mAvailPortBuffers[portIndex];

    std::list<size_t> *availBuffers = &mAvailPortBuffers[portIndex];



    if (availBuffers->empty()) {

        return nullptr;
@@ -5303,7 +5303,7 @@ ssize_t MediaCodec::dequeuePortBuffer(int32_t portIndex) { 
        return -EAGAIN;

    }



    List<size_t> *availBuffers = &mAvailPortBuffers[portIndex];

    std::list<size_t> *availBuffers = &mAvailPortBuffers[portIndex];

    size_t index = *availBuffers->begin();

    CHECK_EQ(info, &mPortBuffers[portIndex][index]);

    availBuffers->erase(availBuffers->begin());

media/libstagefright/include/media/stagefright/ACodec.h

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define A_CODEC_H_



#include <stdint.h>

#include <list>

#include <android/native_window.h>

#include <media/hardware/MetadataBufferType.h>

#include <media/MediaCodecInfo.h>
@@ -269,7 +270,7 @@ private: 
    bool mPortEOS[2];

    status_t mInputEOSResult;



    List<sp<AMessage> > mDeferredQueue;

    std::list<sp<AMessage>> mDeferredQueue;



    sp<AMessage> mLastOutputFormat;

    bool mIsVideo;

media/libstagefright/include/media/stagefright/MediaCodec.h

+3 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#define MEDIA_CODEC_H_



#include <list>

#include <memory>

#include <vector>
@@ -483,7 +484,7 @@ private: 
    // stop/flush/reset/release.

    Mutex mBufferLock;



    List<size_t> mAvailPortBuffers[2];

    std::list<size_t> mAvailPortBuffers[2];

    std::vector<BufferInfo> mPortBuffers[2];



    int32_t mDequeueInputTimeoutGeneration;
@@ -501,7 +502,7 @@ private: 


    sp<IDescrambler> mDescrambler;



    List<sp<ABuffer> > mCSD;

    std::list<sp<ABuffer> > mCSD;



    sp<AMessage> mActivityNotify;