diff options
| author | Eric Laurent <elaurent@google.com> | 2010-07-19 10:23:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-19 10:23:00 -0700 |
| commit | bbf6dcd2aa8eb877e6412aaade25a077f62a6284 (patch) | |
| tree | 5077dba2bb0d9fbca46670506bfd683ee9383752 /media/libeffects/visualizer | |
| parent | f913c25c713cbe0fe16dd1cc17bdfaba6b77070f (diff) | |
| parent | 296ac39f69df0b398685ab19e9bb257fdb7aa75d (diff) | |
| download | frameworks_av-bbf6dcd2aa8eb877e6412aaade25a077f62a6284.zip frameworks_av-bbf6dcd2aa8eb877e6412aaade25a077f62a6284.tar.gz frameworks_av-bbf6dcd2aa8eb877e6412aaade25a077f62a6284.tar.bz2 | |
am 3c6ea955: am 7203272f: Merge "Fixed problems in audio effect volume control." into gingerbread
Merge commit '3c6ea95553d3a0e416874c583a41efff3f6fbc57'
* commit '3c6ea95553d3a0e416874c583a41efff3f6fbc57':
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 |