summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Update commentsGlenn Kasten2014-03-263-1/+4
| |/ / / / / |/| | | | | | | | | | | | | | | | | Change-Id: I5776313b9b49072cd666d28880f0d07cc73f827b
* | | | | | Merge "Use symbolic constants from <system/audio.h>"Glenn Kasten2014-03-262-7/+7
|\ \ \ \ \ \
| * | | | | | Use symbolic constants from <system/audio.h>Glenn Kasten2014-03-252-7/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AUDIO_INTERLEAVE_* AUDIO_STREAM_MIN AUDIO_SESSION_ALLOCATE Change-Id: I31dd6f327204685e50716079ce21c4ba206dff11
* | | | | | Merge "Use symbol AUDIO_DEVICE_NONE from <system/audio.h>"Glenn Kasten2014-03-262-3/+3
|\ \ \ \ \ \
| * | | | | | Use symbol AUDIO_DEVICE_NONE from <system/audio.h>Glenn Kasten2014-03-252-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: I61f882c5e7c949bf00d3bfc745ebf3b5e1c42a58
* | | | | | Merge "Remove stream type from AudioSystem::getRenderPosition()"Glenn Kasten2014-03-261-9/+1
|\ \ \ \ \ \
| * | | | | | Remove stream type from AudioSystem::getRenderPosition()Glenn Kasten2014-03-261-9/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The I/O handle is never equal to AUDIO_IO_HANDLE_NONE, so the stream type is not needed. Change-Id: I1ab134a2fa379d6dd0b6167345a856a192d478f9
* | | | | | Merge "Fix uses of KeyedVector"Glenn Kasten2014-03-261-1/+1
|\ \ \ \ \ \
| * | | | | | Fix uses of KeyedVectorGlenn Kasten2014-03-251-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Constructor for AudioFlinger::mAudioHwDevs was missing, and so AudioFlinger::findSuitableHwDev_l() could return an undefined pointer if a non-0 module wasn't found. A KeyedVector of Plain Old Data (POD) element type must specify the default value in the constructor, or else the default will be undefined. Minor: - Parameter had wrong type in constructor for AudioSystem::gOutputs. - Remove obsolete AudioSystem::gStreamOutputMap. Change-Id: I9841493e018440e559d8b8b0e4e748ba2b2d365b
* | | | | | Merge "Remove streamType parameter from AudioSystem::getLatency()"Glenn Kasten2014-03-262-4/+3
|\ \ \ \ \ \
| * | | | | | Remove streamType parameter from AudioSystem::getLatency()Glenn Kasten2014-03-252-4/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: Ie7346e93436ddc215cad7d16be555dcb6c277d54
* | | | | | Merge "Remove dead code"Glenn Kasten2014-03-261-20/+0
|\ \ \ \ \ \
| * | | | | | Remove dead codeGlenn Kasten2014-03-261-20/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: I0878d11451c7bbbf96b59f5fe0cd97ba1f033aa9
* | | | | | Document AudioSystem::newAudioSessionId() failuresGlenn Kasten2014-03-252-2/+2
|/ / / / / | | | | | | | | | | | | | | | Change-Id: Iaa168722f362c36bdfa87fe20dc0a59b43cf1ca3
* | | | | Fix operator precedenceGlenn Kasten2014-03-251-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I164708a5b76a341a185467b008ecbec98d58a6df
* | | | | Merge "Add MediaPlayer::getAudioStreamType."John Spurlock2014-03-191-0/+8
|\ \ \ \ \
| * | | | | Add MediaPlayer::getAudioStreamType.John Spurlock2014-03-191-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9cd8a718d2873543609aa651fd85749478f4f89f
* | | | | | Use more tags to help the ICU detector.Marco Nelissen2014-03-192-20/+99
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The detector only gave non-ascii data to ICU. In some cases that could result in very short data, for which ICU would issue a low confidence level for the actual encoding. By padding the data with additional (ascii) tags, we improve accuracy for such files. Becauses this can reduce accuracy in other cases, only do this when the initial confidence is low. b/13473604 Change-Id: I63d932043155c310b0e358cdf2d37787961e94b7
* | | | | Remove name output parameter from createTrackGlenn Kasten2014-03-142-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was only used for one log. A better solution will be a per-track unique ID. Change-Id: Ia440e02ae4a5a4019a9a2d08970e1ee93ac4c3a3
* | | | | Merge "AudioTrack non-blocking write"Jean-Michel Trivi2014-03-111-2/+3
|\ \ \ \ \
| * | | | | AudioTrack non-blocking writeJean-Michel Trivi2014-03-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 7531968 Change-Id: I6d0e79fa8cab5b6eb36bcc34977f4cf0d7eec8ea
* | | | | | Fix freeze on pauseMarco Nelissen2014-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isOffloaded() tries to lock mLock again. We should be calling isOffloaded_l() b/13394633 Change-Id: I155be6fee937f894d8e6c974e593223ab6014ade
* | | | | | Merge "Simplify AudioTrack stream end and fix race"Glenn Kasten2014-03-071-17/+15
|\ \ \ \ \ \
| * | | | | | Simplify AudioTrack stream end and fix raceGlenn Kasten2013-09-291-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10994052 Change-Id: Ib2e38e7a600bcffef8cbc68c1722e40fbbc7ea67
* | | | | | | AudioTrack: When paused, return cached playback positionHaynes Mathew George2014-03-061-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An offload output can be re-used between two audio tracks having the same configuration. A timestamp query for a paused track while the other is running would return an incorrect time. To fix this, cache the playback position on a pause() and return this time when requested until the track is resumed. Bug: 12826612. Change-Id: I324112ea9827e52fff53ef44cd8513c8d85a0bc4
* | | | | | | audio policy service: clean up type casting.Eric Laurent2014-03-051-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If16d6495c16e0d61a221f81bfd49e7d14bbfdc12
* | | | | | | Merge "Make openRecord_l more like createTrack_l for fast tracks: part 3"Glenn Kasten2014-03-011-7/+12
|\ \ \ \ \ \ \
| * | | | | | | Make openRecord_l more like createTrack_l for fast tracks: part 3Glenn Kasten2014-02-281-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create the callback thread earlier, before creating the IAudioRecord, so that the thread's tid is available as a parameter to openRecord(). Also move initialization of mCbf to same point as in AudioTrack.cpp. Change-Id: I61ea4c5e2724ccfc691aaf51bc02a7c10d5a7495
* | | | | | | | Merge "Make openRecord_l more like createTrack_l for fast tracks: part 2"Glenn Kasten2014-02-281-10/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Make openRecord_l more like createTrack_l for fast tracks: part 2Glenn Kasten2014-02-281-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assume double-buffering because we don't know the true HAL sample rate, and for fast tracks we must accomodate kernel scheduling and app computation jitter. Change-Id: I983d6048a8b4814cfa5bf789397cdd9f1572256c
* | | | | | | | Rename setStreamOutput to invalidateStreamGlenn Kasten2014-02-281-8/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And simplify by removing the unused I/O handle parameter 'output'. Change-Id: Ie9c4df17a7378066312d4ed8790fda7a9125c95e
* | | | | | | Merge "Make openRecord_l more like createTrack_l for fast tracks: part 1"Glenn Kasten2014-02-282-11/+23
|\ \ \ \ \ \ \
| * | | | | | | Make openRecord_l more like createTrack_l for fast tracks: part 1Glenn Kasten2014-02-272-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the transfer mode to distinguish use cases, as the presence of a callback handler is not sufficient. For example, the track could be configured for synchronous transfer with write() or read(), and also have a callback handler for position updates. But that does not mean the track can operate in fast track mode. Change-Id: I2a7f1f0ca98e68efe180b524496985109d8ce291
* | | | | | | | Fix type of AudioTrack/AudioRecord parameter frameCountGlenn Kasten2014-02-284-24/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's size_t consistently Change-Id: I29638ef59ac773218025f2403a3508a307b487e0
* | | | | | | | Fix type of AudioTrack/AudioRecord parameter notificationFramesGlenn Kasten2014-02-282-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's uint32_t consistently Change-Id: If8298c7e9aeea2b951fe47b675adbdf48d104846
* | | | | | | | Merge "Don't crash on remote read error, just return"Marco Nelissen2014-02-271-1/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Don't crash on remote read error, just returnMarco Nelissen2014-02-271-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I35a2af255f55e008d64142ed0eceb6e83473d630
* | | | | | | | Fix includes to no longer pull in Skia includes directories.Derek Sollenberger2014-02-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:13225538 Change-Id: I4fccc414923f7e62cd46d691c67cb44b9692c225
* | | | | | | | Simplify error handling after track creationGlenn Kasten2014-02-252-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IAudioFlinger::createTrack and IAudioFlinger::openRecord both guarantee that (status == OK) == (sp<> != 0). Change-Id: I91cb4f7e843019efb65cace7ba146f7da7aa5b59
* | | | | | | | Move initialize of mInput to match AudioTrackGlenn Kasten2014-02-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4dc977f22f51cd618dc83d800b4b8756929a4612
* | | | | | | | Update comments to match AudioTrackGlenn Kasten2014-02-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7dd14eabd78c9130a157da2063a1d65ec4f9c65a
* | | | | | | | Move initialization of mRefreshRemaining to match AudioTrackGlenn Kasten2014-02-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also fixes a bug where, for a re-created IAudioRecord, mRefreshRemaining was not being reset correctly. Change-Id: I9f721a4edf92aab859cf3f247ab7f65562d14fb0
* | | | | | | | Merge "mAudioRecord is always non-0 if set() is successful"Glenn Kasten2014-02-251-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | mAudioRecord is always non-0 if set() is successfulGlenn Kasten2014-02-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0c2483210903c922f06f097ada373a37b9a90a02
* | | | | | | | | Merge "Unify comments and whitespace between AudioTrack and AudioRecord"Glenn Kasten2014-02-252-1/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Unify comments and whitespace between AudioTrack and AudioRecordGlenn Kasten2014-02-242-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5320a6b2d7f7077cb12d7da4f2ca30a940100bf2
* | | | | | | | | Merge "Update channel fields at same place in AudioTrack and AudioRecord"Glenn Kasten2014-02-251-4/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Update channel fields at same place in AudioTrack and AudioRecordGlenn Kasten2014-02-241-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4b649feeef47e7968a9fa3a460217017ca9b05fe
* | | | | | | | | Merge "Update mReqFrameCount at same point in AudioTrack and AudioRecord"Glenn Kasten2014-02-251-5/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Update mReqFrameCount at same point in AudioTrack and AudioRecordGlenn Kasten2014-02-241-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I12369dfbb9e75389f2cab015a706decdaf310a0d