diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-02-21 23:13:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-21 23:13:58 +0000 |
| commit | d0e0cfa58a35508c14818b88804845194b5d80e1 (patch) | |
| tree | c3e8e508c286de28d506fe80285ecde1f992d829 /services/audioflinger/AudioFlinger.cpp | |
| parent | 3a005b3b19b750afe24577ae322aff4602ca2740 (diff) | |
| parent | f66b42242342017c26eb97de544dae31dd2537ca (diff) | |
| download | frameworks_av-d0e0cfa58a35508c14818b88804845194b5d80e1.zip frameworks_av-d0e0cfa58a35508c14818b88804845194b5d80e1.tar.gz frameworks_av-d0e0cfa58a35508c14818b88804845194b5d80e1.tar.bz2 | |
Merge "Make tee sink work again"
Diffstat (limited to 'services/audioflinger/AudioFlinger.cpp')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 6f2dce3..7615086 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -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; |