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

Commit 55656bc5 authored by Xiao Huang's avatar Xiao Huang Committed by Automerger Merge Worker
Browse files

Merge "Replace List by std::list in ACodec and MediaCodec" am: 09752c12 am:... 

Merge "Replace List by std::list in ACodec and MediaCodec" am: 09752c12 am: 116ac463 am: eb1ecc49 am: f5e65780

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2214724



Change-Id: Iaf667553ddaa7b68b3e6016a5cf9dbea39b7ddb8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a9dba58e f5e65780

media/libstagefright/ACodec.cpp

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

}





void ACodec::processDeferredMessages() {

void ACodec::processDeferredMessages() {

    List<sp<AMessage> > queue = mDeferredQueue;

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

    mDeferredQueue.clear();

    mDeferredQueue.clear();





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

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

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

        onMessageReceived(msg);

        onMessageReceived(*it++);

    }

    }

}

}

media/libstagefright/MediaCodec.cpp

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

MediaCodec::BufferInfo *MediaCodec::peekNextPortBuffer(int32_t portIndex) {

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

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





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

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





    if (availBuffers->empty()) {

    if (availBuffers->empty()) {

        return nullptr;

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

        return -EAGAIN;

    }

    }





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

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

    size_t index = *availBuffers->begin();

    size_t index = *availBuffers->begin();

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

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

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

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

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

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

#define A_CODEC_H_





#include <stdint.h>

#include <stdint.h>

#include <list>

#include <android/native_window.h>

#include <android/native_window.h>

#include <media/hardware/MetadataBufferType.h>

#include <media/hardware/MetadataBufferType.h>

#include <media/MediaCodecInfo.h>

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

    bool mPortEOS[2];

    status_t mInputEOSResult;

    status_t mInputEOSResult;





    List<sp<AMessage> > mDeferredQueue;

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





    sp<AMessage> mLastOutputFormat;

    sp<AMessage> mLastOutputFormat;

    bool mIsVideo;

    bool mIsVideo;

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

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




#define MEDIA_CODEC_H_

#define MEDIA_CODEC_H_





#include <list>

#include <memory>

#include <memory>

#include <vector>

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

    // stop/flush/reset/release.

    Mutex mBufferLock;

    Mutex mBufferLock;





    List<size_t> mAvailPortBuffers[2];

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

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

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





    int32_t mDequeueInputTimeoutGeneration;

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




    sp<IDescrambler> mDescrambler;

    sp<IDescrambler> mDescrambler;





    List<sp<ABuffer> > mCSD;

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





    sp<AMessage> mActivityNotify;

    sp<AMessage> mActivityNotify;