summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Collapse)AuthorAgeFilesLines
* Use new channel count functions for audio masksAndy Hung2014-05-162-3/+4
| | | | | Change-Id: Ia658ab4b6320d19fdb50f123c930918724ff0ef3 Signed-off-by: Andy Hung <hunga@google.com>
* Update OMX messages for 64 bitAndy Hung2014-05-141-64/+68
| | | | | | | | | Change node_id and buffer_id to uint32_t. Ensure IOMX messages are fixed size. Remove 64 bit compile warnings in associated files. Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203 Signed-off-by: Andy Hung <hunga@google.com>
* Cache mCblk in local variable cblkGlenn Kasten2014-05-091-5/+7
| | | | | | This is the style used throughout the rest of AudioTrackShared. Change-Id: I959a6be3064e087bb19eba41173fd130dfcb4a9a
* Remove obsolete IAudioRecord::getCblk()Glenn Kasten2014-05-091-21/+1
| | | | Change-Id: Id20b5efd765b9796b0e391610e06dc928a829ebf
* IAudioFlinger::openRecord returns IMemory(s)Glenn Kasten2014-05-092-12/+54
| | | | | | | | openRecord() now explicitly returns the control block and data buffer as separate IMemory references. If the IMemory for data buffer is 0, this means it immediately follows the control block. Change-Id: Ic098f88f0e037f8fbe30006689e18cacacf09d06
* Merge "Add client side support for more AUDIO_FORMAT_PCM_*"Glenn Kasten2014-05-081-7/+19
|\
| * Add client side support for more AUDIO_FORMAT_PCM_*Glenn Kasten2014-05-071-7/+19
| | | | | | | | | | | | | | As much as possible, the checks for specific formats are done on server side. The only exception is 8-bit, which needs a client side workaround. Change-Id: I52fe086c039460c8dac009de03b67eb54c56a836
* | Fix a couple of fast capture typo bugsGlenn Kasten2014-05-071-2/+2
|/ | | | | | | AudioRecord constructor was not passing flags through to set(). Server-side check was using wrong kind of channel mask. Change-Id: Ifaa880ec323771e9fd168262be05f3e539f53390
* Fix bug for direct track with PCM != 16-bitGlenn Kasten2014-05-021-1/+2
| | | | | | | | | | | | The AUDIO_FORMAT_PCM_8_BIT format was being converted to AUDIO_FORMAT_PCM_16_BIT on client side even for direct tracks. That conversion was incorrect; it should only be done for mixed tracks. Also remove checks for specific PCM formats in the generic part of server side of createTrack. Those format checks should only be done by the thread. This will allow direct tracks for PCM 8-bit, PCM 24-bit, etc. Change-Id: If5b9fd79f8642ed93e2aeabcaf4809b2ed798978
* resolved conflicts for merge of 47c888a9 to masterGlenn Kasten2014-05-027-39/+39
|\ | | | | | | Change-Id: I4ba2fdc6374a93a892bb7651b0d174e495f09bf6
| * am e580aa4a: am 86438382: Merge "When passing a size_t via binder, use ↵Glenn Kasten2014-05-027-35/+35
| |\ | | | | | | | | | | | | | | | | | | 64-bits unconditionally" * commit 'e580aa4a756d1825c440a4b4309022b1babb6de1': When passing a size_t via binder, use 64-bits unconditionally
| | * am 86438382: Merge "When passing a size_t via binder, use 64-bits ↵Glenn Kasten2014-05-027-35/+35
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | unconditionally" * commit '86438382a381eb39ed8da53fbd16cf6730fded6c': When passing a size_t via binder, use 64-bits unconditionally
| | | * Merge "When passing a size_t via binder, use 64-bits unconditionally"Glenn Kasten2014-05-027-35/+35
| | | |\
| | | | * When passing a size_t via binder, use 64-bits unconditionallyGlenn Kasten2014-02-137-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64-bits is almost always over-kill. But it's easier and cleaner to change the binder code to be accurate, than to rename all the the API parameter types to be 32-bit. Bug: 12381724 Change-Id: Ib8f198d814a2027760ef24e9e3feacee21a973b1
* | | | | Merge "Use AUDIO_INTERLEAVE_* constants"Glenn Kasten2014-05-011-1/+1
|\ \ \ \ \
| * | | | | Use AUDIO_INTERLEAVE_* constantsGlenn Kasten2014-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6609fa75c9a57fc4ca3887d626a2f4fb8b6593a1
* | | | | | am f38e1908: am 3d9164da: am 236f8ddd: Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | * commit 'f38e190887e73bc08735af95b073ebfaabd65f95': Add missing include
| * | | | am 3d9164da: am 236f8ddd: Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '3d9164da1b3d58701e41c78e06839d61ed1b4ff9': Add missing include
| | * | | am 236f8ddd: Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '236f8ddd23af92f98f2deae86bf6e6b5c9278857': Add missing include
| | | * | Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
| | | |\ \
| | | | * | Add missing includeIgor Chernyshev2014-04-021-0/+1
| | | | |/ | | | | | | | | | | | | | | | Change-Id: I9fc3ebf60b98760611ac2071c7c519a0f8326341
| | * | | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEADBill Yi2014-04-292-22/+39
| | |\ \ \ | | | |/ / | | |/| |
| | | * | 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
| | | * \ \ am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-devGlenn Kasten2014-03-081-17/+15
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2f55c2c03b17795e94b325d402ac5b409e3ba0e8': Simplify AudioTrack stream end and fix race
| | | * \ \ \ am af191eb4: Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-03-071-6/+13
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | * commit 'af191eb4feac513d17dc0362e0cea5bc9e0ffe9d': Replace size_t in shared memory by uint32_t
| | | * | | | am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-03-073-10/+10
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c9130a8a12ce962dc8d22e04243b135b9e98b01': Make frameworks/av 64-bit compatible
| | | * \ \ \ \ am 4361749d: Merge "AudioTrack: Never try to use the fast path if resampling ↵Glenn Kasten2014-03-071-0/+6
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is required" * commit '4361749d74113069aafb0620a1189404205c58d0': AudioTrack: Never try to use the fast path if resampling is required
| * | | \ \ \ \ \ am 9829344d: Merge "media: memset sizeof argument issues"Mark Salyzyn2014-04-141-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9829344d526f87ca745208f04216ec795b239581': media: memset sizeof argument issues
| | * | | | | | | media: memset sizeof argument issuesMark Salyzyn2014-04-111-1/+1
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Change-Id: I37ef154eea0f77fb7f22faf6891f3025f6ff346e
* | | | | | | | 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
generated by cgit v1.1 at 2024-05-06 11:33:46 +0000