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

2017-04-12 15:16:17 +00:00
parent b4b44d3bae 3b3ed7af3b
commit e0e55f535a
1 changed files with 5 additions and 5 deletions
--- a/media/java/android/media/AudioTrack.java
+++ b/media/java/android/media/AudioTrack.java
@@ -2523,8 +2523,11 @@ public class AudioTrack extends PlayerBase
            mAvSyncHeader = ByteBuffer.allocate(16);
            mAvSyncHeader.order(ByteOrder.BIG_ENDIAN);
            mAvSyncHeader.putInt(0x55550001);
-            mAvSyncHeader.putInt(sizeInBytes);
-            mAvSyncHeader.putLong(timestamp);
+        }
+
+        if (mAvSyncBytesRemaining == 0) {
+            mAvSyncHeader.putInt(4, sizeInBytes);
+            mAvSyncHeader.putLong(8, timestamp);
            mAvSyncHeader.position(0);
            mAvSyncBytesRemaining = sizeInBytes;
        }
@@ -2556,9 +2559,6 @@ public class AudioTrack extends PlayerBase
        }

        mAvSyncBytesRemaining -= ret;
-        if (mAvSyncBytesRemaining == 0) {
-            mAvSyncHeader = null;
-        }

        return ret;
    }