diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-07-03 23:37:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-02 18:17:00 +0000 |
| commit | 5ba4440c11eb975ec0e104e0af1981838f42f57c (patch) | |
| tree | d925693d3af7691ffdbc46fde146b7e13eb24285 | |
| parent | 0d3679e21146bfa497c38842c80ae1f9906a042a (diff) | |
| parent | f947dbce4390f2c3c460325d37002a34f09c0b74 (diff) | |
| download | frameworks_av-5ba4440c11eb975ec0e104e0af1981838f42f57c.zip frameworks_av-5ba4440c11eb975ec0e104e0af1981838f42f57c.tar.gz frameworks_av-5ba4440c11eb975ec0e104e0af1981838f42f57c.tar.bz2 | |
Merge "Remove obsolete IAudioFlinger::channelCount()"
| -rw-r--r-- | include/media/IAudioFlinger.h | 3 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 11 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 1 | ||||
| -rw-r--r-- | services/audioflinger/Threads.h | 1 |
4 files changed, 0 insertions, 16 deletions
diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index fc8be20..83b4d13 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -97,9 +97,6 @@ public: * and therefore can be cached. */ virtual uint32_t sampleRate(audio_io_handle_t output) const = 0; -#if 0 - virtual int channelCount(audio_io_handle_t output) const = 0; -#endif virtual audio_format_t format(audio_io_handle_t output) const = 0; virtual size_t frameCount(audio_io_handle_t output) const = 0; diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 11a01cc..a269886 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -668,17 +668,6 @@ uint32_t AudioFlinger::sampleRate(audio_io_handle_t output) const return thread->sampleRate(); } -int AudioFlinger::channelCount(audio_io_handle_t output) const -{ - Mutex::Autolock _l(mLock); - PlaybackThread *thread = checkPlaybackThread_l(output); - if (thread == NULL) { - ALOGW("channelCount() unknown thread %d", output); - return 0; - } - return thread->channelCount(); -} - audio_format_t AudioFlinger::format(audio_io_handle_t output) const { Mutex::Autolock _l(mLock); diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index ddc6afb..1ccef24 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -125,7 +125,6 @@ public: status_t *status /*non-NULL*/); virtual uint32_t sampleRate(audio_io_handle_t output) const; - virtual int channelCount(audio_io_handle_t output) const; virtual audio_format_t format(audio_io_handle_t output) const; virtual size_t frameCount(audio_io_handle_t output) const; virtual uint32_t latency(audio_io_handle_t output) const; diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h index 93d2635..3eb1eb9 100644 --- a/services/audioflinger/Threads.h +++ b/services/audioflinger/Threads.h @@ -233,7 +233,6 @@ public: // dynamic externally-visible uint32_t sampleRate() const { return mSampleRate; } - uint32_t channelCount() const { return mChannelCount; } audio_channel_mask_t channelMask() const { return mChannelMask; } audio_format_t format() const { return mFormat; } // Called by AudioFlinger::frameCount(audio_io_handle_t output) and effects, |