summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Collapse)AuthorAgeFilesLines
* Merge "HLS: misc bug fixes"Chong Zhang2015-04-031-0/+3
|\
| * HLS: misc bug fixesChong Zhang2015-04-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix no target-duration case - fix for audio-only <=> audio/video switching - disable audio-only variants if there is at least one variant with video - fix mpeg2ts PTS wraparound when bandwidth adapting - tweak up/down switch marks bug: 19567254 Change-Id: Ib46144203c56dfc96eccd6ddaa3867e8a4f2c6a9
* | IAudioFlinger: add checks on binder callsEric Laurent2015-04-021-10/+36
| | | | | | | | | | | | | | | | | | | | Limit number of ports and patches listed by LIST_AUDIO_PATCHES and LIST_AUDIO_PORTS. Also fix typo causing wrong pointer to be used when writing to Parcel. Bug: 19573085. Change-Id: I41a9c710e45738a4f11990160587856c429a4646
* | audio port: support multiple clientsEric Laurent2015-04-011-23/+68
| | | | | | | | | | | | Add support for more than one audio port callback client per process. Change-Id: I657c4fc28d5d2d993307551e3e69567dc60196cb
* | Reject sample rate changes for fast tracksAndy Hung2015-03-311-3/+7
|/ | | | | | | This is needed for a SoundPool fix. Bug: 19970735 Change-Id: I46b69e059aabf0d06b16b31ea436bb71f7146750
* Merge "AudioRecord TRANSFER_OBTAIN can be used with FAST flag"Glenn Kasten2015-03-241-3/+6
|\
| * AudioRecord TRANSFER_OBTAIN can be used with FAST flagGlenn Kasten2015-03-231-3/+6
| | | | | | | | Change-Id: I001ba1a88150dddf79d99baf5927f31799745eef
* | Merge "AudioRecord::read() can be non-blocking to match AudioTrack"Glenn Kasten2015-03-241-2/+3
|\ \
| * | AudioRecord::read() can be non-blocking to match AudioTrackGlenn Kasten2015-03-231-2/+3
| |/ | | | | | | Change-Id: I23b9466b81ab6037d0bccd5e6f5974b7bd4aeacb
* | Merge "set() in AudioRecord and AudioTracks needs no lock"Glenn Kasten2015-03-242-4/+2
|\ \
| * | set() in AudioRecord and AudioTracks needs no lockGlenn Kasten2015-03-232-4/+2
| |/ | | | | | | Change-Id: I9d61b3d117e9b21fbbfad772d8981a5abb8fafae
* | Merge "media: add ResourceManagerService"Ronghua Wu2015-03-245-0/+357
|\ \
| * | media: add ResourceManagerServiceRonghua Wu2015-03-235-0/+357
| | | | | | | | | | | | | | | Bug: 19620911 Change-Id: Iea173d310d31781bc50effe3d9bd6553cb5139eb
* | | Merge "Report key request message type for unprefixed EME"Jeff Tinker2015-03-241-5/+9
|\ \ \ | |_|/ |/| |
| * | Report key request message type for unprefixed EMEJeff Tinker2015-03-161-5/+9
| | | | | | | | | | | | | | | bug: 19771299 Change-Id: I02f0a4532b5ea8a7e680d71f45ac0da06879f3d6
* | | LoggingGlenn Kasten2015-03-232-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move log of latency to where it is first computed. Log more parameters when a fast track is denied by client. Log session ID in destructor. Remove obsolete ALOGV that were for debugging a particular problem. Log more parameters of set(). Change-Id: I0156bceaf397f2faa053214572c57136705685ee
* | | Merge "Fix position when restoring streaming audio track"Andy Hung2015-03-231-1/+1
|\ \ \
| * | | Fix position when restoring streaming audio trackAndy Hung2015-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 19802225 Change-Id: I19ca7836bc89627f6cead4961641b94c6b27b5f6
* | | | Update AudioTrack code to match AudioRecordGlenn Kasten2015-03-231-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | session ID check buffer error code check Change-Id: I092a61adfd249122f9127dceedf67c0a3bdcfe7b
* | | | AudioRecord::releaseBuffer() buffer is const *, like AudioTrackGlenn Kasten2015-03-231-1/+1
| | | | | | | | | | | | | | | | Change-Id: If09689a8411392281ad06fcf781f3198941c642d
* | | | Deprecate AudioRecord::getInput() and AudioTrack::getOutput()Glenn Kasten2015-03-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Does not completely fix the bug, but is a step in the right direction. Bug: 12593118 Change-Id: Id591cd700ab58fd927ae44c71c81dac55b5cac2d
* | | | namespace does not need a closing semicolonGlenn Kasten2015-03-2331-31/+31
| | | | | | | | | | | | | | | | Change-Id: Ie8f9d42fc061f6d558f23b98414e04eb3d14b376
* | | | Declare and initialize in one statementGlenn Kasten2015-03-232-8/+5
| | | | | | | | | | | | | | | | Change-Id: Ie8593692907e67558f9d7654c9a4bf8cbce99bd8
* | | | WhitespaceGlenn Kasten2015-03-232-4/+2
| | | | | | | | | | | | | | | | Change-Id: I4640be948ad3caff0eb7525991398a1353e4bfe6
* | | | Update AudioRecord comments to match AudioTrackGlenn Kasten2015-03-231-1/+1
|/ / / | | | | | | | | | Change-Id: I6c3620c60c0ba159e4688b42de4ec8b91920e048
* | | Event driven wake for AudioRecordThread notification changesAndy Hung2015-03-181-2/+21
| |/ |/| | | | | | | | | Used for setMarkerPosition and setPositionUpdatePeriod. Change-Id: Iedd1be8725dea32bdba6908b78c5166780a66fec
* | Merge "Fix periodic notification timing error for AudioRecord"Andy Hung2015-03-171-2/+5
|\ \
| * | Fix periodic notification timing error for AudioRecordAndy Hung2015-03-131-2/+5
| | | | | | | | | | | | Change-Id: I768d8a30c6845372ad7c306ed1bc0ec030ae1804
* | | Update commentsGlenn Kasten2015-03-131-1/+0
| |/ |/| | | | | Change-Id: I37d3c4ce22b74fe8581a886fe5a7f9fef8266dad
* | fix flush on HW A/V sync tracksEric Laurent2015-03-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fix mismatch between track flags on client and server side when HW A/V sync is requested. The audio track was connected to a direct output by the audio policy manager but the client failed to set the direct flag when creating the track resulting in the direct flag not being set in audio flinger. Bug: 19665934. Change-Id: I0a5257b20bf76c9c4d89bc2ad9b44777b81f13bf
* | Allow TRANSFER_OBTAIN to be used for fast tracksGlenn Kasten2015-03-091-1/+3
| | | | | | | | Change-Id: I8fa20c26f076567b38210af4a680fe1cb2eacee4
* | AudioTrack::obtainBuffer() now returns number of non-contiguous framesGlenn Kasten2015-03-091-2/+2
| | | | | | | | Change-Id: I1f61d7e3d057c3254babe456b4aa0f6a1809da55
* | AudioTrack::releaseBuffer parameter is const *Glenn Kasten2015-03-091-1/+1
| | | | | | | | Change-Id: I31ac20863107de05b83cd7f8cd7dd61bed98e456
* | AudioTrack obtain/release buffer commentsGlenn Kasten2015-03-091-0/+1
|/ | | | Change-Id: I0eb178d1ab4eea7f72f4c55852c19b216ca55f5f
* Merge "Change AudioTrack resampling buffers from 3 to 2"Andy Hung2015-02-281-59/+23
|\
| * Change AudioTrack resampling buffers from 3 to 2Andy Hung2015-02-061-59/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | Move computation of minimum AudioTrack buffer size to server for normal streaming PCM tracks. Use server-side computation to exactly determine requirements for the resampler to avoid triple buffering. This reduces latency for normal audio tracks that require resampling, and makes things consistent with the minimum buffer size. Change-Id: I2f2ca0e599ee20e16559bc5c5dab61ed100da16c
* | mediaplayer: support dynamic playback rateWei Jia2015-02-242-0/+34
| | | | | | | | | | | | Bug: 19196501 Change-Id: I856b1507d5fa2cedfb645706d2435683a7d3e050
* | audio policy service: fix possible memory overflowEric Laurent2015-02-061-2/+20
| | | | | | | | | | | | | | | | Add limit on number of audio ports and patches requested by listaudioPorts() and listAudioPatches(). Bug: 19261727. Change-Id: I21dfdf11cf805734cc3b7b2a85762c5598f60580
* | Add additional info to AudioPort for enum/selection API.Paul McLean2015-02-052-5/+13
|/ | | | | | | | | | Add "device name" member to AudioPort. Moved unique device ID from DevicePort to AudioPort. Straighten out confusion between "name" and "address" Created string constants for Intent "extra" data keys. Combine card/address data into "address" at sender.Add additional info to AudioPort for enum/selection API. Change-Id: I1be308e12b09cd0ead9a3e9fbc9c385462299fb5
* am 183a0e52: am 5bcdfac9: am 2a6e5cf4: Merge "Fix uninitialized variable."Marco Nelissen2015-01-291-1/+3
|\ | | | | | | | | * commit '183a0e52ac3130501c417005f6363eeec62c0afd': Fix uninitialized variable.
| * am 5bcdfac9: am 2a6e5cf4: Merge "Fix uninitialized variable."Marco Nelissen2015-01-291-1/+3
| |\ | | | | | | | | | | | | * commit '5bcdfac94a07c55ce021879d733749775d2d8880': Fix uninitialized variable.
| | * Merge "Fix uninitialized variable."Marco Nelissen2015-01-291-1/+3
| | |\
| | | * Fix uninitialized variable.Marco Nelissen2015-01-291-1/+3
| | | | | | | | | | | | | | | | | | | | Bug: 19020118 Change-Id: I0aceadfec6652d468a5a5d9eb5dcbf0845757ffa
* | | | am 6a0fbc68: am a3c9d5c3: am 166776fb: Merge "Add missing includes."Elliott Hughes2015-01-291-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '6a0fbc68e203058e3b7d62e95d46f2415bc3ed95': Add missing includes.
| * | | am a3c9d5c3: am 166776fb: Merge "Add missing includes."Elliott Hughes2015-01-291-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'a3c9d5c3982591042c7c6cb5fb7c32fbd4765832': Add missing includes.
| | * | Add missing includes.Elliott Hughes2015-01-281-0/+1
| | |/ | | | | | | | | | Change-Id: Ib697ce44243e7cb07aee60944238e0854d82e9de
* | | am 88d74d20: Add missing AudioPolicy.cpp to Android.mkBrian Carlstrom2015-01-271-1/+2
|\ \ \ | |/ / | | | | | | | | | * commit '88d74d203cda0ee6da387f3a5b929934b505d307': Add missing AudioPolicy.cpp to Android.mk
| * | Add missing AudioPolicy.cpp to Android.mkBrian Carlstrom2015-01-271-1/+2
| | | | | | | | | | | | Change-Id: Iddafc39affe1082dc437f863b35d82790eca550d
* | | resolved conflicts for merge of 9391844d to masterMarco Nelissen2015-01-276-1254/+1
|\ \ \ | |/ / | | | | | | Change-Id: I348a71d1b3e3238bc3871a69454edc8247d03111
| * | resolved conflicts for merge of b955b722 to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-276-1253/+1
| |\ \ | | |/ | | | | | | Change-Id: I385371869169eee4fe6330ffe0abc5eda4cb4f72