summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2010-07-21 09:52:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-21 09:52:17 -0700
commit71ff94cb52874e42dede3c6bc4b86757b72cf0b1 (patch)
treedc47a5d309669d92854762df8fdc948668228ebf /include
parent932e0a11d74d5e236ccef9ee314442385c3d4e9d (diff)
parent552f4053c194770a5c9b37825f222031548dc5a8 (diff)
downloadframeworks_av-71ff94cb52874e42dede3c6bc4b86757b72cf0b1.zip
frameworks_av-71ff94cb52874e42dede3c6bc4b86757b72cf0b1.tar.gz
frameworks_av-71ff94cb52874e42dede3c6bc4b86757b72cf0b1.tar.bz2
am 34161132: am 7070b365: Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
Merge commit '34161132030254bac7dd64c9713832e2f961a061' * commit '34161132030254bac7dd64c9713832e2f961a061': Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
Diffstat (limited to 'include')
-rw-r--r--include/media/AudioTrack.h5
-rw-r--r--include/media/IMediaPlayer.h2
-rw-r--r--include/media/mediaplayer.h3
3 files changed, 8 insertions, 2 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h
index ef537f4..4475d4a 100644
--- a/include/media/AudioTrack.h
+++ b/include/media/AudioTrack.h
@@ -261,8 +261,8 @@ public:
/* set the send level for this track. An auxiliary effect should be attached
* to the track with attachEffect(). Level must be <= 1.0.
*/
- status_t setSendLevel(float level);
- void getSendLevel(float* level);
+ status_t setAuxEffectSendLevel(float level);
+ void getAuxEffectSendLevel(float* level);
/* set sample rate for this track, mostly used for games' sound effects
*/
@@ -479,6 +479,7 @@ private:
uint32_t mUpdatePeriod;
uint32_t mFlags;
int mSessionId;
+ int mAuxEffectId;
};
diff --git a/include/media/IMediaPlayer.h b/include/media/IMediaPlayer.h
index 2619691..af9a7ed 100644
--- a/include/media/IMediaPlayer.h
+++ b/include/media/IMediaPlayer.h
@@ -48,6 +48,8 @@ public:
virtual status_t setVolume(float leftVolume, float rightVolume) = 0;
virtual status_t suspend() = 0;
virtual status_t resume() = 0;
+ virtual status_t setAuxEffectSendLevel(float level) = 0;
+ virtual status_t attachAuxEffect(int effectId) = 0;
// Invoke a generic method on the player by using opaque parcels
// for the request and reply.
diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h
index 4963f73..207191d 100644
--- a/include/media/mediaplayer.h
+++ b/include/media/mediaplayer.h
@@ -173,6 +173,8 @@ public:
status_t resume();
status_t setAudioSessionId(int sessionId);
int getAudioSessionId();
+ status_t setAuxEffectSendLevel(float level);
+ status_t attachAuxEffect(int effectId);
private:
void clear_l();
status_t seekTo_l(int msec);
@@ -200,6 +202,7 @@ private:
int mVideoWidth;
int mVideoHeight;
int mAudioSessionId;
+ float mSendLevel;
};
}; // namespace android