Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'f32d06d855a6a7f2cb88886a58cb595518a2bd63':
  Allow set loop and position before write for static AudioTracks
This commit is contained in:
Andy Hung
2014-11-26 02:10:03 +00:00
committed by Android Git Automerger
parent b3cf1136d0 f32d06d855
commit feeaa0ba54
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/AudioTrack.java
View File

@@ -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;
} }