diff options
| author | Andreas Huber <andih@google.com> | 2012-10-02 14:39:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-02 14:39:07 -0700 |
| commit | f5aa7aa94465e774ccdb07039690a5f42de1518a (patch) | |
| tree | e3d7cf1697acfa6f897cb45e202f1dfdd9215691 /media/libstagefright | |
| parent | 16461dca0ba8ac1850463db6245d20dc1699279d (diff) | |
| parent | 887070dbe6b6258ba04f988fd90c3ac856d2e5bf (diff) | |
| download | frameworks_av-f5aa7aa94465e774ccdb07039690a5f42de1518a.zip frameworks_av-f5aa7aa94465e774ccdb07039690a5f42de1518a.tar.gz frameworks_av-f5aa7aa94465e774ccdb07039690a5f42de1518a.tar.bz2 | |
Merge "More power savings: No need to keep a history of outgoing packets" into jb-mr1-dev
Diffstat (limited to 'media/libstagefright')
| -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; |