diff options
author | Jean-Michel Trivi <jmtrivi@google.com> | 2014-06-24 08:01:46 -0700 |
---|---|---|
committer | Jean-Michel Trivi <jmtrivi@google.com> | 2014-07-01 07:57:32 -0700 |
commit | d9d7fa0873796ac661c44a7fcd6ad5ff697ff01f (patch) | |
tree | 237375ce1605b2d7bd896b23f0a2ba2f0235ae09 /media/libmedia/mediaplayer.cpp | |
parent | f92f22becdf7fce1f55d5ebd80ac2caa2ad55602 (diff) | |
download | frameworks_av-d9d7fa0873796ac661c44a7fcd6ad5ff697ff01f.zip frameworks_av-d9d7fa0873796ac661c44a7fcd6ad5ff697ff01f.tar.gz frameworks_av-d9d7fa0873796ac661c44a7fcd6ad5ff697ff01f.tar.bz2 |
Support for audio attributes on audio output of media player
Change-Id: Iae4995c98e64add1ab9e6c8ae6501515032755f5
Diffstat (limited to 'media/libmedia/mediaplayer.cpp')
-rw-r--r-- | media/libmedia/mediaplayer.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index 406f9f2..889bd7f 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -624,10 +624,32 @@ status_t MediaPlayer::attachAuxEffect(int effectId) return mPlayer->attachAuxEffect(effectId); } +// always call with lock held +status_t MediaPlayer::checkStateForKeySet_l(int key) +{ + switch(key) { + case KEY_PARAMETER_AUDIO_ATTRIBUTES: + if (mCurrentState & ( MEDIA_PLAYER_PREPARED | MEDIA_PLAYER_STARTED | + MEDIA_PLAYER_PAUSED | MEDIA_PLAYER_PLAYBACK_COMPLETE) ) { + // Can't change the audio attributes after prepare + ALOGE("trying to set audio attributes called in state %d", mCurrentState); + return INVALID_OPERATION; + } + break; + default: + // parameter doesn't require player state check + break; + } + return OK; +} + status_t MediaPlayer::setParameter(int key, const Parcel& request) { ALOGV("MediaPlayer::setParameter(%d)", key); Mutex::Autolock _l(mLock); + if (checkStateForKeySet_l(key) != OK) { + return INVALID_OPERATION; + } if (mPlayer != NULL) { return mPlayer->setParameter(key, request); } |