diff options
| author | Eric Laurent <elaurent@google.com> | 2010-07-19 10:19:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-19 10:19:49 -0700 |
| commit | 296ac39f69df0b398685ab19e9bb257fdb7aa75d (patch) | |
| tree | 8e82ee801d8465366f659028f7105ee3ca38d4cc /media/libeffects/visualizer | |
| parent | 26a1138f3a467f2bfe832ff59f50f3cc1f35e834 (diff) | |
| parent | f997cabca292d70d078ae828e21c28e6df62995f (diff) | |
| download | frameworks_av-296ac39f69df0b398685ab19e9bb257fdb7aa75d.zip frameworks_av-296ac39f69df0b398685ab19e9bb257fdb7aa75d.tar.gz frameworks_av-296ac39f69df0b398685ab19e9bb257fdb7aa75d.tar.bz2 | |
am 7203272f: Merge "Fixed problems in audio effect volume control." into gingerbread
Merge commit '7203272f35e40bf9d4b76f1b2f9b0077738df118' into gingerbread-plus-aosp
* commit '7203272f35e40bf9d4b76f1b2f9b0077738df118':
Fixed problems in audio effect volume control.
Diffstat (limited to 'media/libeffects/visualizer')
| -rw-r--r-- | media/libeffects/visualizer/EffectVisualizer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libeffects/visualizer/EffectVisualizer.cpp b/media/libeffects/visualizer/EffectVisualizer.cpp index bcda06e..ec13557 100644 --- a/media/libeffects/visualizer/EffectVisualizer.cpp +++ b/media/libeffects/visualizer/EffectVisualizer.cpp @@ -230,9 +230,6 @@ extern "C" int Visualizer_process( if (pContext == NULL) { return -EINVAL; } - if (pContext->mState != VISUALIZER_STATE_ACTIVE) { - return -ENODATA; - } if (inBuffer == NULL || inBuffer->raw == NULL || outBuffer == NULL || outBuffer->raw == NULL || @@ -269,6 +266,9 @@ extern "C" int Visualizer_process( memcpy(outBuffer->raw, inBuffer->raw, outBuffer->frameCount * 2 * sizeof(int16_t)); } } + if (pContext->mState != VISUALIZER_STATE_ACTIVE) { + return -ENODATA; + } return 0; } // end Visualizer_process |