diff options
Diffstat (limited to 'services/audioflinger/AudioMixer.cpp')
-rw-r--r-- | services/audioflinger/AudioMixer.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp index 6e9319d..7c7fa56 100644 --- a/services/audioflinger/AudioMixer.cpp +++ b/services/audioflinger/AudioMixer.cpp @@ -99,7 +99,7 @@ AudioMixer::AudioMixer(size_t frameCount, uint32_t sampleRate) n++; } if (mask) { - LOGV("add track (%d)", n); + ALOGV("add track (%d)", n); mTrackNames |= mask; return TRACK0 + n; } @@ -118,7 +118,7 @@ AudioMixer::AudioMixer(size_t frameCount, uint32_t sampleRate) { name -= TRACK0; if (uint32_t(name) < MAX_NUM_TRACKS) { - LOGV("deleteTrackName(%d)", name); + ALOGV("deleteTrackName(%d)", name); track_t& track(mState.tracks[ name ]); if (track.enabled != 0) { track.enabled = 0; @@ -143,7 +143,7 @@ status_t AudioMixer::enable(int name) case MIXING: { if (mState.tracks[ mActiveTrack ].enabled != 1) { mState.tracks[ mActiveTrack ].enabled = 1; - LOGV("enable(%d)", mActiveTrack); + ALOGV("enable(%d)", mActiveTrack); invalidateState(1<<mActiveTrack); } } break; @@ -159,7 +159,7 @@ status_t AudioMixer::disable(int name) case MIXING: { if (mState.tracks[ mActiveTrack ].enabled != 0) { mState.tracks[ mActiveTrack ].enabled = 0; - LOGV("disable(%d)", mActiveTrack); + ALOGV("disable(%d)", mActiveTrack); invalidateState(1<<mActiveTrack); } } break; @@ -192,7 +192,7 @@ status_t AudioMixer::setParameter(int target, int name, void *value) if ((channelCount <= MAX_NUM_CHANNELS) && (channelCount)) { mState.tracks[ mActiveTrack ].channelMask = mask; mState.tracks[ mActiveTrack ].channelCount = channelCount; - LOGV("setParameter(TRACK, CHANNEL_MASK, %x)", mask); + ALOGV("setParameter(TRACK, CHANNEL_MASK, %x)", mask); invalidateState(1<<mActiveTrack); return NO_ERROR; } @@ -203,7 +203,7 @@ status_t AudioMixer::setParameter(int target, int name, void *value) if (name == MAIN_BUFFER) { if (mState.tracks[ mActiveTrack ].mainBuffer != valueBuf) { mState.tracks[ mActiveTrack ].mainBuffer = valueBuf; - LOGV("setParameter(TRACK, MAIN_BUFFER, %p)", valueBuf); + ALOGV("setParameter(TRACK, MAIN_BUFFER, %p)", valueBuf); invalidateState(1<<mActiveTrack); } return NO_ERROR; @@ -211,7 +211,7 @@ status_t AudioMixer::setParameter(int target, int name, void *value) if (name == AUX_BUFFER) { if (mState.tracks[ mActiveTrack ].auxBuffer != valueBuf) { mState.tracks[ mActiveTrack ].auxBuffer = valueBuf; - LOGV("setParameter(TRACK, AUX_BUFFER, %p)", valueBuf); + ALOGV("setParameter(TRACK, AUX_BUFFER, %p)", valueBuf); invalidateState(1<<mActiveTrack); } return NO_ERROR; @@ -223,7 +223,7 @@ status_t AudioMixer::setParameter(int target, int name, void *value) if (valueInt > 0) { track_t& track = mState.tracks[ mActiveTrack ]; if (track.setResampler(uint32_t(valueInt), mSampleRate)) { - LOGV("setParameter(RESAMPLE, SAMPLE_RATE, %u)", + ALOGV("setParameter(RESAMPLE, SAMPLE_RATE, %u)", uint32_t(valueInt)); invalidateState(1<<mActiveTrack); } @@ -242,7 +242,7 @@ status_t AudioMixer::setParameter(int target, int name, void *value) if ((uint32_t(name-VOLUME0) < MAX_NUM_CHANNELS)) { track_t& track = mState.tracks[ mActiveTrack ]; if (track.volume[name-VOLUME0] != valueInt) { - LOGV("setParameter(VOLUME, VOLUME0/1: %04x)", valueInt); + ALOGV("setParameter(VOLUME, VOLUME0/1: %04x)", valueInt); track.prevVolume[name-VOLUME0] = track.volume[name-VOLUME0] << 16; track.volume[name-VOLUME0] = valueInt; if (target == VOLUME) { @@ -262,7 +262,7 @@ status_t AudioMixer::setParameter(int target, int name, void *value) } else if (name == AUXLEVEL) { track_t& track = mState.tracks[ mActiveTrack ]; if (track.auxLevel != valueInt) { - LOGV("setParameter(VOLUME, AUXLEVEL: %04x)", valueInt); + ALOGV("setParameter(VOLUME, AUXLEVEL: %04x)", valueInt); track.prevAuxLevel = track.auxLevel << 16; track.auxLevel = valueInt; if (target == VOLUME) { @@ -445,7 +445,7 @@ void AudioMixer::process__validate(state_t* state) } } - LOGV("mixer configuration change: %d activeTracks (%08x) " + ALOGV("mixer configuration change: %d activeTracks (%08x) " "all16BitsStereoNoResample=%d, resampling=%d, volumeRamp=%d", countActiveTracks, state->enabledTracks, all16BitsStereoNoResample, resampling, volumeRamp); |