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

am: ffec10fcd5

Change-Id: Ie914337e190ba49d7ce4f0b3a3e485a14a4dd3d2

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