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

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

Merge "Make tee sink work again"

parents 3a005b3b f66b4224

services/audioflinger/AudioFlinger.cpp

+2 −1
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ AudioFlinger::AudioFlinger() 
        (void) property_get("af.tee", value, "0");

        teeEnabled = atoi(value);

    }

    // FIXME symbolic constants here

    if (teeEnabled & 1) {

        mTeeSinkInputEnabled = true;

    }
@@ -1810,7 +1811,7 @@ audio_io_handle_t AudioFlinger::openInput(audio_module_handle_t module, 
            kind = TEE_SINK_NEW;

        } else if (mRecordTeeSink->getStrongCount() != 1) {

            kind = TEE_SINK_NO;

        } else if (format == mRecordTeeSink->format()) {

        } else if (Format_isEqual(format, mRecordTeeSink->format())) {

            kind = TEE_SINK_OLD;

        } else {

            kind = TEE_SINK_NEW;

services/audioflinger/AudioFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -638,7 +638,7 @@ public: 
    // 0x200000 stereo 16-bit PCM frames = 47.5 seconds at 44.1 kHz, 8 megabytes

    static const size_t kTeeSinkInputFramesDefault = 0x200000;

    static const size_t kTeeSinkOutputFramesDefault = 0x200000;

    static const size_t kTeeSinkTrackFramesDefault = 0x1000;

    static const size_t kTeeSinkTrackFramesDefault = 0x200000;

#endif



    // This method reads from a variable without mLock, but the variable is updated under mLock.  So