summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Collapse)AuthorAgeFilesLines
* am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-011-4/+56
|\ | | | | | | | | * commit 'f356a123bf966150965a1af1cb9bd6ff2ca020de': Support CAST V2 Authentication in MediaDrm
| * am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-011-4/+56
| |\ | | | | | | | | | | | | * commit '68d9d71a792deed75d32fe13febc07c9c12c8449': Support CAST V2 Authentication in MediaDrm
| | * Support CAST V2 Authentication in MediaDrmJeff Tinker2014-03-291-4/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java API version Update frameworks to enable support for CAST V2 Authentication in the DRM Plugin. Change-Id: I9066ada0edf8e0d777c503897d8c7fc7f76f2861 related-to-bug: 12702350
| * | am 38efe8eb: am 6db20dcb: Merge "AudioTrack: When paused, return cached ↵Eric Laurent2014-03-081-3/+22
| |\ \ | | |/ | | | | | | | | | | | | | | | playback position" into klp-dev * commit '38efe8eb08e08610d535a164768851ac7c13d654': AudioTrack: When paused, return cached playback position
| | * am 6db20dcb: Merge "AudioTrack: When paused, return cached playback ↵Eric Laurent2014-03-081-3/+22
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | position" into klp-dev * commit '6db20dcb54dad932a3ea2e3a5dca41fce5802eb4': AudioTrack: When paused, return cached playback position
| | | * Merge "AudioTrack: When paused, return cached playback position" into klp-devEric Laurent2014-03-081-3/+22
| | | |\
| | | | * 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: Ia42b8b8fd2ba8993dfcc9abca72da48d71d78d74
| * | | | am 4ee774f3: am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix ↵Glenn Kasten2014-03-071-17/+15
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | race" into klp-dev * commit '4ee774f322ad3292fcfbb3c120cf250643419425': Simplify AudioTrack stream end and fix race
| | * | | am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-devGlenn Kasten2014-03-071-17/+15
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '2f55c2c03b17795e94b325d402ac5b409e3ba0e8': Simplify AudioTrack stream end and fix race
| | | * | Simplify AudioTrack stream end and fix raceGlenn Kasten2014-03-071-17/+15
| | | |/ | | | | | | | | | | | | | | | | Bug: 10994052 Change-Id: Ib2e38e7a600bcffef8cbc68c1722e40fbbc7ea67
| | | * Increase kFastTrackMultiplier from 1 to 2Glenn Kasten2014-03-051-4/+7
| | | | | | | | | | | | | | | | | | | | Bug: 11967381 Change-Id: Iedec06280aa745d9df5d661f4916940cede9c191
| * | | am 09e45992: am 25a86930: am 88876fb4: AudioTrack: fix obtainBuffer timeout ↵Eric Laurent2014-03-052-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | calculation * commit '09e45992067f03a05f82400a6cacf16bb8018f16': AudioTrack: fix obtainBuffer timeout calculation
| | * | am 88876fb4: AudioTrack: fix obtainBuffer timeout calculationEric Laurent2014-03-052-2/+2
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '88876fb4eb8365343f2a9ca0e8f53148ca38b845': AudioTrack: fix obtainBuffer timeout calculation
| | | * AudioTrack: fix obtainBuffer timeout calculationEric Laurent2014-03-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioTrack::obtainBuffer() passes a pointer to a timeout variable that has gone out of scope when calling ClientProxy::obtainBuffer(). Same fix for AudioRecord. Bug: 11968591. Change-Id: I5b3d0d86ed2bd8c0412eb2432b1ab519d70efce9
| | | * update offloaded audio track sampling rateEric Laurent2014-03-051-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioPlayer must read the sampling rate from offloaded audio sinks whenever a new time position is computed as the decoder can update the sampling rate on the fly. Bug: 12823955. Change-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88
| | | * AudioTrack: fix position callback after restoreEric Laurent2013-11-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When restoring an AudioTrack, the next position callback point should not be modified and set ahead of current buffer head. Otherwise, as frames are dropped, the new position is never reached and an application relying on position callbacks to reload the buffer would be stalled. Bug: 11868603. Change-Id: I93b2a311642a0c89944b78bcc0482d4ceed98ae4
| * | | Replace size_t in shared memory by uint32_tGlenn Kasten2014-02-131-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Eventually we may want to use uint64_t, but will need to confirm atomicity. Bug: 12381724 Change-Id: Ia2c591d262d22b47b6f7dab4b9d9faa14b86d865
* | | | Merge "Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>"Glenn Kasten2014-03-263-13/+13
|\ \ \ \
| * | | | Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>Glenn Kasten2014-03-263-13/+13
| | | | | | | | | | | | | | | | | | | | Change-Id: Id6b1aa17558eb73e17f22b8eab6cd02e00a96dff
* | | | | Merge "Use LOG_ALWAYS_FATAL instead of LOG_FATAL"Glenn Kasten2014-03-261-3/+3
|\ \ \ \ \
| * | | | | Use LOG_ALWAYS_FATAL instead of LOG_FATALGlenn Kasten2014-03-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LOG_FATAL is compiled out in most builds, so the assertion checks were not being performed. Change-Id: I774f0985ab9c5ccecd8989a0f1c940386b73fc35
* | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / /