diff options
author | Eric Laurent <elaurent@google.com> | 2010-09-21 14:52:01 -0700 |
---|---|---|
committer | Eric Laurent <elaurent@google.com> | 2010-09-21 15:11:50 -0700 |
commit | 0e75f0f0147baeb6277c3dcc4403cf0201155a99 (patch) | |
tree | 0136b0ebc6a1115a6a1181baee81a0cc191a0d1b /media/libeffects/visualizer/EffectVisualizer.cpp | |
parent | e9364134485f78f8e8354b27419b67646f343812 (diff) | |
download | frameworks_av-0e75f0f0147baeb6277c3dcc4403cf0201155a99.zip frameworks_av-0e75f0f0147baeb6277c3dcc4403cf0201155a99.tar.gz frameworks_av-0e75f0f0147baeb6277c3dcc4403cf0201155a99.tar.bz2 |
Fix issue 2913071.
Scale audio signal during capture according to peak level so that
returned values on 8 bits contain enough information even for weak
signals.
Also do not reject requests to enable/disable the visualizer if we are
already in the requested state.
Change-Id: I07a705619764350834e61f82d161761eab688747
Diffstat (limited to 'media/libeffects/visualizer/EffectVisualizer.cpp')
-rw-r--r-- | media/libeffects/visualizer/EffectVisualizer.cpp | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/media/libeffects/visualizer/EffectVisualizer.cpp b/media/libeffects/visualizer/EffectVisualizer.cpp index 8ab57c9..03a6bbb 100644 --- a/media/libeffects/visualizer/EffectVisualizer.cpp +++ b/media/libeffects/visualizer/EffectVisualizer.cpp @@ -239,6 +239,24 @@ extern "C" int Visualizer_process( } // all code below assumes stereo 16 bit PCM output and input + + // derive capture scaling factor from peak value in current buffer + // this gives more interesting captures for display. + int32_t shift = 32; + for (size_t i = 0; i < inBuffer->frameCount; i++) { + int32_t smp = inBuffer->s16[i]; + if (smp < 0) smp = -smp; + int32_t clz = __builtin_clz(smp); + if (shift > clz) shift = clz; + } + // never scale by less than 8 to avoid returning unaltered PCM signal. + // add one to combine the division by 2 needed after summing left and right channels below + if (20 > shift) { + shift = (31 - 8 + 1) - shift; + } else { + shift = (3 + 1); + } + uint32_t captIdx; uint32_t inIdx; uint8_t *buf = pContext->mCaptureBuf[pContext->mCurrentBuf]; @@ -246,7 +264,7 @@ extern "C" int Visualizer_process( inIdx < inBuffer->frameCount && captIdx < pContext->mCaptureSize; inIdx++, captIdx++) { int32_t smp = inBuffer->s16[2 * inIdx] + inBuffer->s16[2 * inIdx + 1]; - smp = (smp + (1 << 8)) >> 9; + smp = (smp + (1 << (shift - 1))) >> shift; buf[captIdx] = ((uint8_t)smp)^0x80; } pContext->mCaptureIdx = captIdx; @@ -369,7 +387,7 @@ extern "C" int Visualizer_command(effect_interface_t self, uint32_t cmdCode, uin case VISU_CMD_CAPTURE: - if (pReplyData == NULL || *replySize != (int)pContext->mCaptureSize) { + if (pReplyData == NULL || *replySize != pContext->mCaptureSize) { LOGV("VISU_CMD_CAPTURE() error *replySize %d pContext->mCaptureSize %d", *replySize, pContext->mCaptureSize); return -EINVAL; |