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

Commit 9744ab45 authored by Jia Jia's avatar Jia Jia Committed by android-build-merger
Browse files

Merge "Fixed audioserver crash in monkey test" am: db44c5d1 

am: 5e64d794

Change-Id: I137e4b91a0b8e56697963e629173cf5a28a7d8d0
parents 90905a15 5e64d794

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;