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

Commit ee86375d authored by Bill Yi's avatar Bill Yi
Browse files

Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE 

Merged-In: I7b187c5e79bf4531bdffc7411a033a7c20a54294
Merged-In: I89cda19ca8521445e1608efbbd07c889cca59601
Merged-In: I89cda19ca8521445e1608efbbd07c889cca59601
Change-Id: I183701b2c03dc63d19c98779388c0b99bae9a4ce
parents 19acbe9f 787abcd5

audio/core/all-versions/default/StreamIn.cpp

+4 −4
Original line number Diff line number Diff line
@@ -412,9 +412,9 @@ Return<void> StreamIn::prepareForReading(uint32_t frameSize, uint32_t framesCoun 
    }



    // Create and launch the thread.

    auto tempReadThread =

        std::make_unique<ReadThread>(&mStopReadThread, mStream, tempCommandMQ.get(),

                                     tempDataMQ.get(), tempStatusMQ.get(), tempElfGroup.get());

    sp<ReadThread> tempReadThread =

            new ReadThread(&mStopReadThread, mStream, tempCommandMQ.get(), tempDataMQ.get(),

                           tempStatusMQ.get(), tempElfGroup.get());

    if (!tempReadThread->init()) {

        ALOGW("failed to start reader thread: %s", strerror(-status));

        sendError(Result::INVALID_ARGUMENTS);
@@ -430,7 +430,7 @@ Return<void> StreamIn::prepareForReading(uint32_t frameSize, uint32_t framesCoun 
    mCommandMQ = std::move(tempCommandMQ);

    mDataMQ = std::move(tempDataMQ);

    mStatusMQ = std::move(tempStatusMQ);

    mReadThread = tempReadThread.release();

    mReadThread = tempReadThread;

    mEfGroup = tempElfGroup.release();

#if MAJOR_VERSION <= 6

    threadInfo.pid = getpid();

audio/core/all-versions/default/StreamOut.cpp

+4 −4
Original line number Diff line number Diff line
@@ -398,9 +398,9 @@ Return<void> StreamOut::prepareForWriting(uint32_t frameSize, uint32_t framesCou 
    }



    // Create and launch the thread.

    auto tempWriteThread =

        std::make_unique<WriteThread>(&mStopWriteThread, mStream, tempCommandMQ.get(),

                                      tempDataMQ.get(), tempStatusMQ.get(), tempElfGroup.get());

    sp<WriteThread> tempWriteThread =

            new WriteThread(&mStopWriteThread, mStream, tempCommandMQ.get(), tempDataMQ.get(),

                            tempStatusMQ.get(), tempElfGroup.get());

    if (!tempWriteThread->init()) {

        ALOGW("failed to start writer thread: %s", strerror(-status));

        sendError(Result::INVALID_ARGUMENTS);
@@ -416,7 +416,7 @@ Return<void> StreamOut::prepareForWriting(uint32_t frameSize, uint32_t framesCou 
    mCommandMQ = std::move(tempCommandMQ);

    mDataMQ = std::move(tempDataMQ);

    mStatusMQ = std::move(tempStatusMQ);

    mWriteThread = tempWriteThread.release();

    mWriteThread = tempWriteThread;

    mEfGroup = tempElfGroup.release();

#if MAJOR_VERSION <= 6

    threadInfo.pid = getpid();