drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am feeaa0ba: am f32d06d8: Merge "Allow set loop and position before write for static AudioTracks" into lmp-mr1-dev

Browse Source 
* commit 'feeaa0ba547188453b668a2b1ef80fd6c7dd3a9a':
  Allow set loop and position before write for static AudioTracks
This commit is contained in:
Andy Hung
2014-11-26 18:42:44 +00:00
committed by Android Git Automerger
parent 5f84109cae feeaa0ba54
commit e356600772
1 changed files with 2 additions and 2 deletions

4
media/java/android/media/AudioTrack.java

@ -1070,7 +1070,7 @@ public class AudioTrack
* {@link #ERROR_INVALID_OPERATION} * {@link #ERROR_INVALID_OPERATION}
*/ */
public int setPlaybackHeadPosition(int positionInFrames) { public int setPlaybackHeadPosition(int positionInFrames) {
if (mDataLoadMode == MODE_STREAM || mState != STATE_INITIALIZED || if (mDataLoadMode == MODE_STREAM || mState == STATE_UNINITIALIZED ||
getPlayState() == PLAYSTATE_PLAYING) { getPlayState() == PLAYSTATE_PLAYING) {
return ERROR_INVALID_OPERATION; return ERROR_INVALID_OPERATION;
} }
@ -1100,7 +1100,7 @@ public class AudioTrack
* {@link #ERROR_INVALID_OPERATION} * {@link #ERROR_INVALID_OPERATION}
*/ */
public int setLoopPoints(int startInFrames, int endInFrames, int loopCount) { public int setLoopPoints(int startInFrames, int endInFrames, int loopCount) {
if (mDataLoadMode == MODE_STREAM || mState != STATE_INITIALIZED || if (mDataLoadMode == MODE_STREAM || mState == STATE_UNINITIALIZED ||
getPlayState() == PLAYSTATE_PLAYING) { getPlayState() == PLAYSTATE_PLAYING) {
return ERROR_INVALID_OPERATION; return ERROR_INVALID_OPERATION;
} }