summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-05-01 19:31:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-01 19:31:31 +0000
commitb4eacebfc5c5fd86b20661eab0797ce70c66e323 (patch)
tree5137b2fffa0990b6658d184709b8c3a6739859e0 /media/libstagefright
parent3c782246d5ee9869f2167a00df748eac1b9e9153 (diff)
parent1afedc4d99acd52f99221d71b3a372a0a5497a84 (diff)
downloadframeworks_av-b4eacebfc5c5fd86b20661eab0797ce70c66e323.zip
frameworks_av-b4eacebfc5c5fd86b20661eab0797ce70c66e323.tar.gz
frameworks_av-b4eacebfc5c5fd86b20661eab0797ce70c66e323.tar.bz2
am 1afedc4d: am 6eafba6b: Merge "Temporary workaround for log spam"
* commit '1afedc4d99acd52f99221d71b3a372a0a5497a84': Temporary workaround for log spam
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp b/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
index 515e4d3..8f356b6 100644
--- a/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
+++ b/media/libstagefright/codecs/vorbis/dec/SoftVorbis.cpp
@@ -355,7 +355,12 @@ void SoftVorbis::onQueueFilled(OMX_U32 portIndex) {
outHeader->nFlags = 0;
int err = vorbis_dsp_synthesis(mState, &pack, 1);
if (err != 0) {
+ // FIXME temporary workaround for log spam
+#if !defined(__arm__) && !defined(__aarch64__)
+ ALOGV("vorbis_dsp_synthesis returned %d", err);
+#else
ALOGW("vorbis_dsp_synthesis returned %d", err);
+#endif
} else {
numFrames = vorbis_dsp_pcmout(
mState, (int16_t *)outHeader->pBuffer,