summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Adding explicit routing API to AudioTrackPaul McLean2015-04-0818-28/+251
| | | | Change-Id: I40c048c7644c46f4e4f7103875206c0785c4b1dc
* am 3248cb7d: (-s ours) am af69e818: am 4ea8ecf7: (-s ours) am f7f62b7e: (-s ↵Chong Zhang2015-04-030-0/+0
|\ | | | | | | | | | | | | ours) Merge "nuplayer: do not use cached source for wvm content -- DO NOT MERGE" * commit '3248cb7dd030d9b45362c1c0364763419be9064c': nuplayer: do not use cached source for wvm content -- DO NOT MERGE
| * am af69e818: am 4ea8ecf7: (-s ours) am f7f62b7e: (-s ours) Merge "nuplayer: ↵Chong Zhang2015-04-030-0/+0
| |\ | | | | | | | | | | | | | | | | | | do not use cached source for wvm content -- DO NOT MERGE" * commit 'af69e81834d09a02a6bfe1b685e66cd007243373': nuplayer: do not use cached source for wvm content -- DO NOT MERGE
| | * am 4ea8ecf7: (-s ours) am f7f62b7e: (-s ours) Merge "nuplayer: do not use ↵Chong Zhang2015-04-030-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | cached source for wvm content -- DO NOT MERGE" * commit '4ea8ecf7bfa54ea6440f833cc9f9c475779860e4': nuplayer: do not use cached source for wvm content -- DO NOT MERGE
| | | * am f7f62b7e: (-s ours) Merge "nuplayer: do not use cached source for wvm ↵Chong Zhang2015-04-030-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | content -- DO NOT MERGE" * commit 'f7f62b7ec23cc265c72b49f7f67886253b27c48f': nuplayer: do not use cached source for wvm content -- DO NOT MERGE
| | | | * Merge "nuplayer: do not use cached source for wvm content -- DO NOT MERGE"Chong Zhang2015-04-031-23/+32
| | | | |\
| | | | | * nuplayer: do not use cached source for wvm content -- DO NOT MERGEChong Zhang2015-04-031-23/+32
| | | | |/ | | | | | | | | | | | | | | | | | | | | bug: 18730095 Change-Id: Ibd4f54907949daae1d095fa0922050310d16698f
* | | | | Merge "ESQueue:use 0x000001 instead of 0x00000001 as sync word in ↵Robert Shih2015-04-031-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | H264/MPEG_VIDEO"
| * | | | | ESQueue:use 0x000001 instead of 0x00000001 as sync word in H264/MPEG_VIDEORobert Shih2015-04-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | H264/MPEG_VIDEO sync words can be either 0x000001 (3 bytes) or 0x00000001 (4 bytes); simply searching for 0x000001 in appendData suffices because: 1. 0x000001 is a suffix of 0x00000001, as such we would continue to identify all sync words that we used to identify originally. 2. the parsing logic downstream of appendData in dequeueAccessUnitMPEGVideo and dequeueAccessUnitH264 can both handle 0x000001. Bug: 19900317 Change-Id: Iac42aad74563d056a443b4396eacbae0f7a4738b
* | | | | | Merge "HLS: misc bug fixes"Chong Zhang2015-04-0313-282/+311
|\ \ \ \ \ \
| * | | | | | HLS: misc bug fixesChong Zhang2015-04-0213-282/+311
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | | | Merge "AudioPolicy: remove extraneous parentheses"Jean-Michel Trivi2015-04-031-1/+1
|\ \ \ \ \ \ \
| * | | | | | | AudioPolicy: remove extraneous parenthesesJean-Michel Trivi2015-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibcea37b90cc0aaacb3b6194745bf569edad8992a
* | | | | | | | Merge "nuplayer: Has video hint for offload"Ronghua Wu2015-04-032-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | nuplayer: Has video hint for offloadHaynes Mathew George2015-04-022-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send a hint indicating whether the clip being played has a video stream from NuPlayer to NuPlayerDecoderPassThrough. This hint is used to open the audio sink with the correct offload config. Currently, NuPlayerDecoderPassthrough always calls openAudioSink with hasVideo set to false causing an unnecessary recreation of AudioTrack. Change-Id: I7bc6c73818b65f9237a6e606721b7d48e1d807b9 CRs-Fixed: 811510
* | | | | | | | | 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
* | | | | | | | | Merge "Merge commit 'a8f3cafa4f81e3c38c4d0882031a246a36be1299' into merge"Etan Cohen2015-04-020-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge commit 'a8f3cafa4f81e3c38c4d0882031a246a36be1299' into mergeEtan Cohen2015-03-310-0/+0
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am c42c4b52: (-s ours) am 424324b3: am 2fdd16b3: DO NOT MERGE - audio policy ↵Eric Laurent2015-03-250-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | service: fix possible memory overflow automerge: 5c4c113 -s ours * commit '5c4c113ab77f99bc02d9b0b58de7290609866a2f': DO NOT MERGE - audio policy service: fix possible memory overflow
| | | * \ \ \ \ \ \ \ \ am c42c4b52: (-s ours) am 424324b3: am 2fdd16b3: DO NOT MERGE - audio policy ↵Eric Laurent2015-03-250-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | service: fix possible memory overflow * commit 'c42c4b526422fada02f3522a08143f738e9e60af': DO NOT MERGE - audio policy service: fix possible memory overflow
| | * | | | | | | | | | | Camera: plumbing rotation field throughYin-Chia Yeh2015-03-2328-65/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0f4343a0bfa7bf09ba887c78a1da1c08daa35333
| | * | | | | | | | | | | Camera: Wire up dataSpace, clean up ICameraDeviceUserEino-Ville Talvala2015-03-2325-67/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove unused arguments from ICameraDeviceUser::createStream - Add dataSpace as a stream parameter, plumb it through everything Change-Id: I608cafe694785d1c512276e71b2016f8ac3b0ccb
| | * | | | | | | | | | | camera: implement flashlight for HAL v1 devicesChien-Yu Chen2015-03-179-23/+322
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement flashlight for HAL v1 devices and remove CameraHardwareInterface's dependency on CameraService to avoid circular dependency. Bug: 2682206 Change-Id: Id5bbccef085b607a6189763fd7fbe2e3f26868c8
| | * | | | | | | | | | | camera: fix flashlight implementation for HAL v2Chien-Yu Chen2015-03-176-210/+443
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | Camera: Remove RAW_SENSOR in favor of RAW16Eino-Ville Talvala2015-03-174-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I69ca24c69f58be958efdef300b127401d2b2e880
| | * | | | | | | | | | | CameraService: fix invalid access of camera metadataYin-Chia Yeh2015-03-171-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | static_camera_characteristics is not defined in API1. Change-Id: I422953081b0a5581e12fc4b16052b67ca8062186
| | * | | | | | | | | | | Look up user-specific device policy for disabling cameraAmith Yamasani2015-03-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera can be disabled on a per-user basis by device admins. Changed the system property format to be per-user so that the policy can be applied based on calling user. TODO: Ideally this policy information should be pulled from the DevicePolicyManager rather than relying on system properties. Property changes will not be applied immediately either, if there's no listener. Bug: 19345698 Change-Id: Ia00034726260bc9ff28ac592f20a27b5c9a77d58
| | * | | | | | | | | | | camera: implement flashlight controlChien-Yu Chen2015-03-1710-3/+965
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | CameraService: intercept Camera moduleYin-Chia Yeh2015-03-1721-61/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap camera module returned from HAL so get_camera_info returns static_camera_characteristics processed by framework, which generates keys added after HAL3.2 is released. Change-Id: Ief423a1571cf06c7ef80b98b403a33969baf95f6
| | * | | | | | | | | | | camera2: fix various BpCameraDeviceUser methods to return correct result.John Lin2015-03-171-4/+4
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - submitRequest*(): res is the request ID and not always equals to NO_ERROR. - cancelRequest() and flush(): the result of reading last frame number should be put in resFrameNumber, not in res. Change-Id: Ic81c58f4ac14c05b3db4bdc5c99f48d00665d3fc Signed-off-by: John Lin <jolin@mozilla.com>
* | | | | | | | | | | | audio port: support multiple clientsEric Laurent2015-04-012-27/+77
| |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for more than one audio port callback client per process. Change-Id: I657c4fc28d5d2d993307551e3e69567dc60196cb
* | | | | | | | | | | Merge "Updates to AudioPolicyManager refactor"Jean-Michel Trivi2015-04-015-13/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Updates to AudioPolicyManager refactorJean-Michel Trivi2015-04-015-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use protected access in AudioPolicyManager class for - engine field - querying phone state - isStrategyActive Fix inclusion of AudioPolicyManagerInterface header. Use "APM_" prefix in audio policy conf parsing code to avoid naming conflicts with some HALs. DeviceDescriptor and its collection class are good friends now. Change-Id: I236d62a2b8a4b6bf68dd515932650b912577c145
* | | | | | | | | | | | Merge "Split ManagerDefault into manager and engine"Jean-Michel Trivi2015-04-0116-908/+1754
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Split ManagerDefault into manager and engineFrançois Gaffie2015-04-0116-908/+1754
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch defines an interface for a new component: policy engine. The APIs found under this interface are the one we may want to customize and to configure easily. This patch also split the current manager code into manager and engine to provide a default version of the policy engine. Change-Id: I97cf59760b53d248fe9efe466ae5e73bd7e5cc06 Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | | | | | | | | | | | Merge "Create StreamDescriptor and associated collection within common"Jean-Michel Trivi2015-04-018-246/+473
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Create StreamDescriptor and associated collection within commonFrançois Gaffie2015-04-018-246/+473
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create StreamDescriptor and associated collection within common common policy pillar elements. It moves the code from managerdefault and creates helpers function within the collection. It also split the AudioGain in a common volume header and AudioGain class. Change-Id: I1bb80e4219506f8c9042367085db328d317cb668 Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | | | | | | | | | | | Merge "Create SoundTriggerSession and associated collection within common"Jean-Michel Trivi2015-04-015-17/+86
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Create SoundTriggerSession and associated collection within commonFrançois Gaffie2015-04-015-17/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch creates a SoundTriggerSession and associated collection within common policy pillar elements. It moves the code from managerdefault and creates helpers function within the collection. Change-Id: I83ea230573c05e8ab99f4489c20059ed27678221 Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | | | | | | | | | | | Merge "Add EffectDescriptor and associated collection to common elements"Jean-Michel Trivi2015-04-017-181/+288
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Add EffectDescriptor and associated collection to common elementsFrançois Gaffie2015-04-017-181/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds EffectDescriptor and associated collection to common policy pillar elements. It moves the code from the policy manager and creates helpers function in the collection. It also factorize the RoutingStrategy structure within a separated header file. Change-Id: I29964ff77564fadedf3237c8754240b21ae77297 Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | | | | | | | | | | | Merge "Add AudioMix and AudioMixCollection to common policy element"Jean-Michel Trivi2015-04-015-102/+307
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Add AudioMix and AudioMixCollection to common policy elementFrançois Gaffie2015-04-015-102/+307
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds AudioMix and associated collection to the common policy pillar elements library. It removes the code from the manager and creates also helpers function associated to the mix collection. Change-Id: Ia3536fdef09da13734d2895030d736c701040237 Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | | | | | | | | | | | Merge "Migrate helper functions from managerdefault to common"Jean-Michel Trivi2015-04-0120-653/+977
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Migrate helper functions from managerdefault to commonFrançois Gaffie2015-04-0120-653/+977
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch moves from manager to common: -parse helper functions of the policy configuration file -collection helper function on -output / input descriptors -DeviceDescriptor -AudioPatch / Audio Port -IO Profile -HwModule Change-Id: If45e53418db75af1af198f43c4ef27884499055f Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | | | | | | | | | | | Merge "Split ManagerDefault into Manager and ManagerDefinitions"Jean-Michel Trivi2015-04-0126-133/+235
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Split ManagerDefault into Manager and ManagerDefinitionsFrançois Gaffie2015-04-0126-133/+235
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch splits the managerdefault into a manager and a manager defintion library that contains all pillar elements of a policy manager. It renames the file with the name of the main class they contains. It splits the AudioPort into AudioPort and AudioPatch. Change-Id: I992cf0b8aed895805cc003ba0980d2c9e92c985b Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | | | | | | | | | | | Merge "Audio Policy Refactor: reorganise headers inclusion"Jean-Michel Trivi2015-04-0120-58/+159
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Audio Policy Refactor: reorganise headers inclusionFrançois Gaffie2015-04-0120-58/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch reoganises the headers inclusion in order to prepare the split of managerdefault into a manager and a separated lib of pillar policy elements. It also moves back the isStrategyActive to the manager to avoid any dependancies from this pillars to the manager. Change-Id: I1a35c45d86db7a3878a40dc7d6858dfea37c5ac9 Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | | | | | | | | | | | am 7f6655df: (-s ours) am 17580294: am 8b0b1f77: (-s ours) am 31703583: (-s ↵Dan Stoza2015-04-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) Merge "DO NOT MERGE libstagefright: Stop using IGBC::BufferItem" * commit '7f6655dfa1bf2e7740129ca99e08fe0b8bdc290e': DO NOT MERGE libstagefright: Stop using IGBC::BufferItem
generated by cgit v1.1 at 2025-08-05 12:55:01 +0000