summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* flush() comments and checksGlenn Kasten2012-12-032-12/+18
| | | | | | | flush() is only useful for streaming mode. It is a no-op if track is active or uses a static buffer. Change-Id: I918ac181ffae3d16a0d67d8a7208f4aec61b5bd6
* AudioTrack::mute() is unused so remove itGlenn Kasten2012-12-038-64/+9
| | | | | | | If ever needed again, it could be implemented on client side by forcing a track volume of 0. Change-Id: I88a9b4f675b6dca2948549414f9ec2c192d29269
* Merge "AudioTrack inline short const methods"Glenn Kasten2012-12-032-57/+11
|\
| * AudioTrack inline short const methodsGlenn Kasten2012-11-302-57/+11
| | | | | | | | Change-Id: I142917edb454d510bbe545e94e6eaea30b650fae
* | am cd8d39e0: am f00d40c7: Merge "Memory leak solved in ↵Andreas Huber2012-12-031-6/+3
|\ \ | | | | | | | | | | | | | | | | | | MPEG4Extractor::parseChunk for cover art" * commit 'cd8d39e00fb7896e56318cc192978446e21d46b8': Memory leak solved in MPEG4Extractor::parseChunk for cover art
| * \ am f00d40c7: Merge "Memory leak solved in MPEG4Extractor::parseChunk for ↵Andreas Huber2012-12-031-6/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | cover art" * commit 'f00d40c716fd4741fa56dd2b59813227658e50f2': Memory leak solved in MPEG4Extractor::parseChunk for cover art
| | * \ Merge "Memory leak solved in MPEG4Extractor::parseChunk for cover art"Andreas Huber2012-12-031-6/+3
| | |\ \
| | | * | Memory leak solved in MPEG4Extractor::parseChunk for cover artJens Gulin2012-11-191-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repeated leaks detected in mediaserver context. Most chunks small but some bigger. Adding up it was not uncommon to see 200Mb footprint. libc memdebug allocation call stack showed the root cause in "covr" parsing - that explains why content often was empty but sometimes big. Change-Id: I0de6c1eeef174d2529973ff9c6a020ec3dd44c75
* | | | | Merge "Remove last bits of IAudioFlinger::channel_count"Glenn Kasten2012-12-031-19/+1
|\ \ \ \ \
| * | | | | Remove last bits of IAudioFlinger::channel_countGlenn Kasten2012-11-301-19/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Change-Id: I9e13678e0aa32a86eb27367a4aff4b32b8aec8cc
* | | | | Merge "Fix nuplayer seek jankiness by properly flushing decoders before"Andreas Huber2012-11-302-88/+207
|\ \ \ \ \
| * | | | | Fix nuplayer seek jankiness by properly flushing decoders beforeAndreas Huber2012-11-302-88/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initiating the seek. Also refactor the nuplayer state machine to make this a little more maintainable and extensible in the future. Change-Id: I36a673bdecff732bca7094c8f72bac24f37c01e9 related-to-bug: 7120373
* | | | | | Merge "Remove conditional compilation of ATRACE functions"Alex Ray2012-11-303-10/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove conditional compilation of ATRACE functionsAlex Ray2012-11-303-10/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tracing functions are meant to be dynamically controlled via sysprops. Conditional compilation removes this functionality. Change-Id: I26bc473d104d0b3c50a228dddfda3fa2428d157a
* | | | | am ba6b1bc3: am e7550eb2: Merge "Initialize and copy mRotationAngle in ↵Andreas Huber2012-11-301-1/+3
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | VideoFrame" * commit 'ba6b1bc38e0c355277f69af286469adb5f02e876': Initialize and copy mRotationAngle in VideoFrame
| * | | am e7550eb2: Merge "Initialize and copy mRotationAngle in VideoFrame"Andreas Huber2012-11-301-1/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'e7550eb2805d864253f88ea2ced57014d6140e55': Initialize and copy mRotationAngle in VideoFrame
| | * | Merge "Initialize and copy mRotationAngle in VideoFrame"Andreas Huber2012-11-301-1/+3
| | |\ \
| | | * | Initialize and copy mRotationAngle in VideoFrameChrister Fletcher2012-11-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When thumbnails were generated they could be generated at random angles as the mRotationAngle variable was not initialized to any value. This variable would have to be explicitly overwritten to not cause random rotation. Changed the implementation to initialize the value to 0 (no rotation). mRotationAngle was also missing in the copy constructor. Change-Id: I67a5340fdd807c6ab3a3da5eecb09b5b9d5f4666
* | | | | Merge "Use ATRACE macros instead of Tracer statics"Simon Wilson2012-11-292-4/+4
|\ \ \ \ \
| * | | | | Use ATRACE macros instead of Tracer staticsSimon Wilson2012-11-292-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ATRACE_BEGIN and ATRACE_END have replaced the static Tracer::traceBegin and Tracer::traceEnd functions, so use them instead. Fixes compilation errors when tracing is enabled. Change-Id: I4d1147d2f76afcdf113e9986f0544cb848802b15
* | | | | | am 2ee204af: am 47c1a5f7: Bug fix for the MediaPlayer::prepare() api.Dylan Powers2012-11-290-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '2ee204af3d715b983bc4806fb830feefd401fd4b': Bug fix for the MediaPlayer::prepare() api.
| * | | | | am 47c1a5f7: Bug fix for the MediaPlayer::prepare() api.Dylan Powers2012-11-290-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '47c1a5f7c13d82aa8834fd4543bd1d713b97808e': Bug fix for the MediaPlayer::prepare() api.
| | * | | | | Bug fix for the MediaPlayer::prepare() api.Dylan Powers2012-11-293-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For an MP3 source, within the prepare command, ID3 tags are checked in search of gapless playback info. This causes problems for streamed sources. If ID3v2 tags aren't present, then a check is done for ID3v1 tags. This results in a read command that asks the cache to jump to the end of the file, and subsequently make an extra http call to request those bytes. For a streamed source, this causes the file to not be downloaded automatically when MediaPlayer::prepare() is called, and causes stuttering and extra buffering time to be needed when start() is finally called. The solution is to ignore the ID3v1 tags as the gapless info would never exist there, and only check for ID3v2 tags. Cherrypicked from external contribution ffd6ffc5429c45577fd8e9f8fa90e79bb91b8a84 b/7638165 Change-Id: I7d1b94cffbfe7c38ca094834dedbc92a58855e20
* | | | | | | am 9428cdd7: am 5dea84c3: Fix log spamGlenn Kasten2012-11-291-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '9428cdd7b9d32647d35207b3579133ee6a1f7355': Fix log spam
| * | | | | | am 5dea84c3: Fix log spamGlenn Kasten2012-11-291-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '5dea84c39b5e790315b525009c635806e33c97e0': Fix log spam
| | * | | | | Fix log spamGlenn Kasten2012-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie6c982af906dcfd3cdea4b771dfab1f7e47745ca
* | | | | | | am 2f6107ec: am b64def9a: Merge "[wfd] Support a low(er) power state by ↵Andreas Huber2012-11-2910-30/+267
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | triggering PAUSE/RESUME." into jb-mr1.1-dev * commit '2f6107ec8e67eea1f73b9558a5ad34caec52867f': [wfd] Support a low(er) power state by triggering PAUSE/RESUME.
| * | | | | | am b64def9a: Merge "[wfd] Support a low(er) power state by triggering ↵Andreas Huber2012-11-2910-30/+267
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PAUSE/RESUME." into jb-mr1.1-dev * commit 'b64def9a555bfbf533a2da41ba0189b9842a76fb': [wfd] Support a low(er) power state by triggering PAUSE/RESUME.
| | * | | | | Merge "[wfd] Support a low(er) power state by triggering PAUSE/RESUME." into ↵Andreas Huber2012-11-2910-30/+267
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1.1-dev
| | | * | | | | [wfd] Support a low(er) power state by triggering PAUSE/RESUME.Andreas Huber2012-11-2910-30/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibe42bfa73816bbfeb7e652d435254d0171b89727 related-to-bug: 7638150
* | | | | | | | am 5ea87edb: am e5aed03d: Enable retransmission of UDP packets in case we ↵Andreas Huber2012-11-291-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | want to use it * commit '5ea87edbc97cd693fb7a9a8e00e712978315693c': Enable retransmission of UDP packets in case we want to use it
| * | | | | | | am e5aed03d: Enable retransmission of UDP packets in case we want to use itAndreas Huber2012-11-291-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e5aed03d30ea0ce49728873c5b74f89ba05a9541': Enable retransmission of UDP packets in case we want to use it
| | * | | | | | Enable retransmission of UDP packets in case we want to use itAndreas Huber2012-11-291-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in our upcoming wfd _sink_ implementation. Change-Id: I4509c30d5a7b992bc841b73d63db902bbcf8f76a related-to-bug: 7638155
* | | | | | | am bd4f7b89: am 79c56d3f: Merge "Reduce the frequency of IDR frames and add ↵James Dong2012-11-291-1/+18
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | intra-fresh mode support for WiFi display" into jb-mr1.1-dev * commit 'bd4f7b8931a316ca43fae033d86167c83a8bac07': Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display
| * | | | | | am 79c56d3f: Merge "Reduce the frequency of IDR frames and add intra-fresh ↵James Dong2012-11-291-1/+18
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode support for WiFi display" into jb-mr1.1-dev * commit '79c56d3f17d3193a0a86eb3c9bfdea90b89ae3f9': Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi display
| | * | | | | Merge "Reduce the frequency of IDR frames and add intra-fresh mode support ↵James Dong2012-11-281-1/+18
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | for WiFi display" into jb-mr1.1-dev
| | | * | | | | Reduce the frequency of IDR frames and add intra-fresh mode support for WiFi ↵James Dong2012-11-281-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | display The time interval between periodic neighboring IDR frames is increased from 1 second to 15 seconds. o related-to-bug: 7524791 Change-Id: Ic32f37448f952f329549eda5e73637ee3b02f046
* | | | | | | | am 296cb9dd: am 0dbe5a93: Added optional intra macroblock refresh support ↵James Dong2012-11-292-1/+50
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for encoding * commit '296cb9ddd916c43983bfb4ddab9c69ed555d4cc4': Added optional intra macroblock refresh support for encoding
| * | | | | | | am 0dbe5a93: Added optional intra macroblock refresh support for encodingJames Dong2012-11-292-1/+50
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '0dbe5a9321b24b6883fbb2fe97cd9d525128b0b5': Added optional intra macroblock refresh support for encoding
| | * | | | | | Added optional intra macroblock refresh support for encodingJames Dong2012-11-282-1/+50
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o related-to-bug: 7524791 Change-Id: I95ac4ee925e2dbeb00b3cfb2e29c611698c5cc9f
* | | | | | | Merge "Clear the sticky EOS flags when transitioning to LOADED state"Andreas Huber2012-11-291-5/+5
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Clear the sticky EOS flags when transitioning to LOADED stateAndreas Huber2012-11-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of transitioning _from_ UNINITIALIZED state. This makes codec instances reusable. Change-Id: I8f0c11923978ffee58b553a5ac59c740b0223c54
* | | | | | | am ce8dcdf5: am 031c93df: Merge "Bug fix for the MediaPlayer::prepare() api."Marco Nelissen2012-11-293-5/+7
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'ce8dcdf5361dd5de8c86cf5b0308c71d519f98ca': Bug fix for the MediaPlayer::prepare() api.
| * | | | | | am 031c93df: Merge "Bug fix for the MediaPlayer::prepare() api."Marco Nelissen2012-11-293-5/+7
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * commit '031c93df74621dc2149876dc377aedee8930547f': Bug fix for the MediaPlayer::prepare() api.
| | * | | | | Merge "Bug fix for the MediaPlayer::prepare() api."Marco Nelissen2012-11-293-5/+7
| | |\ \ \ \ \
| | | * | | | | Bug fix for the MediaPlayer::prepare() api.Dylan Powers2012-11-273-5/+7
| | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For an MP3 source, within the prepare command, ID3 tags are checked in search of gapless playback info. This causes problems for streamed sources. If ID3v2 tags aren't present, then a check is done for ID3v1 tags. This results in a read command that asks the cache to jump to the end of the file, and subsequently make an extra http call to request those bytes. For a streamed source, this causes the file to not be downloaded automatically when MediaPlayer::prepare() is called, and causes stuttering and extra buffering time to be needed when start() is finally called. The solution is to ignore the ID3v1 tags as the gapless info would never exist there, and only check for ID3v2 tags. Change-Id: I7d1b94cffbfe7c38ca094834dedbc92a58855e20
* | | | | | | am 37ddc8fc: am 251c04b1: Merge "Unsolicited server responses cause RTSP ↵Andreas Huber2012-11-291-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | streaming to crash" * commit '37ddc8fc0f78234b5b3b58886113560cdf98aadf': Unsolicited server responses cause RTSP streaming to crash
| * | | | | | am 251c04b1: Merge "Unsolicited server responses cause RTSP streaming to crash"Andreas Huber2012-11-291-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '251c04b1f3d048f541832c93347c6604b314e0ea': Unsolicited server responses cause RTSP streaming to crash
| | * | | | | Merge "Unsolicited server responses cause RTSP streaming to crash"Andreas Huber2012-11-291-0/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Unsolicited server responses cause RTSP streaming to crashLena Magnusson2012-11-291-0/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the set up of the RTSP stream contains an incorrect or otherwise problematic URL, some servers will send an unsolicited server response that contains a negative number in the sequence number (CSeq) field. This negative value is not returned from the function findPendingRequest(), so the check in notifyResponseListener() will not work. Instead there will be a crash when 0 is used as the index to find a matching request/response pair that doesn’t exist. The fix is to return the received sequence number also when it is an unsolicited server-client message. Change-Id: Iedaba8a63dece7b43bce007069baefbfd10970b8