summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Collapse)AuthorAgeFilesLines
* Switch frameworks/av/media/libmedia to the new icu.Elliott Hughes2014-07-091-1/+1
| | | | Change-Id: I45349756bac6d89b02dba082ba6d606f4c489dcf
* Merge "Remove dependency on Parcel::{read,write}IntPtr"Narayan Kamath2014-06-101-2/+2
|\
| * Remove dependency on Parcel::{read,write}IntPtrJeff Tinker2014-06-121-2/+2
| | | | | | | | | | | | | | | | | | bug: 15424960 bug: 15107693 (cherry picked from commit bcca9e072c1f288a53ce6862936f57dc36488f96) Change-Id: I3ba59fccb184e99a07f6f82ccdbd00e5204901f6
* | Update OMX messages for 64 bitAndy Hung2014-06-121-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>
* Offer a type-safe album art interface.Elliott Hughes2014-06-111-0/+20
| | | | | Bug: 15514223 Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95
* am 3b6da6bf: Merge "Move frameworks/av off private API."Elliott Hughes2014-05-221-31/+31
|\ | | | | | | | | * commit '3b6da6bfb50a1c0324fb4c87326d3a477944d5fe': Move frameworks/av off private API.
| * Move frameworks/av off private API.Elliott Hughes2014-05-211-31/+31
| | | | | | | | | | Bug: 11156955 Change-Id: Ib3bb9d66a2bf92977c2445b62aa074a2d7a45aea
* | am d084206d: Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-221-10/+10
|\ \ | |/ | | | | | | * commit 'd084206d5a4a5364211af46e4201311933e83bfc': Move frameworks/av off __futex_syscall3.
| * Move frameworks/av off __futex_syscall3.Elliott Hughes2014-05-211-10/+10
| | | | | | | | | | Bug: 11156955 Change-Id: I943080bc51b6efa781059b48b5b5ecc4fa287512
* | 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
* | | 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
| | * \ 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 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
| | * | | 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 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 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
* | | | | | media: memset sizeof argument issuesMark Salyzyn2014-04-111-1/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | Change-Id: I37ef154eea0f77fb7f22faf6891f3025f6ff346e
* | | | | 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
* | | | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-113-10/+10
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contains the necessary changes to make frameworks/av build and work on a 64-bit machine. Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
* | | AudioTrack: Never try to use the fast path if resampling is requiredMartin Storsjo2014-01-311-0/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unless AudioFlinger was built with FAST_TRACKS_AT_NON_NATIVE_SAMPLE_RATE enabled, AudioFlinger would deny using the fast path (and internally fall back to the normal codepath) when it realized that resampling was required. Since the buffer size calculations within AudioFlinger don't take resampling into account properly (see the calculation below "AUDIO_OUTPUT_FLAG_FAST denied" in audioflinger/Threads.cpp, just below the hunk that this patch changes), make sure AudioTrack doesn't try to use the fast path if resampling is required. This removes the possibility to enable FAST_TRACKS_AT_NON_NATIVE_SAMPLE_RATE in AudioFlinger since it AudioTrack now won't even try to use the fast path for content that requires resampling, regardless of the AudioFlinger configuration. Change-Id: Icf0f8ad50bf0fdb84657f518c0120aa0535f23f9
* | Do partial reads in MemoryLeakTrackUtilOscar Rydhé2014-01-231-3/+11
| | | | | | | | | | | | | | Do partial read in MemoryLeakTrackUtil dumpMemoryAddresses to avoid using more memory than what is allocated. Change-Id: I94feb4e00647407f938571167b981c7371f39e3d
* | AudioTrack: fix position callback after restoreEric Laurent2013-12-171-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
* | update offloaded audio track sampling rateEric Laurent2013-12-171-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. Change-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88
* | Merge "Increase kFastTrackMultiplier from 1 to 2"Glenn Kasten2013-12-171-4/+7
|\ \
| * | Increase kFastTrackMultiplier from 1 to 2Glenn Kasten2013-12-041-4/+7
| | | | | | | | | | | | Change-Id: I158f147295eebcea96e4047d7618069bc48bdd7d
* | | am 9cae2170: Assign blame for playback wakelocks.Marco Nelissen2013-10-262-6/+19
|\ \ \ | | |/ | |/| | | | | | | * commit '9cae217050aa1347d4ac5053c305754879e3f97f': Assign blame for playback wakelocks.
| * | Assign blame for playback wakelocks.Marco Nelissen2013-10-252-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set a work source for the playback wakelock, so that playback is counted against the requesting app instead of the media server. Cherrypicked from master. b/9464621 Change-Id: I7329f88a288a95a582a78005a1c3d16a5a611e31
* | | am 95c03858: Merge "Allow releaseBuffer after flush" into klp-devGlenn Kasten2013-10-181-3/+7
|\ \ \ | |/ / | | / | |/ |/| * commit '95c03858e2ab4fb693a2bfe47b3caa806e43c044': Allow releaseBuffer after flush
| * Allow releaseBuffer after flushGlenn Kasten2013-10-181-3/+7
| | | | | | | | | | | | | | | | | | | | | | After AudioTrack start checks for pending flush, allow releaseBuffer on any previously obtained buffer. For example, this can happen if the resampler has obtained a buffer but not released the whole buffer yet. Note that the resampler will be reading obsolete data. Bug: 11285590 Change-Id: I0614fbb62e43604aac3089cce4b7797c87a306b5
* | am f8f15b05: Merge "Fix race condition in AudioTrack::pause followed by ↵Glenn Kasten2013-10-161-7/+8
|\ \ | |/ | | | | | | | | | | start" into klp-dev * commit 'f8f15b05fe051009945c9042a1a9260280e0feb2': Fix race condition in AudioTrack::pause followed by start
| * Merge "Fix race condition in AudioTrack::pause followed by start" into klp-devGlenn Kasten2013-10-171-7/+8
| |\
| | * Fix race condition in AudioTrack::pause followed by startGlenn Kasten2013-10-161-7/+8
| | | | | | | | | | | | | | | Bug: 11148722 Change-Id: Iec88f00c8510363d4418e4b8d5b34feb06ecf04d
* | | am 120a8847: Merge "AudioTrack: fix head position after restore" into klp-devEric Laurent2013-10-162-1/+24
|\ \ \ | |/ / | | | | | | | | | * commit '120a88471a607c85c4d60300d73c3be0a1e8f8c8': AudioTrack: fix head position after restore
| * | AudioTrack: fix head position after restoreEric Laurent2013-10-162-1/+24
| |/ | | | | | | | | | | | | | | | | | | The head position transfered to the new track by restoreTrack_l() must take into account the frames that are dropped from the old track to avoid a non recoverable offset in the playback head position returned to applications. Bug: 11230062. Change-Id: I51143a08b95e8f264ed709ae2054360315f2b8b1
* | am b3cb72a1: SoundPool: handle new audio track eventEric Laurent2013-10-131-2/+7
|\ \ | |/ | | | | | | * commit 'b3cb72a17d9a472883e9e2faa18b42eac533fe99': SoundPool: handle new audio track event
| * SoundPool: handle new audio track eventEric Laurent2013-10-121-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | If the AudioTrack is torn down, SoundPool will never receive the buffer end event and the track will stay active for ever. The fix consists in stopping the AudioTrack when a new audiotrack event is received. Bug: 11193583. Change-Id: I9876eb2a8f75c601368f669acd67b0accf6e2736
* | am fee4ce33: Merge "Cleanup openRecord error handling" into klp-devGlenn Kasten2013-10-072-2/+19
|\ \ | |/ | | | | | | * commit 'fee4ce338d78eeb58af1f66831ead53322d3859e': Cleanup openRecord error handling
generated by cgit v1.1 at 2024-05-07 08:17:28 +0000