| commit | 5e81f46affaa83bed4e809d710d63948e76c3730 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Apr 17 15:09:49 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 17 15:09:49 2024 +0000 |
| tree | ad432ed3bfde6a993cd83dadabb1a887ebd745c1 | |
| parent | be021bfba784b35b0da9d8ff4004c2f2a51ced34 [diff] | |
| parent | c1654c6dd4dc3339c4e8b37aef00d037deb62ef4 [diff] |
Merge "audio: fix log printing issue" into main am: c1654c6dd4 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3046157 Change-Id: I276dab611b7570a5d210061fdc8febe6cf1c5ad8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/libaudioprocessing/AudioMixerBase.cpp b/media/libaudioprocessing/AudioMixerBase.cpp index 3d11d92..7e362f7 100644 --- a/media/libaudioprocessing/AudioMixerBase.cpp +++ b/media/libaudioprocessing/AudioMixerBase.cpp
@@ -1122,7 +1122,7 @@ aux = t->auxBuffer + numFrames; } for (int outFrames = frameCount; outFrames > 0; ) { - // t->in == nullptr can happen if the track was flushed just after having + // t->mIn == nullptr can happen if the track was flushed just after having // been enabled for mixing. if (t->mIn == nullptr) { break;