summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioTrack.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-01-17 20:15:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-01-17 20:15:08 +0000
commit1071915ad4ffb47825a946706f8fa73c0d22d7f8 (patch)
treea67c0a6d91515f0fffb90e102d4897626c5f5d79 /media/libmedia/AudioTrack.cpp
parent9c1aaa7fee4b17d3675af6108c5ff28f3a84c8ec (diff)
parentb5ccb2d99b2af400c70777a6452f090ac14f5a96 (diff)
downloadframeworks_av-1071915ad4ffb47825a946706f8fa73c0d22d7f8.zip
frameworks_av-1071915ad4ffb47825a946706f8fa73c0d22d7f8.tar.gz
frameworks_av-1071915ad4ffb47825a946706f8fa73c0d22d7f8.tar.bz2
Merge "Make copy of audio_offload_info_t for future use"
Diffstat (limited to 'media/libmedia/AudioTrack.cpp')
-rw-r--r--media/libmedia/AudioTrack.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 7e6074d..72be5ca 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -330,6 +330,16 @@ status_t AudioTrack::set(
return BAD_VALUE;
}
+ // Make copy of input parameter offloadInfo so that in the future:
+ // (a) createTrack_l doesn't need it as an input parameter
+ // (b) we can support re-creation of offloaded tracks
+ if (offloadInfo != NULL) {
+ mOffloadInfoCopy = *offloadInfo;
+ mOffloadInfo = &mOffloadInfoCopy;
+ } else {
+ mOffloadInfo = NULL;
+ }
+
mVolume[LEFT] = 1.0f;
mVolume[RIGHT] = 1.0f;
mSendLevel = 0.0f;