diff options
| author | Andreas Huber <andih@google.com> | 2012-10-02 14:44:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-02 14:44:31 -0700 |
| commit | c32e307d2a2476d476f43a54ad21fce700115ab7 (patch) | |
| tree | 888cb9c2d864a32a7854551109d665731dc2c94b /media | |
| parent | c4ebf01f6841ff75c24da104882f1dbd40c21521 (diff) | |
| parent | f190360b76f279ce50a53553cc2781104379e42d (diff) | |
| download | frameworks_av-c32e307d2a2476d476f43a54ad21fce700115ab7.zip frameworks_av-c32e307d2a2476d476f43a54ad21fce700115ab7.tar.gz frameworks_av-c32e307d2a2476d476f43a54ad21fce700115ab7.tar.bz2 | |
am 1c515533: am f5aa7aa9: Merge "More power savings: No need to keep a history of outgoing packets" into jb-mr1-dev
* commit '1c515533cfabd4e717aa0bc4f74ab241abcb1878':
More power savings: No need to keep a history of outgoing packets
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/wifi-display/source/PlaybackSession.cpp | 9 | ||||
| -rw-r--r-- | media/libstagefright/wifi-display/source/PlaybackSession.h | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/media/libstagefright/wifi-display/source/PlaybackSession.cpp b/media/libstagefright/wifi-display/source/PlaybackSession.cpp index fc5945b..4ae9895 100644 --- a/media/libstagefright/wifi-display/source/PlaybackSession.cpp +++ b/media/libstagefright/wifi-display/source/PlaybackSession.cpp @@ -264,8 +264,10 @@ WifiDisplaySource::PlaybackSession::PlaybackSession( mNumRTPSent(0), mNumRTPOctetsSent(0), mNumSRsSent(0), - mSendSRPending(false), - mHistoryLength(0) + mSendSRPending(false) +#if ENABLE_RETRANSMISSION + ,mHistoryLength(0) +#endif #if TRACK_BANDWIDTH ,mFirstPacketTimeUs(-1ll) ,mTotalBytesSent(0ll) @@ -1126,7 +1128,9 @@ ssize_t WifiDisplaySource::PlaybackSession::appendTSData( #endif } +#if ENABLE_RETRANSMISSION mTSQueue->setInt32Data(mRTPSeqNo - 1); + mHistory.push_back(mTSQueue); ++mHistoryLength; @@ -1138,6 +1142,7 @@ ssize_t WifiDisplaySource::PlaybackSession::appendTSData( } else { mTSQueue = new ABuffer(12 + kMaxNumTSPacketsPerRTPPacket * 188); } +#endif mTSQueue->setRange(0, 12); } diff --git a/media/libstagefright/wifi-display/source/PlaybackSession.h b/media/libstagefright/wifi-display/source/PlaybackSession.h index 7da8440..3bdb223 100644 --- a/media/libstagefright/wifi-display/source/PlaybackSession.h +++ b/media/libstagefright/wifi-display/source/PlaybackSession.h @@ -161,8 +161,10 @@ private: bool mSendSRPending; +#if ENABLE_RETRANSMISSION List<sp<ABuffer> > mHistory; size_t mHistoryLength; +#endif #if TRACK_BANDWIDTH int64_t mFirstPacketTimeUs; |