diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-03-12 15:05:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-12 15:05:21 -0700 |
| commit | db9c21e75411232c2dae8df35e821142e7243a8b (patch) | |
| tree | fac3904c20d35cb60c5b5e5ba1158b4f4dae55cb | |
| parent | b8f8809472e075a5b0318cf43b86e3dfb1bab082 (diff) | |
| parent | 8d8557ad578fa43fe9b1800db03a0a53afbe78c1 (diff) | |
| download | frameworks_base-db9c21e75411232c2dae8df35e821142e7243a8b.zip frameworks_base-db9c21e75411232c2dae8df35e821142e7243a8b.tar.gz frameworks_base-db9c21e75411232c2dae8df35e821142e7243a8b.tar.bz2 | |
Merge "Remove virtual from methods that don't need it"
| -rw-r--r-- | include/media/IAudioFlinger.h | 2 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h index c723b6d..0f39cf3 100644 --- a/include/media/IAudioFlinger.h +++ b/include/media/IAudioFlinger.h @@ -78,6 +78,8 @@ public: virtual int channelCount(audio_io_handle_t output) const = 0; virtual audio_format_t format(audio_io_handle_t output) const = 0; virtual size_t frameCount(audio_io_handle_t output) const = 0; + + // return estimated latency in milliseconds virtual uint32_t latency(audio_io_handle_t output) const = 0; /* set/get the audio hardware state. This will probably be used by diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 194b826..141a31e 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -826,7 +826,7 @@ private: audio_io_handle_t id, uint32_t device, type_t type); virtual ~PlaybackThread(); - virtual status_t dump(int fd, const Vector<String16>& args); + status_t dump(int fd, const Vector<String16>& args); // Thread virtuals virtual status_t readyToRun(); @@ -855,7 +855,8 @@ public: virtual status_t initCheck() const { return (mOutput == NULL) ? NO_INIT : NO_ERROR; } - virtual uint32_t latency() const; + // return estimated latency in milliseconds, as reported by HAL + uint32_t latency() const; void setMasterVolume(float value); void setMasterMute(bool muted); @@ -886,7 +887,7 @@ public: bool isSuspended() const { return (mSuspended > 0); } virtual String8 getParameters(const String8& keys); virtual void audioConfigChanged_l(int event, int param = 0); - virtual status_t getRenderPosition(uint32_t *halFrames, uint32_t *dspFrames); + status_t getRenderPosition(uint32_t *halFrames, uint32_t *dspFrames); int16_t *mixBuffer() const { return mMixBuffer; }; virtual void detachAuxEffect_l(int effectId); |