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

Commit 82ceac02 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "set() in AudioRecord and AudioTracks needs no lock"

parents 21b51b61 bfd31840

include/media/AudioRecord.h

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ public: 


    /* Initialize an AudioRecord that was created using the AudioRecord() constructor.

     * Don't call set() more than once, or after an AudioRecord() constructor that takes parameters.

     * set() is not multi-thread safe.

     * Returned status (from utils/Errors.h) can be:

     *  - NO_ERROR: successful intialization

     *  - INVALID_OPERATION: AudioRecord is already initialized or record device is already in use

include/media/AudioTrack.h

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ public: 


    /* Initialize an AudioTrack that was created using the AudioTrack() constructor.

     * Don't call set() more than once, or after the AudioTrack() constructors that take parameters.

     * set() is not multi-thread safe.

     * Returned status (from utils/Errors.h) can be:

     *  - NO_ERROR: successful initialization

     *  - INVALID_OPERATION: AudioTrack is already initialized

media/libmedia/AudioRecord.cpp

+1 −2
Original line number Diff line number Diff line
@@ -161,8 +161,6 @@ status_t AudioRecord::set( 
    }

    mTransfer = transferType;



    AutoMutex lock(mLock);



    // invariant that mAudioRecord != 0 is true only after set() returns successfully

    if (mAudioRecord != 0) {

        ALOGE("Track already in use");
@@ -235,6 +233,7 @@ status_t AudioRecord::set( 
    if (cbf != NULL) {

        mAudioRecordThread = new AudioRecordThread(*this, threadCanCallJava);

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

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

    }



    // create the IAudioRecord

media/libmedia/AudioTrack.cpp

+1 −2
Original line number Diff line number Diff line
@@ -274,8 +274,6 @@ status_t AudioTrack::set( 


    ALOGV("set() streamType %d frameCount %zu flags %04x", streamType, frameCount, flags);



    AutoMutex lock(mLock);



    // invariant that mAudioTrack != 0 is true only after set() returns successfully

    if (mAudioTrack != 0) {

        ALOGE("Track already in use");
@@ -401,6 +399,7 @@ status_t AudioTrack::set( 
    if (cbf != NULL) {

        mAudioTrackThread = new AudioTrackThread(*this, threadCanCallJava);

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

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

    }



    // create the IAudioTrack