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

Commit 8ebc6805 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "Clean up AudioTrackThread and AudioRecordThread constructor"

parents 62683a3f ca35367b

media/libaudioclient/AudioRecord.cpp

+2 −3
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ status_t AudioRecord::set( 
    mCbf = cbf;



    if (cbf != NULL) {

        mAudioRecordThread = new AudioRecordThread(*this, threadCanCallJava);

        mAudioRecordThread = new AudioRecordThread(*this);

        mAudioRecordThread->run("AudioRecord", ANDROID_PRIORITY_AUDIO);

        // thread begins in paused state, and will not reference us until start()

    }
@@ -1390,8 +1390,7 @@ void AudioRecord::DeathNotifier::binderDied(const wp<IBinder>& who __unused) 


// =========================================================================



AudioRecord::AudioRecordThread::AudioRecordThread(AudioRecord& receiver,

        bool bCanCallJava __unused)

AudioRecord::AudioRecordThread::AudioRecordThread(AudioRecord& receiver)

    : Thread(true /* bCanCallJava */)  // binder recursion on restoreRecord_l() may call Java.

    , mReceiver(receiver), mPaused(true), mPausedInt(false), mPausedNs(0LL),

      mIgnoreNextPausedInt(false)

media/libaudioclient/AudioTrack.cpp

+2 −2
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ status_t AudioTrack::set( 
    mCbf = cbf;



    if (cbf != NULL) {

        mAudioTrackThread = new AudioTrackThread(*this, threadCanCallJava);

        mAudioTrackThread = new AudioTrackThread(*this);

        mAudioTrackThread->run("AudioTrack", ANDROID_PRIORITY_AUDIO, 0 /*stack*/);

        // thread begins in paused state, and will not reference us until start()

    }
@@ -3085,7 +3085,7 @@ void AudioTrack::DeathNotifier::binderDied(const wp<IBinder>& who __unused) 


// =========================================================================



AudioTrack::AudioTrackThread::AudioTrackThread(AudioTrack& receiver, bool bCanCallJava __unused)

AudioTrack::AudioTrackThread::AudioTrackThread(AudioTrack& receiver)

    : Thread(true /* bCanCallJava */)  // binder recursion on restoreTrack_l() may call Java.

    , mReceiver(receiver), mPaused(true), mPausedInt(false), mPausedNs(0LL),

      mIgnoreNextPausedInt(false)

media/libaudioclient/include/media/AudioRecord.h

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ private: 
    class AudioRecordThread : public Thread

    {

    public:

        AudioRecordThread(AudioRecord& receiver, bool bCanCallJava = false);

        AudioRecordThread(AudioRecord& receiver);



        // Do not call Thread::requestExitAndWait() without first calling requestExit().

        // Thread::requestExitAndWait() is not virtual, and the implementation doesn't do enough.

media/libaudioclient/include/media/AudioTrack.h

+1 −1
Original line number Diff line number Diff line
@@ -934,7 +934,7 @@ public: 
    class AudioTrackThread : public Thread

    {

    public:

        AudioTrackThread(AudioTrack& receiver, bool bCanCallJava = false);

        AudioTrackThread(AudioTrack& receiver);



        // Do not call Thread::requestExitAndWait() without first calling requestExit().

        // Thread::requestExitAndWait() is not virtual, and the implementation doesn't do enough.