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

Commit 6a4a7732 authored by Eddy-SH Chen's avatar Eddy-SH Chen Committed by Hongguang Chen
Browse files

audio: fix getFrame overflow after long-term playback 

The aidl implementation of getFrameCount() encounters an overflow,
causing the audio position to become abnormal. Since the return
type of getFrameCount is long which size is 4 byptes, it will
encounter an overflow after 12.43 hours of continuous playback.

Bug: 387877971
Change-Id: I3bce2730e28ebfe3f2237cff94342aac2a2eb9ef
parent c497ce72

audio/aidl/default/include/core-impl/Stream.h

+3 −3
Original line number Diff line number Diff line
@@ -146,8 +146,8 @@ class StreamContext { 
    // locking because it only cleans MQ pointers which were also set on the Binder thread.

    void reset();

    // 'advanceFrameCount' and 'getFrameCount' are only called on the worker thread.

    long advanceFrameCount(size_t increase) { return mFrameCount += increase; }

    long getFrameCount() const { return mFrameCount; }

    int64_t advanceFrameCount(size_t increase) { return mFrameCount += increase; }

    int64_t getFrameCount() const { return mFrameCount; }



  private:

    // Fields are non const to allow move assignment.
@@ -165,7 +165,7 @@ class StreamContext { 
    std::shared_ptr<IStreamOutEventCallback> mOutEventCallback;  // Only used by output streams

    std::weak_ptr<sounddose::StreamDataProcessorInterface> mStreamDataProcessor;

    DebugParameters mDebugParameters;

    long mFrameCount = 0;

    int64_t mFrameCount = 0;

};



// This interface provides operations of the stream which are executed on the worker thread.