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

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

Merge "Rename Visualizer::mLock"

parents 185b8256 55fa4fb4

include/media/Visualizer.h

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ private: 
    void periodicCapture();

    uint32_t initCaptureSize();



    Mutex mLock;

    Mutex mCaptureLock;

    uint32_t mCaptureRate;

    uint32_t mCaptureSize;

    uint32_t mSampleRate;

media/libmedia/Visualizer.cpp

+4 −4
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ Visualizer::~Visualizer() 


status_t Visualizer::setEnabled(bool enabled)

{

    Mutex::Autolock _l(mLock);

    Mutex::Autolock _l(mCaptureLock);



    sp<CaptureThread> t = mCaptureThread;

    if (t != 0) {
@@ -93,7 +93,7 @@ status_t Visualizer::setCaptureCallBack(capture_cbk_t cbk, void* user, uint32_t 
    if (rate > CAPTURE_RATE_MAX) {

        return BAD_VALUE;

    }

    Mutex::Autolock _l(mLock);

    Mutex::Autolock _l(mCaptureLock);



    if (mEnabled) {

        return INVALID_OPERATION;
@@ -129,7 +129,7 @@ status_t Visualizer::setCaptureSize(uint32_t size) 
        return BAD_VALUE;

    }



    Mutex::Autolock _l(mLock);

    Mutex::Autolock _l(mCaptureLock);

    if (mEnabled) {

        return INVALID_OPERATION;

    }
@@ -231,7 +231,7 @@ status_t Visualizer::doFft(uint8_t *fft, uint8_t *waveform) 


void Visualizer::periodicCapture()

{

    Mutex::Autolock _l(mLock);

    Mutex::Autolock _l(mCaptureLock);

    ALOGV("periodicCapture() %p mCaptureCallBack %p mCaptureFlags 0x%08x",

            this, mCaptureCallBack, mCaptureFlags);

    if (mCaptureCallBack != NULL &&