summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * Remove MediaPlayerService::decode()Marco Nelissen2015-01-266-1251/+0
| | | | | | | | | | | | | | | | | | | | | and make SoundPool use MediaCodec for decoding files to PCM. Bug: 18239054 Change-Id: Ia144fc1bbb0d2787638ee972e2224339b4965310
| * | am cec272df: am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2015-01-131-0/+14
| |\ \ | | |/ | | | | | | | | | * commit 'cec272dfe2cf6bf6cdb8a4afa5afdd0e910c915f': Replace MidiFile player with a Midi extractor
| | * Replace MidiFile player with a Midi extractorMarco Nelissen2015-01-081-0/+14
| | | | | | | | | | | | | | | | | | | | | This gets rids of a bunch of special midi handling and replaces it with an extractor that works with NuPlayer and MediaMetadataRetriever. Change-Id: I8d0f5bbdde2ca24267cf4d62ab26afe9630e0217
| * | resolved conflicts for merge of 2702d5a0 to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-083-21/+82
| |\ \ | | |/ | | | | | | Change-Id: Ic9841f0a66930f57a5ebea527c6a841d7c49cccf
| | * Use callbacks for Midi I/OMarco Nelissen2015-01-083-21/+82
| | | | | | | | | | | | | | | | | | | | | Instead of having the Sonivox engine directly open the file and use stdio to read from it, use caller-provided callbacks. Change-Id: Ie55129109060a4a7862fee3177f994401e00b6c1
* | | Merge "Allow AUDIO_FORMAT_PCM_8_BIT AudioTrack buffers"Andy Hung2015-01-151-46/+15
|\ \ \
| * | | Allow AUDIO_FORMAT_PCM_8_BIT AudioTrack buffersAndy Hung2015-01-141-46/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously conversion to AUDIO_FORMAT_PCM_16_BIT was required. Client shared memory for static tracks and AudioFlinger track creation and buffer delivery now use native 8 bit PCM data. Change-Id: I485c07a4971fde9a25442bd43fed95019d39abcc
* | | | Merge "Fix cumulative error in setPositionNotificationPeriod"Andy Hung2015-01-141-2/+3
|\ \ \ \ | |/ / /
| * | | Fix cumulative error in setPositionNotificationPeriodAndy Hung2015-01-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Time for AudioTrackThread sleep due to periodic notification needs to be computed from actual position. External reported AOSP issue 65807. Change-Id: Ic46b64588e6c5803afcd8252cde8837eb3fbf6ff
* | | | Merge "Move roundup from frameworks/av to system/media"Glenn Kasten2015-01-121-2/+0
|\ \ \ \
| * | | | Move roundup from frameworks/av to system/mediaGlenn Kasten2015-01-071-2/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I1083ab739e445e5bd3e3082fc1d3a20cc19601d5
* | | | | Merge "Event driven wake for AudioTrackThread notification changes"Andy Hung2015-01-072-3/+38
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Event driven wake for AudioTrackThread notification changesAndy Hung2015-01-062-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used for setMarkerPosition and setPositionUpdatePeriod. Change-Id: I0d94b929438a5cd94b295d7c1884f876fae8b5e7
* | | | | Merge "Improve AudioTrack EVENT_LOOP_END and EVENT_BUFFER_END accuracy"Andy Hung2015-01-071-11/+40
|\ \ \ \ \ | |/ / / /
| * | | | Improve AudioTrack EVENT_LOOP_END and EVENT_BUFFER_END accuracyAndy Hung2015-01-061-11/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix timing computation to consider current position. Fix EVENT_LOOP_END count accuracy (some could be dropped before) for non-infinite loop static AudioTracks. Change-Id: I255f692915b55ab6f08ccd6a2365fee3f5d0a4fe
* | | | | Merge "Fix loop and position restoration in static AudioTracks"Andy Hung2015-01-072-46/+74
|\ \ \ \ \ | |/ / / /
| * | | | Fix loop and position restoration in static AudioTracksAndy Hung2015-01-062-46/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow restoration of loop and position. Make position and loop synchronously readable. Bug: 17964637 Change-Id: I8cfb5036e665f55fdff5c67d27e1363ce9a8665d
* | | | | Merge "Fix loop and position setting in static AudioTracks"Andy Hung2015-01-072-61/+140
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Fix loop and position setting in static AudioTracksAndy Hung2015-01-052-61/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow independent setting of position and loop. Bug: 17964637 Change-Id: I8b3bd97a244b932728b68da7684044f2636984a5
* | | | am bb2e3e9d: am fb5d35c0: am 7ae3dfab: Merge "fix record from default input ↵Eric Laurent2015-01-071-4/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | source" into lmp-mr1-dev * commit 'bb2e3e9d05e3760cfcf3cc63c10e7e8336e63a06': fix record from default input source
| * | | am fb5d35c0: am 7ae3dfab: Merge "fix record from default input source" into ↵Eric Laurent2015-01-071-4/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'fb5d35c00d1c4d672d245b6820551808617eba46': fix record from default input source
| | * | | fix record from default input sourceEric Laurent2015-01-061-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit caf7f48a0e broke capture from default input source on some devices: the input source is now specified as part of the audio attributes and the default source was not remapped to mic source. Bug: 18736417. Change-Id: I3f5da33cdb56f959aaef68ed1952342babc63aa0
* | | | | SoundPool: Do not stop AudioTrack on EVENT_NEW_IAUDIOTRACKAndy Hung2015-01-061-3/+4
| |_|/ / |/| | | | | | | | | | | | | | | Bug: 17964637 Change-Id: I2865959e476bee2f6e1a7344d9464b083cee88d2
* | | | am 991aa3a7: am bef17542: am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL ↵Narayan Kamath2015-01-051-2/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | include paths." * commit '991aa3a70b26c7d9c93361394a43a95355c1c26e': Remove hardcoded ICU & OpenSSL include paths.
| * | | am bef17542: am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths."Narayan Kamath2015-01-051-2/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit 'bef17542c7e0563c6004463b1ede18a404a17c89': Remove hardcoded ICU & OpenSSL include paths.
| | * | Remove hardcoded ICU & OpenSSL include paths.Narayan Kamath2015-01-051-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | They're exported using LOCAL_EXPORT_C_INCLUDE_DIRS. bug: 18581021 Change-Id: I9593422b9eddb8203bee88d60e31a03b4a5f976b
* | | | Cleanup annoying whitespace that causes red markersGlenn Kasten2015-01-021-1/+1
| | | | | | | | | | | | | | | | Change-Id: I0b1be110b0e0a9606d272c4d023f40ff93522725
* | | | Merge "Flowchart for handling of AudioTrack client paused"Glenn Kasten2014-12-302-0/+75
|\ \ \ \
| * | | | Flowchart for handling of AudioTrack client pausedGlenn Kasten2014-12-302-0/+75
| | | | | | | | | | | | | | | | | | | | Change-Id: I6fde6ea257684deaf5f92e97ee7c500192e7d8ca
* | | | | Line length 100Glenn Kasten2014-12-306-24/+39
|/ / / / | | | | | | | | | | | | Change-Id: I6c8fe626a3825fa9e139319656d682a57b887c97
* | | | Fix 64 bit compiler warnings in AudioTrackSharedAndy Hung2014-12-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Comparisons between size_t and int64_t variables show warnings for 64 bit compilation, fix with casting. Change-Id: I3c1b12ea6eca01e49696c724a1cf1cc6b88df7aa
* | | | am af318e28: am 0b87c0d9: am bd08223c: Merge "Fix double close."Marco Nelissen2014-12-221-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'af318e2882e0b8b1a594f079eb3d10b2daa3ff7e': Fix double close.
| * | | am 0b87c0d9: am bd08223c: Merge "Fix double close."Marco Nelissen2014-12-221-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '0b87c0d9e074384d05e6563c1b1cf5dbd5246436': Fix double close.
| | * | Merge "Fix double close."Marco Nelissen2014-12-221-0/+1
| | |\ \
generated by cgit v1.1 at 2024-06-27 04:47:43 +0000