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

Commit db44c5d1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fixed audioserver crash in monkey test"

parents 1949fae2 69ec67ef

media/libaudioclient/ToneGenerator.cpp

+6 −4
Original line number Diff line number Diff line
@@ -1379,16 +1379,18 @@ void ToneGenerator::audioCallback(int event, void* user, void *info) { 
                        lWaveCmd = WaveGenerator::WAVEGEN_START;

                    }



                    ALOGV("New segment %d, Next Time: %d", lpToneGen->mCurSegment,

                            (lpToneGen->mNextSegSmp*1000)/lpToneGen->mSamplingRate);

                    ALOGV("New segment %d, Next Time: %lld", lpToneGen->mCurSegment,

                            ((long long)(lpToneGen->mNextSegSmp)*1000)/lpToneGen->mSamplingRate);





                } else {

                    lGenSmp = 0;

                    ALOGV("End repeat, time: %d", (unsigned int)(systemTime()/1000000));

                }

            } else {

                ALOGV("New segment %d, Next Time: %d", lpToneGen->mCurSegment,

                        (lpToneGen->mNextSegSmp*1000)/lpToneGen->mSamplingRate);

                ALOGV("New segment %d, Next Time: %lld", lpToneGen->mCurSegment,

                        ((long long)(lpToneGen->mNextSegSmp)*1000)/lpToneGen->mSamplingRate);



                if (lpToneDesc->segments[lpToneGen->mCurSegment].waveFreq[0] != 0) {

                    // If next segment is not silent,  OFF -> ON transition : reset wave generator

                    lWaveCmd = WaveGenerator::WAVEGEN_START;