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

Merge "Optimize HW_AV_SYNC playback by avoiding multiple timestamp block allocations." into oc-dev

Browse Source 
am: e0e55f535a

Change-Id: I8fb4d8f1a1d237aa28780f6f419b9a8fd6131a06
This commit is contained in:
Paul Mclean
2017-04-12 15:27:20 +00:00
committed by android-build-merger
parent 27a8061a96 e0e55f535a
commit ffec10fcd5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2523,8 +2523,11 @@ public class AudioTrack extends PlayerBase
mAvSyncHeader = ByteBuffer.allocate(16); mAvSyncHeader = ByteBuffer.allocate(16);
mAvSyncHeader.order(ByteOrder.BIG_ENDIAN); mAvSyncHeader.order(ByteOrder.BIG_ENDIAN);
mAvSyncHeader.putInt(0x55550001); mAvSyncHeader.putInt(0x55550001);
mAvSyncHeader.putInt(sizeInBytes); }
mAvSyncHeader.putLong(timestamp);
if (mAvSyncBytesRemaining == 0) {
mAvSyncHeader.putInt(4, sizeInBytes);
mAvSyncHeader.putLong(8, timestamp);
mAvSyncHeader.position(0); mAvSyncHeader.position(0);
mAvSyncBytesRemaining = sizeInBytes; mAvSyncBytesRemaining = sizeInBytes;
} }
@@ -2556,9 +2559,6 @@ public class AudioTrack extends PlayerBase
} }
mAvSyncBytesRemaining -= ret; mAvSyncBytesRemaining -= ret;
if (mAvSyncBytesRemaining == 0) {
mAvSyncHeader = null;
}
return ret; return ret;
} }