summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* audio policy: add binder calls for audio source controlEric Laurent2015-04-1510-0/+147
| | | | | | | Add binder methods to IAudioPolicyService to control activity of external audio sources (e.g FM tuner). Change-Id: I2008308a6a996baeae502b68a790d87281efe2ff
* Merge "fix NuPlayerDecoder discontinuity handling with async mode"Chong Zhang2015-04-151-4/+0
|\
| * fix NuPlayerDecoder discontinuity handling with async modeChong Zhang2015-04-151-4/+0
| | | | | | | | | | | | bug: 20234224 Change-Id: I317b52b089f1e1432255100ef5f36322a231a399
* | Merge "AudioPolicyManager: notification of dynamic policy mix activity"Jean-Michel Trivi2015-04-1512-6/+139
|\ \
| * | AudioPolicyManager: notification of dynamic policy mix activityJean-Michel Trivi2015-04-1412-6/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement non-stream type specific ref counting in output descriptors to keep track of mix activity. Notify audio policy client of mix activity changes. Bug 20226914 Change-Id: Iec939cb640c58056f88947b611d23b4bb6d8a11b
* | | Merge "Camera: allow non-supported template"Yin-Chia Yeh2015-04-151-3/+3
|\ \ \
| * | | Camera: allow non-supported templateYin-Chia Yeh2015-04-141-3/+3
| | | | | | | | | | | | | | | | | | | | Bug: 19395059 Change-Id: I42bbd99fef6055173062266c1a490311105c6814
* | | | Merge "Camera: fix invalid access of static_camera_characteristics"Yin-Chia Yeh2015-04-151-0/+6
|\ \ \ \
| * | | | Camera: fix invalid access of static_camera_characteristicsYin-Chia Yeh2015-04-151-0/+6
| |/ / / | | | | | | | | | | | | | | | | Bug: 20260866 Change-Id: Ib2b9ef807d66989515ac1a2e9f623fdd226a665a
* | | | Merge "skip parsing of 'hdlr' atom when parsing QT meta"Chong Zhang2015-04-151-1/+6
|\ \ \ \
| * | | | skip parsing of 'hdlr' atom when parsing QT metaChong Zhang2015-04-151-1/+6
| | |_|/ | |/| | | | | | | | | | | | | | bug: 20244718 Change-Id: Ifb8a6d450a2f1ad2833301f492dc0ccfe1cd34d4
* | | | Merge "camera: Actually pass device errors to client for Camera2Device."Ruben Brunk2015-04-152-0/+36
|\ \ \ \
| * | | | camera: Actually pass device errors to client for Camera2Device.Ruben Brunk2015-04-152-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19186859 Change-Id: Ib58588dfd99956b719c34e62c596ea604d97edcb
* | | | | Merge "Camera2: Add prepare for output streams"Eino-Ville Talvala2015-04-1524-39/+694
|\ \ \ \ \
| * | | | | Camera2: Add prepare for output streamsEino-Ville Talvala2015-04-1524-39/+694
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The prepare call asynchronously pre-allocates buffers for a given output stream, and then fires the onPrepared callback. Not implemented for Camera2Device or used in Camera2Client. Change-Id: I1cccdfff846dd6985133c591dbdceed823929ade
* | | | | | Merge "Revert "stagefright: define CB_CODEC_RELEASED and ReleaseReason enum.""Ronghua Wu2015-04-151-7/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Revert "stagefright: define CB_CODEC_RELEASED and ReleaseReason enum."Ronghua Wu2015-04-141-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ea20d117ef9b4e867ec3982c7d070e719617ba2f. Change-Id: Ia77448a81429814e6915eca9c1cd854ca0e623cc
* | | | | | Merge "media: use ResourceManagerService with MediaCodec"Ronghua Wu2015-04-155-31/+380
|\ \ \ \ \ \
| * | | | | | media: use ResourceManagerService with MediaCodecRonghua Wu2015-04-145-31/+380
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I235a97e5195b28645b7834dda0dd77307d93f4a8
* | | | | | | Merge "HLS: parse stream resolution and set maxWidth/maxHeight"Chong Zhang2015-04-155-0/+66
|\ \ \ \ \ \ \
| * | | | | | | HLS: parse stream resolution and set maxWidth/maxHeightChong Zhang2015-04-145-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 20160436 Change-Id: Ic3adb84d3c65cc65f62fc509a99d09602db862a1
* | | | | | | | Merge "stagefright: metadata retriever changes for capture fps"Chong Zhang2015-04-145-20/+163
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | stagefright: metadata retriever changes for capture fpsChong Zhang2015-04-135-20/+163
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19460202 Change-Id: I20afded0b7eec45b2f25b51cf59d9f48eada74d8
* | | | | | | Merge "mpeg2ts: Set SAMPLE_FLAG_SYNC for mpeg2ts stream"Jinsuk Kim2015-04-142-0/+34
|\ \ \ \ \ \ \
| * | | | | | | mpeg2ts: Set SAMPLE_FLAG_SYNC for mpeg2ts streamTerry Heo2015-04-142-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added logic to find sync frame of mpeg2, mpeg4 and h264 Bug: 19940277 Change-Id: I4d95ae247f590b831bf11ff8c9c6fe45d21dab56
* | | | | | | | Merge "camera2: add reprocess support"Chien-Yu Chen2015-04-1417-37/+393
|\ \ \ \ \ \ \ \
| * | | | | | | | camera2: add reprocess supportChien-Yu Chen2015-04-1317-37/+393
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support to create input stream, submit reprocess capture requests, and receive reprocess capture results. Change-Id: Iee2d4313f3d52616a484eaea7a28f5ef9d8a674b
* | | | | | | | | Merge "AudioRecord::obtainBuffer() can return nonContig like AudioTrack"Glenn Kasten2015-04-143-4/+27
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | AudioRecord::obtainBuffer() can return nonContig like AudioTrackGlenn Kasten2015-04-133-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And fix error handling in both AudioRecord and AudioTrack. Change-Id: I4853d736cc6d2c05de5b18b0eac62716edfa62ec
* | | | | | | | | media: handle overrides and measure max codec instance.Ronghua Wu2015-04-1311-33/+1018
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I68d5919284700f37ccc6c6b9f96cd87ccdd40e6a
* | | | | | | | | Merge "libstagefright: parse global settings from codec xml file."Ronghua Wu2015-04-142-10/+86
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | libstagefright: parse global settings from codec xml file.Ronghua Wu2015-04-132-10/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also parse a new codec limit "max-supported-instances". Bug: 19620911 Change-Id: I6574c168b0c2b1aa649883958d3073edc01a4a03
* | | | | | | | | | Merge "camera: Fix client eviction/disconnect race."Ruben Brunk2015-04-143-4/+75
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | camera: Fix client eviction/disconnect race.Ruben Brunk2015-04-133-4/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add blocking wait in camera service connect call to prevent race when client has called disconnect while eviction of that client is taking place, resulting in early call of device initialization before all HAL resources are available. Bug: 20038135 Change-Id: I7afc5bfa23612ba7f83293fa542ff983a5991230
* | | | | | | | | | Merge "TimestretchBufferProvider integration with Sonic Library"Ricardo Garcia2015-04-145-15/+38
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | TimestretchBufferProvider integration with Sonic LibraryRicardo Garcia2015-04-135-15/+38
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using Sonic as backbone for time stretching algorithm. Adding libsonic to needed makefiles. bug: 19196501 Change-Id: I1ea9221d2f56e4e79fba8746ce0ad350b5079e82
* | | | | | | | | | Merge "Remove deprecated image defines"Lajos Molnar2015-04-141-7/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove deprecated image definesJohann2015-04-101-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libvpx has always supported the VPX_ prefixed versions of these defines. The unprefixed versions have been removed in the most recent release. https://chromium.googlesource.com/webm/libvpx/+/9cdaa3d72eade9ad162ef8f78a93bd8f85c6de10 Change-Id: Idae747eb9f6e71a41a63c6b326af36dc52f5446d
* | | | | | | | | | | Merge "audio polciy: remove FM audio capture permission."Eric Laurent2015-04-134-12/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | audio polciy: remove FM audio capture permission.Eric Laurent2015-04-134-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2607d89b0bd87cdd2f4084dfdb55135509a824d5
* | | | | | | | | | | Merge "MediaCodec: add DeathNotifier to BatteryNotifier"Chong Zhang2015-04-131-10/+74
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | MediaCodec: add DeathNotifier to BatteryNotifierChong Zhang2015-04-101-10/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make the battery notifier more robust bug: 20071299 Change-Id: I0ecfecc787c88ace26dba5e235aa0c345bcace6d
* | | | | | | | | | | | Merge "NuPlayerRenderer: adjust delay of posting drain audio message based ↵Wei Jia2015-04-131-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | on playback rate."
| * | | | | | | | | | | NuPlayerRenderer: adjust delay of posting drain audio message based on ↵Wei Jia2015-04-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | playback rate. Bug: 19196501 Change-Id: I2a98e877ed946e899af0974a0c2397c4146ce349
* | | | | | | | | | | | am 52806313: am e1650d00: am 85bb3235: am 8eae9223: am a05bd3c1: am ↵Nick Kralevich2015-04-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f47bb53: am eb204f82: am b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS processing" into klp-dev * commit '5280631330b6e06c2b9f3af5f2afa7d82a022618': Fix integer underflow in ESDS processing
| * \ \ \ \ \ \ \ \ \ \ \ am e1650d00: am 85bb3235: am 8eae9223: am a05bd3c1: am 2f47bb53: am ↵Nick Kralevich2015-04-111-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb204f82: am b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS processing" into klp-dev * commit 'e1650d00185ca1121aceecc236cdea107a8247b0': Fix integer underflow in ESDS processing
| | * \ \ \ \ \ \ \ \ \ \ \ am 85bb3235: am 8eae9223: am a05bd3c1: am 2f47bb53: am eb204f82: am ↵Nick Kralevich2015-04-111-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS processing" into klp-dev * commit '85bb3235ef58120131e20801dd37eb9708ddc570': Fix integer underflow in ESDS processing
| | | * \ \ \ \ \ \ \ \ \ \ \ am 8eae9223: am a05bd3c1: am 2f47bb53: am eb204f82: am b919a3a3: am ↵Nick Kralevich2015-04-111-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64290793: Merge "Fix integer underflow in ESDS processing" into klp-dev * commit '8eae9223b61b9290b584dcbe634693964bac4bf8': Fix integer underflow in ESDS processing
| | | | * \ \ \ \ \ \ \ \ \ \ \ am a05bd3c1: am 2f47bb53: am eb204f82: am b919a3a3: am 64290793: Merge "Fix ↵Nick Kralevich2015-04-111-0/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integer underflow in ESDS processing" into klp-dev * commit 'a05bd3c1cdff400ad92532b06d40ddc5c638c284': Fix integer underflow in ESDS processing
| | | | | * \ \ \ \ \ \ \ \ \ \ \ am 2f47bb53: am eb204f82: am b919a3a3: am 64290793: Merge "Fix integer ↵Nick Kralevich2015-04-111-0/+6
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | underflow in ESDS processing" into klp-dev * commit '2f47bb53f65e34ba9cff66106390351440b9409b': Fix integer underflow in ESDS processing