diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-02-20 10:23:28 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-02-21 10:19:25 -0800 |
| commit | f66b42242342017c26eb97de544dae31dd2537ca (patch) | |
| tree | b993ea0b4b7726176de097093f3311037d1f66b8 /services | |
| parent | 56df9ff31d583ad3eae4f279a3df550273c58e1e (diff) | |
| download | frameworks_av-f66b42242342017c26eb97de544dae31dd2537ca.zip frameworks_av-f66b42242342017c26eb97de544dae31dd2537ca.tar.gz frameworks_av-f66b42242342017c26eb97de544dae31dd2537ca.tar.bz2 | |
Make tee sink work again
It was broken by this earlier change to NBAIO:
> Change-Id: I5eda412648b094358f5eefc38300e9ec8a734cd3
But the code was not being compiled, so the error was not caught earlier.
Also increase the default size of per-track pipe to a reasonable value.
Change-Id: Ica05017e6c6533e1fea9df379a9b204eebed4a1f
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 3 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 788559d..4c8b8af 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; diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 4799beb..e7d1483 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -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 |