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

Commit c06aabf3 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "libaudiohal: Modify calculation of buffer duration for mmap streams"... 

Merge "libaudiohal: Modify calculation of buffer duration for mmap streams" into main am: 99b8c6ba

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



Change-Id: I169d76064f026e8a060c8920a1ff27fd981cc79b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bb5d2014 99b8c6ba

media/libaudiohal/impl/StreamHalAidl.h

+3 −2
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ class StreamContextAidl { 
    size_t getBufferSizeBytes() const { return mFrameSizeBytes * mBufferSizeFrames; }

    size_t getBufferSizeFrames() const { return mBufferSizeFrames; }

    size_t getBufferDurationMs(int32_t sampleRate) const {

        return sampleRate != 0 ? mBufferSizeFrames * MILLIS_PER_SECOND / sampleRate : 0;

        auto bufferSize = mIsMmapped ? getMmapBurstSize() : mBufferSizeFrames;

        return sampleRate != 0 ? bufferSize * MILLIS_PER_SECOND / sampleRate : 0;

    }

    CommandMQ* getCommandMQ() const { return mCommandMQ.get(); }

    DataMQ* getDataMQ() const { return mDataMQ.get(); }
@@ -104,7 +105,7 @@ class StreamContextAidl { 
    bool isAsynchronous() const { return mIsAsynchronous; }

    bool isMmapped() const { return mIsMmapped; }

    const MmapBufferDescriptor& getMmapBufferDescriptor() const { return mMmapBufferDescriptor; }



    size_t getMmapBurstSize() const { return mMmapBufferDescriptor.burstSizeFrames;}

  private:

    static std::unique_ptr<DataMQ> maybeCreateDataMQ(

            const ::aidl::android::hardware::audio::core::StreamDescriptor& descriptor) {