summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2015-03-10 15:54:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-10 15:54:56 +0000
commit0655386a0dc15fc31883d2e38917ff0e9db89ae7 (patch)
tree0c584cc0f996135b2bc795e95aba33cdc13abe60
parent1c2a7a6391a5465cb5b059bb004fbbc884ce1a29 (diff)
parentc6bd5db9d9cf4bba1649b5b7ddea2d23f5de23a9 (diff)
downloadframeworks_av-0655386a0dc15fc31883d2e38917ff0e9db89ae7.zip
frameworks_av-0655386a0dc15fc31883d2e38917ff0e9db89ae7.tar.gz
frameworks_av-0655386a0dc15fc31883d2e38917ff0e9db89ae7.tar.bz2
Merge "fix flush on HW A/V sync tracks"
-rw-r--r--media/libmedia/AudioTrack.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 0ad9cc0..c775e7b 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -299,6 +299,9 @@ status_t AudioTrack::set(
ALOGV("Building AudioTrack with attributes: usage=%d content=%d flags=0x%x tags=[%s]",
mAttributes.usage, mAttributes.content_type, mAttributes.flags, mAttributes.tags);
mStreamType = AUDIO_STREAM_DEFAULT;
+ if ((mAttributes.flags & AUDIO_FLAG_HW_AV_SYNC) != 0) {
+ flags = (audio_output_flags_t)(flags | AUDIO_OUTPUT_FLAG_HW_AV_SYNC);
+ }
}
// these below should probably come from the audioFlinger too...