commit 8ce8e264d0bf09ec131e4a7701fe1ebc3a678f8b
author Eric Laurent <elaurent@google.com> Tue Feb 16 11:59:23 2016 -0800
committer Eric Laurent <elaurent@google.com> Tue Feb 16 11:59:23 2016 -0800
tree 0938951613cb0d2725a01f84840571c4c50a0998
parent bc57b12030cbd4885d9231e721bbfed1b6522212

Revert "Enable FastTrack timestamps"

This reverts commit b3a486fecddc9e9264fe63d356eca0812493db27.

Reverting while investigating the root cause.

Bug: 27186414

include/private/media/AudioTrackShared.h

diff --git a/include/private/media/AudioTrackShared.h b/include/private/media/AudioTrackShared.h
index cae5560..2270c85 100644
--- a/include/private/media/AudioTrackShared.h
+++ b/include/private/media/AudioTrackShared.h
@@ -119,11 +119,8 @@
 
 typedef SingleStateQueue<AudioPlaybackRate> PlaybackRateQueue;
 
-
 typedef SingleStateQueue<ExtendedTimestamp> ExtendedTimestampQueue;
 
-typedef SingleStateQueue<AudioTimestamp> TimestampQueue;
-
 // ----------------------------------------------------------------------------
 
 // Important: do not add any virtual methods, including ~
@@ -178,9 +175,7 @@
                 uint16_t    mPad2;           // unused
 
                 // server write-only, client read
-                ExtendedTimestampQueue::Shared mExtendedTimestampQueue; // capture
-                TimestampQueue::Shared mTimestampQueue; // playback
-
+                ExtendedTimestampQueue::Shared mExtendedTimestampQueue;
 public:
 
     volatile    int32_t     mFlags;         // combinations of CBLK_*
@@ -338,10 +333,7 @@
             size_t frameSize, bool clientInServer = false)
         : ClientProxy(cblk, buffers, frameCount, frameSize, true /*isOut*/,
           clientInServer),
-          mPlaybackRateMutator(&cblk->mPlaybackRateQueue),
-          mTimestampObserver(&cblk->mTimestampQueue) {
-    }
-
+          mPlaybackRateMutator(&cblk->mPlaybackRateQueue) { }
     virtual ~AudioTrackClientProxy() { }
 
     // No barriers on the following operations, so the ordering of loads/stores
@@ -365,20 +357,6 @@
         mPlaybackRateMutator.push(playbackRate);
     }
 
-    status_t    getTimestamp(AudioTimestamp *timestamp) {
-        if (timestamp == nullptr) {
-            return BAD_VALUE;
-        }
-        (void) mTimestampObserver.poll(mTimestamp);
-        // if no data is pushed by server, mTimestamp should be initialized by its constructor
-        // to all zero elements.
-        if (mTimestamp.mTime.tv_sec == 0 && mTimestamp.mTime.tv_nsec == 0) {
-            return WOULD_BLOCK;
-        }
-        *timestamp = mTimestamp;
-        return OK;
-    }
-
     virtual void flush();
 
     virtual uint32_t    getUnderrunFrames() const {
@@ -396,8 +374,6 @@
 
 private:
     PlaybackRateQueue::Mutator   mPlaybackRateMutator;
-    TimestampQueue::Observer mTimestampObserver;
-    AudioTimestamp mTimestamp;
 };
 
 class StaticAudioTrackClientProxy : public AudioTrackClientProxy {
@@ -546,8 +522,7 @@
             size_t frameSize, bool clientInServer = false, uint32_t sampleRate = 0)
         : ServerProxy(cblk, buffers, frameCount, frameSize, true /*isOut*/, clientInServer),
           mPlaybackRateObserver(&cblk->mPlaybackRateQueue),
-          mUnderrunCount(0), mUnderrunning(false),
-          mTimestampMutator(&cblk->mTimestampQueue) {
+          mUnderrunCount(0), mUnderrunning(false) {
         mCblk->mSampleRate = sampleRate;
         mPlaybackRate = AUDIO_PLAYBACK_RATE_DEFAULT;
     }
@@ -587,11 +562,6 @@
     // Return the playback speed and pitch read atomically. Not multi-thread safe on server side.
     AudioPlaybackRate getPlaybackRate();
 
-    // Expose timestamp to client proxy. Should only be called by a single thread.
-                   void setTimestamp(const AudioTimestamp &timestamp) {
-                       mTimestampMutator.push(timestamp);
-                   }
-
 private:
     AudioPlaybackRate             mPlaybackRate;  // last observed playback rate
     PlaybackRateQueue::Observer   mPlaybackRateObserver;
@@ -599,8 +569,6 @@
     // The server keeps a copy here where it is safe from the client.
     uint32_t                      mUnderrunCount; // echoed to mCblk
     bool                          mUnderrunning;  // used to detect edge of underrun
-
-    TimestampQueue::Mutator       mTimestampMutator;
 };
 
 class StaticAudioTrackServerProxy : public AudioTrackServerProxy {