summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge "Camera: plumbing rotation field through"Yin-Chia Yeh2015-03-192-3/+54
|\ \ \ \ \
| * | | | | Camera: plumbing rotation field throughYin-Chia Yeh2015-03-182-3/+54
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0f4343a0bfa7bf09ba887c78a1da1c08daa35333
* | | | | | Merge "camera2: Add camera client eviction enforcement."Ruben Brunk2015-03-191-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | camera2: Add camera client eviction enforcement.Ruben Brunk2015-03-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This updates the CameraService to implement client eviction behavior based on process priority. Bug: 19186859 Change-Id: I646939b1cdf1a2237c4e5044164d55a2542cf36e
* | | | | | Merge "Add FIXME to deprecate all APIs that assume a route"Glenn Kasten2015-03-163-0/+6
|\ \ \ \ \ \
| * | | | | | Add FIXME to deprecate all APIs that assume a routeGlenn Kasten2015-03-133-0/+6
| | |/ / / / | |/| | | | | | | | | | | | | | | | Change-Id: I84e160e3945004338c808edd86b5dbbca1e12874
* | | | | | Merge "Update comments"Glenn Kasten2015-03-164-6/+8
|\ \ \ \ \ \
| * | | | | | Update commentsGlenn Kasten2015-03-134-6/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: I37d3c4ce22b74fe8581a886fe5a7f9fef8266dad
* | | | | | Merge "libstagefright: add ProcessInfo to get process priority."Ronghua Wu2015-03-162-0/+73
|\ \ \ \ \ \
| * | | | | | libstagefright: add ProcessInfo to get process priority.Ronghua Wu2015-03-162-0/+73
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I240b814b8925b1d6266e6f998a7debd654a2145a
* | | | | | Merge "radio client"Eric Laurent2015-03-162-0/+126
|\ \ \ \ \ \
| * | | | | | radio clientEric Laurent2015-03-102-0/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added implementation of native broadcast radio client class and callback. Change-Id: I82478448e32a5b9be5165e7eb53b99b6289884ed
* | | | | | | Merge "radio service binder interfaces"Eric Laurent2015-03-163-0/+179
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
| * | | | | radio service binder interfacesEric Laurent2015-03-103-0/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added definiiton and implemention of binder interfaces fro native broadcastradio service. Change-Id: Id5a93bc3146229dffc74b56c29ba48e02b9a5518
* | | | | | Merge "libstagefright: handle MediaFormat "priority" key."Ronghua Wu2015-03-161-0/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | libstagefright: handle MediaFormat "priority" key.Ronghua Wu2015-03-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I73675c7cc3d742b9a1a98d6c0f48dcf17557e2ad
* | | | | | Merge "Fix warning while building mediaserver"Glenn Kasten2015-03-131-0/+2
|\ \ \ \ \ \
| * | | | | | Fix warning while building mediaserverGlenn Kasten2015-03-091-0/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In file included from frameworks/av/services/audiopolicy/managerdefault/AudioPolicyManager.h:31:0, from frameworks/av/services/audiopolicy/service/AudioPolicyService.h:38, from frameworks/av/media/mediaserver/main_mediaserver.cpp:36: frameworks/av/services/audiopolicy/managerdefault/ConfigParsingUtils.h:29:0: warning: "ARRAY_SIZE" redefined #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) ^ In file included from frameworks/av/media/libmediaplayerservice/MediaPlayerService.h:31:0, from frameworks/av/media/mediaserver/main_mediaserver.cpp:35: frameworks/av/include/media/stagefright/foundation/ABase.h:21:0: note: this is the location of the previous definition #define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a))) ^ Change-Id: I4b80f783c592a78aa88b3dad297278353740466e
* | | | | | stagefright: don't use ALooperRoster mutex for reply handlingLajos Molnar2015-03-105-21/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change replyID-s from uint32_t to an object Move reply handling into the loopers (to reuse a common mutex) Bug: 19607784 Change-Id: Iaa035b846c424c5687ed17ce1079b325e86c54be
* | | | | | Merge "mediaplayer: move MediaClock from NuPlayer to libstagefright."Wei Jia2015-03-101-0/+77
|\ \ \ \ \ \
| * | | | | | mediaplayer: move MediaClock from NuPlayer to libstagefright.Wei Jia2015-03-091-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19666434 Change-Id: I86865e594226419bbbbee217098f96434e43afbe
* | | | | | | Merge "Camera: Wire up dataSpace, clean up ICameraDeviceUser"Eino-Ville Talvala2015-03-091-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Camera: Wire up dataSpace, clean up ICameraDeviceUserEino-Ville Talvala2015-03-061-1/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove unused arguments from ICameraDeviceUser::createStream - Add dataSpace as a stream parameter, plumb it through everything Change-Id: I608cafe694785d1c512276e71b2016f8ac3b0ccb
* | | | | | | AudioTrack::obtainBuffer() now returns number of non-contiguous framesGlenn Kasten2015-03-091-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-12/+28
| |/ / / / / |/| | | | | | | | | | | | | | | | | Change-Id: I0eb178d1ab4eea7f72f4c55852c19b216ca55f5f
* | | | | | Merge "Include ABase.h to get definition of DISALLOW_EVIL_CONSTRUCTORS."Chih-Hung Hsieh2015-03-061-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Include ABase.h to get definition of DISALLOW_EVIL_CONSTRUCTORS.Chih-Hung Hsieh2015-03-061-0/+1
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I13e375e67f20203c542b5350a55f42e925205b11
* | | | | stagefright: remove AMessage methods using id()Lajos Molnar2015-03-052-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19607784 Change-Id: I4b2ca396fb50cde5e7dc9801add69037febe698d
* | | | | stagefright: use handler instead of handler-id in AMessageLajos Molnar2015-03-054-12/+44
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | This avoids locking gLooperRoster mutex on post() and deliver(). Bug: 19607784 Change-Id: If6d9d7884dbb08fc390983bda896d223803476ba
* | | | mediaplayer: use non-blocking mode for AudioSink::write().Wei Jia2015-03-031-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This cherry picks https://googleplex-android-review.git.corp.google.com/#/c/643541/ to master. Bug: 19448263 Change-Id: I43dea830212de79c2b080185b6c6b36078f517d2
* | | | Merge "camera: fix flashlight implementation for HAL v2"Chien-Yu Chen2015-03-032-9/+20
|\ \ \ \ | |/ / / |/| | |
| * | | camera: fix flashlight implementation for HAL v2Chien-Yu Chen2015-03-032-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update torch availability when the camera device availability changes. For device HAL v2 and v3 implementation, notify torch unavailable for all camera devices with a flash unit when a camera device is opened. Notify torch available for all camera devices with flash unit when all camera devices are closed. Don't invoke torch status callback in camera service. Invoke torch status callback in HAL or FlashControlBase implementations to avoid race condition. Clean up previous CL. Bug: 2682206 Change-Id: I24f5478f467b2c680565fe98f112eef33e2547a1
* | | | Merge "Change AudioTrack resampling buffers from 3 to 2"Andy Hung2015-02-281-0/+13
|\ \ \ \ | |/ / / |/| | |
| * | | Change AudioTrack resampling buffers from 3 to 2Andy Hung2015-02-061-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "mediaplayer: support dynamic playback rate"Wei Jia2015-02-253-0/+4
|\ \ \ \
| * | | | mediaplayer: support dynamic playback rateWei Jia2015-02-243-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19196501 Change-Id: I856b1507d5fa2cedfb645706d2435683a7d3e050
* | | | | MPEG4Writer: add software version to mp4 metaChong Zhang2015-02-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and account for meta data and geo data when estimating moov size bug: 19460202 Change-Id: I094d15f47dda5e41217181cdb3ac519c00330de5
* | | | | MPEG4Writer: add capture fps in meta dataChong Zhang2015-02-231-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19460202 Change-Id: I3a6ea3a5149d124ca9a2487a300dcc2db4405d0f
* | | | | Merge "camera: implement flashlight control"Chien-Yu Chen2015-02-192-0/+31
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | camera: implement flashlight controlChien-Yu Chen2015-02-122-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement flashlight API for module v2.4 by calling module APIs and by for hal v2 and v3 by using CameraDeviceBase. Bug: 2682206 Change-Id: Ib8b77f6fd462489d672f27e14fe37801d35b7544
* | | | | am a7c1df10: am a963dacc: am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-182-1/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a7c1df10d39a8056ca755ccd77b06816c6de3225': Add dumpsys info
| * \ \ \ \ am a963dacc: am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-182-1/+9
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | | * commit 'a963dacc1b44ec80742c86ce75611eb9cfa936ea': Add dumpsys info
| | * | | Add dumpsys infoMarco Nelissen2015-02-182-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print a list of looper-handler pairs and the number of messages they've processed, and optionally break those stats out by message type. Change-Id: I68ce4a7003152d5c9b5cb3f42e6f3949b471aa6e
* | | | | stagefright: add support for limiting framerate in GraphicBufferSourceRonghua Wu2015-02-122-0/+2
| |_|/ / |/| | | | | | | | | | | | | | | Bug: 19014096 Change-Id: I6de781e4d140a247dfd8fd8f12c3ddd7baa39ad4
* | | | resolved conflicts for merge of 157defdd to masterLajos Molnar2015-02-101-0/+68
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I14fd8063fa052f16868b8053a211190092131317
| * | | am 4fc5d758: am 0c11f31b: Merge "nuplayer: acquire wakelock during offload ↵Lajos Molnar2015-02-101-0/+68
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pause timeout" into lmp-mr1-dev * commit '4fc5d758d6722bedf341e5d93a0ba5698c658c29': nuplayer: acquire wakelock during offload pause timeout
| | * | | nuplayer: acquire wakelock during offload pause timeoutWeiyin Jiang2015-02-061-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hold a wakelock while paused in audio offload mode, until audio teardown event is received, or pause is canceled. Since ARM cores are sleeping, the delayed AMessage will not be received, and the audio output driver will not be closed. This blocks XO shutdown. Bug: 19297092 Change-Id: I3d11fef633e3f2783f4aa31e71285e2fa09d234c
* | | | | am e5760862: am bcd22f0f: am 0662f5b0: Merge "stagefright: add fallback for ↵Lajos Molnar2015-02-061-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | native flex-YUV support" into lmp-mr1-dev * commit 'e576086224f6e630159eaeec59ab5146c8533dc7': stagefright: add fallback for native flex-YUV support
| * | | | am bcd22f0f: am 0662f5b0: Merge "stagefright: add fallback for native ↵Lajos Molnar2015-02-061-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | flex-YUV support" into lmp-mr1-dev * commit 'bcd22f0f3a4cd5f78e03af23aafadb2d1aec6794': stagefright: add fallback for native flex-YUV support